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

From: Chao-Hsiung Liao <chliao src gnome org>
To: svn-commits-list gnome org
Subject: [evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Tue, 14 Jul 2009 22:27:21 +0000 (UTC)
commit da8fac9a234c3e42da8d8535dfb72538d9b4b274
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Wed Jul 15 06:26:51 2009 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |10539 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po |10580 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 10253 insertions(+), 10866 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 320daa7..216d580 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,13 +6,13 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005.
 # Abel Cheung <abelcheung gmail com>, 2006.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:631
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.25.91\n"
+"Project-Id-Version: evolution 2.27.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 21:48+0800\n"
-"PO-Revision-Date: 2009-02-17 21:50+0800\n"
+"POT-Creation-Date: 2009-07-15 06:18+0800\n"
+"PO-Revision-Date: 2009-07-15 06:19+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -22,21 +22,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "evolution é??è¨?é??"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "æ?°å¢?è?¯çµ¡äºº"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "æ?°å¢?è?¯çµ¡äººæ¸?å?®"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -59,32 +59,32 @@ msgstr "è?¯çµ¡äºº: "
 msgid "evolution minicard"
 msgstr "Evolution è¿·ä½ å?¡ç??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "å®?å?·æ??é¬§é?´ã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "é??æ?¯ä¸?é ?æ??è°ã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ??è¦?ç?º %sã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ²?æ??æ??è¦?ã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "è¡?äº?æ??æª¢è¦?äº?ä»¶"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "å¾?å?°ç?¦é»?"
 
@@ -108,8 +108,8 @@ msgstr "ç§»è?³ä»?æ?¥"
 msgid "Go to Date"
 msgstr "ç§»è?³æ?¥æ??"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
 
@@ -153,7 +153,7 @@ msgid "calendar view for one or more days"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??æª¢è¦?"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -164,18 +164,18 @@ msgstr "%Y/%m/%d (%a)"
 #. 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:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1587
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%-m æ?? %-d æ?¥ (%a)"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 
@@ -183,10 +183,10 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 #: ../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:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
@@ -196,15 +196,15 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 #. 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:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1603
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%-m æ?? %-d æ?¥"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Gnome è¡?äº?æ??"
 
@@ -216,11 +216,11 @@ msgstr "æ??å°?å??"
 msgid "evolution calendar search bar"
 msgstr "evolution è¡?äº?æ??æ??å°?å??"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "è·³èº?æ??é??"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "æ??é??è£?ï¼?ä½ å?¯ä»¥æ?¾å?°æ?´å¤?äº?ä»¶ã??"
 
@@ -251,50 +251,50 @@ msgstr "å½?å?º"
 msgid "popup a child"
 msgstr "å½?å?ºå?é?¸å?®"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "ç·¨è¼¯"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "é??å§?ç·¨è¼¯æ¤å?²å?æ ¼"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "å??æ??"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "å??æ??å?²å?æ ¼"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 msgid "expand"
 msgstr "å±?é??"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 msgid "expands the row in the ETree containing this cell"
 msgstr "å±?é?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
 msgstr "æ?¶æ?º"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr "æ??ç?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 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
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "è«?æ??é??è£?å? å?¥"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "é»?é?¸"
 
@@ -328,14 +328,6 @@ msgstr "ä½¿ç?¨é ?è¨å?¼"
 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,9 +374,9 @@ msgstr "ç?¡æ³?ç§»é?¤é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:11
 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 å??äººè?¯çµ¡äººè³?æ??å¤¾ã??"
 
 #: ../addressbook/addressbook.error.xml.h:12
@@ -405,7 +397,7 @@ msgstr "ç?¡æ³?é©?è? LDAP ä¼ºæ??å?¨ã??"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1743
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤è?¯çµ¡äººå¤±æ??"
 
@@ -542,17 +534,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "é ?è¨ç??å??æ¥å?°å??:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "ç?¡æ³?è¼?å?¥é??è¨?é??"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "ç?¡æ³?è®?å?? pilot é??è¨?é??ç¨?å¼?å??å¡?"
 
@@ -573,14 +565,12 @@ msgstr "è?æ?¸"
 msgid "Configure autocomplete here"
 msgstr "å?¨æ¤è¨å®?è?ªå??å®?æ??"
 
-#. ensure the group name is in current locale, not read from configuration
 #. 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:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "è?¯çµ¡äºº"
 
@@ -616,30 +606,26 @@ msgstr "Evolution è³?æ??å¤¾è¨å®?çµ?æ??æ?§å?¶"
 msgid "Manage your S/MIME certificates here"
 msgstr "å?¨æ¤ç®¡ç??ä½ ç?? S/MIME è?æ?¸"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "å?¨ LDAP ä¼ºæ??å?¨"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -651,144 +637,176 @@ msgstr "æ??ç??é?»è?¦"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../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/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "å??äºº"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "å?¨ LDAP ä¼ºæ??å?¨"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "è?¯çµ¡äºº(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "å»ºç«?æ?°ç??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "è?¯çµ¡äººæ¸?å?®(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "å»ºç«?æ?°ç??è?¯çµ¡äººæ¸?å?®"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "æ?°é??è¨?é??"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "å»ºç«?æ?°é??è¨?é??"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "å??ç´?é??è¨?é??è¨å®?å?¼æ??è³?æ??å¤¾å¤±æ??ã??"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ SSL)ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ TLS)ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?ä½ ç??ä¼ºæ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??è¡¨ç¤ºä½ ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?ä½ ç??å®?å?¨æ??æ¼?æ´?ã?? "
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "å?ºæ?¬"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 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
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr "é??æ?¯ LDAP ä¼ºæ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??è©¦é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?æ´½è©¢ä½ ç??ç³»çµ±ç®¡ç??å?¡ï¼?ç?è§£ä½ æ??è©²æ??å®?ç??å? ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è?ä½ ç??æ?¹æ³?ã??æ³¨æ??è¦?è¨å®?æ¤é ?è?³ã??é?»å?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿å??å?å??ä½ ç?? LDAP ä¼ºæ??å?¨ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr "æ??å°?ç¯?å??æ??å®?ç¾©ä½ æ?³å¾?ç¶²çµ¡ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??\"sub\" ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??ä¸?å??ã??ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ä¸?è?¬"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../addressbook/gui/component/addressbook-config.c:1021
+#: ../addressbook/gui/widgets/e-addressbook-view.c:553
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "é??è¨?é??"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "ä¼ºæ??å?¨è³?è¨?"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "é©?è?"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "è©³ç´°è³?æ??"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1022
 msgid "Searching"
 msgstr "æ£å?¨æ??å°?"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "ä¸?è¼?ä¸"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "é??è¨?é??å?§å®¹"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "æ£å?¨ç§»è½?..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "æ£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP ä¼ºæ??å?¨"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "è?ªå??å®?æ??è¨å®?"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -799,7 +817,7 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -809,7 +827,7 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -819,7 +837,7 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -830,18 +848,18 @@ msgstr ""
 "ç?¶ Evolution ç§»è½?ä½ ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç?å??..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "é??æ?°å?½å??ã??%sã??è³?æ??å¤¾ç?ºï¼?"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "é??æ?°å?½å??è³?æ??å¤¾"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«æ??ç·?ã??"
 
@@ -854,19 +872,19 @@ msgid "Save As vCard..."
 msgstr "å?²å?ç?º vCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "é??æ?°å?½å??(_R)..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1608
+#: ../calendar/gui/e-calendar-view.c:1826 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -874,11 +892,10 @@ msgid "_Delete"
 msgstr "å?ªé?¤(_D)"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../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
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "å±¬æ?§(_P)"
 
@@ -891,20 +908,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:414
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "è¼¸å?¥å¯?ç¢¼"
@@ -950,7 +967,7 @@ 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Vertical pane position"
 msgstr "å??ç?´çª?æ ¼ä½?ç½®"
 
@@ -977,21 +994,19 @@ 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"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 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>"
@@ -1004,253 +1019,149 @@ msgstr "<b>ä¸?è¼?ä¸</b>"
 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 "å?¿å??"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"å?¿å??\n"
+"ä½¿ç?¨é?»å?é?µä»¶ä½?å??\n"
+"ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "ç??è¦½é??å??é??è¨?é??ç?´å?°é??å?¶(_R)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "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
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 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 "ä¸?å±¤"
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+#, fuzzy
+#| msgid "One"
+msgid ""
+"One\n"
+"Sub"
+msgstr "one fourth"
 
-#. 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:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL å? å¯?\n"
+"TLS å? å¯?\n"
+"ä¸?å? å¯?"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Search Filter"
 msgstr "æ??å°?é??æ¿¾å?¨"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 msgstr "æ??å°?èµ·é»?(_B):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 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
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 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\"."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr "æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?æ²?æ??è¢«ä¿®æ?¹ï¼?é ?è¨ç??æ??å°?ç?®æ¨?æ?¯ã??personã??ç?©ä»¶é¡?å??ã??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ SSL)ã??"
-
-#: ../addressbook/gui/component/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 ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ TLS)ã??"
-
-#: ../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
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 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
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr "æ??å°?å?ºç¤?æ?¯æ??é ?ç?®ç??å?¯è¾¨è?å??ç¨± (DN)ï¼?æ??å°?æ??ç?±æ¤è??é??å§?ã??å¦?æ??æ¤è??ç©ºç?½ï¼?æ??å°?æ??å?¨ç?®é??æ¨¹ç??åº?å±¤é??å§?ã??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h: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 "æ??å°?ç¯?å??æ??å®?ç¾©ä½ æ?³å¾?ç¶²çµ¡ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??\"sub\" ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??ä¸?å??ã??ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "é??æ?¯ä½ ç?? LDAP ä¼ºæ??å?¨ç??å®?æ?´å??ç¨±ã??ä¾?å¦?ï¼?ã??ldap.mycompany.comã??ã??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr "é??æ?¯è¦?ä¸?è¼?é ?ç?®ç??æ?¸ç?®ä¸?é??ã??å°?æ¤æ?¸å?è¨å®?æ??å¤ªå¤§æ??æ¸?æ?¢é??è¨?é??ç??é??åº¦ã??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h: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
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr "é??æ?¯æ¤ä¼ºæ??å?¨ç??å??ç¨±ï¼?æ??é¡¯ç¤ºå?¨ä½ ç?? Evolution è³?æ??å¤¾æ¸?å?®ä¸ã??å®?å??ç?¨æ?¼é¡¯ç¤ºç?¨é??ã?? "
 
-#: ../addressbook/gui/component/ldap-config.glade.h: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
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "ä¸?è¼?é??å?¶(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 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
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "é?£æ?¥å? (_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 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
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "ä¼ºæ??å?¨(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "æ??é??(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "å?¡ç??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../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:652
-#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:668
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "å??é??"
 
@@ -1275,27 +1186,25 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>é??é ?</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>å??è¨»</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>å?¶ä»?</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>é?»è©±</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>ç¶²å??</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>å·¥ä½?</b>"
 
-#: ../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"
-
 #: ../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
@@ -1303,16 +1212,16 @@ 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-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../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/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "è?¯çµ¡äººç·¨è¼¯å?¨"
 
@@ -1321,1281 +1230,260 @@ msgid "Full _Name..."
 msgstr "å?¨å??(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2478
 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.glade.h:17
 msgid "Mailing Address"
 msgstr "é?µå¯?å?°å??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.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.glade.h:20
-msgid "Novell Groupwise"
-msgstr "Novell GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "å??è¨»"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "å??äººè³?æ??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 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
-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.glade.h:21
 msgid "_Address:"
 msgstr "å?°å??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "é?±å¹´ç´?å¿µæ?¥(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "å?©ç??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "ç??æ?¥(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:792
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:805
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "è¡?äº?æ??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "ç¸£/å¸?(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "å?¬å?¸(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "å??å®¶/å?°å??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "é?¨é??(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "æ¸æª?ç?º(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "ç©ºé??/å¿?ç¢?(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "é¦?é ?(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 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.glade.h:34
 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.glade.h:35
 msgid "_PO Box:"
 msgstr "é?µç®±(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "è?·æ¥(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 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.glade.h:38
 msgid "_State/Province:"
 msgstr "å·?/ç??(_S):"
 
 # (Abel) è?·ç¨±å??è¼¸å?¥é?£çµ¡äººæ??ç?? Title (Dr., Ms.) æ??è¡?çª?
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "é??é (_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "è¦?å??äº¤è«?(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "å?¯æ?¥å?? H_TML é?µä»¶"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "ç¶²èª?(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "é??è¨?é??(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 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:85
+#: ../mail/em-mailer-prefs.c:472
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../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-editor/e-contact-editor.c:289
 #: ../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-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../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/widgets/e-minicard-view.c:544
+#: ../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:3685
-#: ../widgets/text/e-text.c:3686
+#: ../widgets/table/e-cell-text.c:1816 ../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 "è??å³¶"
-
-#: ../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 Instant Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+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:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 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 "ä½¿ç?¨è??å??ç¨±"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "å·¥ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "ä½?å®¶"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2287
 msgid "Other"
 msgstr "å?¶ä»?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "ä¾?æº?é??è¨?é??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "ç?®æ¨?é??è¨?é??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "æ?¯æ?°è?¯çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "å?¯å¯«ç??æ¬?ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "å¿?è¦?æ¬?ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 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:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, 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:2832
 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:2833
 msgid "_No image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2603,43 +1491,43 @@ msgstr ""
 "è?¯çµ¡äººè³?æ??ç?¡æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, 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:3115
 #, 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:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, 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:3154
 msgid "Invalid contact."
 msgstr "ç?¡æ??ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "å¿«é??æ?°å¢?è?¯çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "ç·¨è¼¯å?¨é?¨(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "å?¨å??(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "é?»å?é?µä»¶(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "é?¸æ??é??è¨?é??(_S)"
 
@@ -2677,111 +1565,61 @@ msgstr ""
 "ä½ ç¢ºå®?è¦?å?ªé?¤\n"
 "é??äº?è?¯çµ¡äººï¼?"
 
-#: ../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/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "é?µé??å??è??(_Z):"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "å?¨å??"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Miss"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Mr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "å??å?(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "å§?æ°?(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "(_Middle):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "(_Suffix):"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "æ?°å¢? IM å¸³è??"
-
-#: ../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 "_IM æ??å??:"
-
-#: ../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>"
@@ -2792,9 +1630,9 @@ 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:211
+#: ../calendar/gui/e-day-view-time-item.c:810
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "é?¸æ??..."
 
@@ -2820,11 +1658,11 @@ 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-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
+#: ../addressbook/gui/widgets/e-addressbook-view.c:210
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "æ?¸æ?¬"
 
@@ -2868,33 +1706,33 @@ msgstr ""
 "æ?¼æ¤è³?æ??å¤¾ã??ä½ ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "å??ä½µ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "å??ä½µè?¯çµ¡äºº"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "é?»å?é?µä»¶"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Email begins with"
 msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 
@@ -2902,35 +1740,35 @@ msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 msgid "Name contains"
 msgstr "å??ç¨±å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "æ²?æ??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??è?¯çµ¡äºº"
 msgstr[1] "%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-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "æ?¥è©¢"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 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:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3549
-#: ../widgets/text/e-text.c:3550
+#: ../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 "æ¨¡å??"
 
@@ -2938,114 +1776,112 @@ msgstr "æ¨¡å??"
 msgid "Error modifying card"
 msgstr "ç·¨è¼¯å?¡ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
+#: ../addressbook/gui/widgets/e-addressbook-view.c:157
 msgid "Name begins with"
 msgstr "å??ç¨±é??å§?æ?¼"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
 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:565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:811
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1962
 msgid "Save as vCard..."
 msgstr "å?²å?ç?º vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:931
+#: ../calendar/gui/e-calendar-table.c:1586
+#: ../calendar/gui/e-calendar-view.c:1804 ../calendar/gui/e-memo-table.c:927
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "é??å??(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 msgid "_New Contact..."
 msgstr "æ?°å¢?è?¯çµ¡äºº(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "New Contact _List..."
 msgstr "æ?°å¢?è?¯çµ¡äººæ¸?å?®(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "_Save as vCard..."
 msgstr "å?²å?æ?? _vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Forward Contact"
 msgstr "è½?å¯?è?¯çµ¡äºº(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contacts"
 msgstr "è½?å¯?è?¯çµ¡äºº(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "Send _Message to Contact"
 msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to List"
 msgstr "å?³é??é?µä»¶çµ¦æ¸?å?®(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contacts"
 msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "_Print"
 msgstr "æ??å?°(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Cop_y to Address Book..."
 msgstr "è¤?è£½å?°é??è¨?é??(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Mo_ve to Address Book..."
 msgstr "ç§»è?³é??è¨?é??(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 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:1606
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2056 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2103 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "è¤?è£½(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "P_aste"
 msgstr "è²¼ä¸?(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "å?©ç??"
 
@@ -3075,7 +1911,7 @@ 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/e-cal-component-memo-preview.c:135
 #: ../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
@@ -3083,7 +1919,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:619
 msgid "Company"
 msgstr "å?¬å?¸"
 
@@ -3132,22 +1968,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:623
 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:644
 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:597
 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:657
 msgid "Note"
 msgstr "å??è¨»"
 
@@ -3176,14 +2012,14 @@ msgid "Radio"
 msgstr "ç?¡ç·?é?»é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:577
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "è§?è?²"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "é??å?¶"
 
@@ -3213,55 +2049,53 @@ 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/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../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:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3727 ../widgets/text/e-text.c:3728
+#: ../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:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3735 ../widgets/text/e-text.c:3736
+#: ../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 "æ??å¤§æ¬?ä½?å??ç¨±é?·åº¦"
 
@@ -3269,7 +2103,7 @@ msgstr "æ??å¤§æ¬?ä½?å??ç¨±é?·åº¦"
 msgid "Column Width"
 msgstr "æ¬?å¯¬"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3279,7 +2113,7 @@ msgstr ""
 "\n"
 "æ??å°?è?¯çµ¡äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3293,7 +2127,7 @@ msgstr ""
 "\n"
 "é?£æ??å?©ä¸?é??è£?ä»¥å»ºç«?æ?°ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3307,7 +2141,7 @@ msgstr ""
 "\n"
 "é?£æ??å?©ä¸?é??è£?ä»¥å»ºç«?æ?°ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3317,7 +2151,7 @@ msgstr ""
 "\n"
 "å°?æ?¾è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3327,41 +2161,41 @@ msgstr ""
 "\n"
 "æ²?æ??é ?ç?®å?¯ä¾?é??ç¨®æª¢è¦?æ?¹å¼?é¡¯ç¤ºã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 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:825
 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
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "å?¨ç??è¦½å?¨å?§é??å??é?£çµ?(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 
@@ -3370,96 +2204,101 @@ msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 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:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 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:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 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:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "æ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "é?¨é??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "è?·æ¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 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
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2545
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/event-editor.c:116
 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:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "é?»è©±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "å?³ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "å?°å??"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "ç¶²èª?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2578
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2539
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2579
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "è?·ç¨±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog"
 
@@ -3514,12 +2353,11 @@ 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:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
@@ -3530,13 +2368,13 @@ msgstr "ç?¡æ³?å??æ¶?"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "é©?è¨¼å¤±æ??"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "è¦?æ±?é©?è?"
 
@@ -3642,7 +2480,7 @@ msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "æ?°å¢?è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
@@ -3659,7 +2497,7 @@ msgid "Error removing list"
 msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "ç§»é?¤è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
@@ -3687,7 +2525,7 @@ msgid "Display _All Contacts"
 msgstr "é¡¯ç¤ºæ??æ??ç??è?¯çµ¡äºº(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3696,46 +2534,46 @@ msgstr ""
 "%s å·²ç¶?å?å?¨\n"
 "ä½ æ?¯å?¦è¦?è¦?å¯«å®?ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "è¦?å¯«"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "å??è?¯çµ¡äºº"
 msgstr[1] "å??è?¯çµ¡äºº"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "æ¸?å?®"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "å°?è?¯çµ¡äººç§»å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "è¤?è£½è?¯çµ¡äººå?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "å°?è?¯çµ¡äººç§»å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "è¤?è£½è?¯çµ¡äººå?°"
 
@@ -3759,329 +2597,128 @@ msgstr "è?¯çµ¡äººè³?è¨?"
 msgid "Contact information for %s"
 msgstr "%s ç??è?¯çµ¡äººè³?è¨?"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 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] "å??å?¦å¤? 1 å??è?¯çµ¡äººã??"
-msgstr[1] "å??å?¦å¤? %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:512
 #: ../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:687 ../shell/shell.error.xml.h:7
 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:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP è³?æ??äº¤æ??æ ¼å¼? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 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 (.vcfã??.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 "é ?è¦½:"
-
-# zh_HK: msgstr "ä½¿ç?¨ç?°é??æ??å?°"
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "ä½¿ç?¨ç?°é??æ??å?°"
-
-# zh_HK: 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 "æ?ªè??ç??ç??é?¯èª¤"
 
@@ -4451,7 +3088,7 @@ msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨ä½ ç??å·¥ä½?ã??"
 msgid "_Discard Changes"
 msgstr "æ?¾æ£?æ?´æ?¹(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "å?²å?(_S)"
 
@@ -4473,56 +3110,56 @@ msgstr "å?³é??é??ç?¥(_S)"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "å??å?²å¤?æ?¥äº?ä»¶:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../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/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "ç?¡æ³?å??å?? Evolution è³?æ??ä¼ºæ??å?¨"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "ç?¡æ³?è®?å?? pilot è¡?äº?æ??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å??å¿?é??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "ç?¡æ³?å¯«å?¥ pilot å??å¿?é??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "é ?è¨å?ªå??é ?åº?:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å¾?è¾¦äº?é ?ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å¾?è¾¦äº?é ?ç¨?å¼?å??å¡?"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "è¡?äº?æ??"
 
@@ -4563,24 +3200,24 @@ msgid "Memo_s"
 msgstr "å??å¿?é??(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:288 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1843 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "å??å¿?é??"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:720 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1711 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c: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
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "å·¥ä½?"
@@ -4591,7 +3228,7 @@ msgstr "è¡?äº?æ??(_C)"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "å·¥ä½?(_T)"
 
@@ -4599,27 +3236,26 @@ msgstr "å·¥ä½?(_T)"
 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:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../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:653
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
@@ -4634,10 +3270,10 @@ msgstr "å?¨é?¨è§£é?¤(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../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:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "ä½?ç½®:"
 
@@ -4650,11 +3286,11 @@ msgid "_Dismiss"
 msgstr "è§£é?¤(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4670,32 +3306,32 @@ msgstr "å»¶æ??(_S)"
 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-queue.c:1458
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 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:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1469
 msgid "No description available."
 msgstr "æ²?æ??ä»»ä½?æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No location information available."
 msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, 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
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1710
 #: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1686
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4707,7 +3343,7 @@ msgstr ""
 "é??å?ºé?»å?é?µä»¶ã??  Evolution æ??é¡¯ç¤º\n"
 "æ?®é??ç??æ??é??å°?è©±ç??ä¾?ä»£æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4724,7 +3360,7 @@ msgstr ""
 "\n"
 "ä½ ç¢ºå®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1730
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
@@ -4797,627 +3433,622 @@ 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 "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:13
 msgid "Default appointment reminder"
 msgstr "é ?è¨ç??ç´?æ??æ??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder units"
 msgstr "é ?è¨æ??é??ç??å?®ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder value"
 msgstr "é ?è¨æ??é??ç??æ?¸å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 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:17
 msgid "Event Gradient"
 msgstr "äº?ä»¶æ¼¸è®?è?²æ??æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Transparency"
 msgstr "äº?ä»¶é??æ??æ??æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy server URLs"
 msgstr "ç©ºé??/å¿?ç¢?ä¼ºæ??å?¨ç¶²å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy template URL"
 msgstr "ç©ºé??/å¿?ç¢?ç¯?æ?¬ç¶²å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 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:22
 msgid "Hide completed tasks"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task units"
 msgstr "é?±è??å·¥ä½?å?®ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task value"
 msgstr "é?±è??å·¥ä½?æ?¸å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Horizontal pane position"
 msgstr "æ°´å¹³çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 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:27
 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:28
 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:29
 msgid "Last alarm time"
 msgstr "ä¸?æ¬¡é¬§é?´æ??å?»"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 #: ../mail/evolution-mail.schemas.in.h:72
 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:31
 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:32
 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:33
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains ç·?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 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:35
 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:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "å?¨ã??day_second_zonesã??æ¸?å?®ä¸è¦?è¨?ä½?ç??æ??è¿?ä½¿ç?¨æ??å??æ?¸ç?®ç??æ??å¤§å?¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 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:38
 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:39
 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:40
 msgid "Month view horizontal pane position"
 msgstr "æ??æª¢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Month view vertical pane position"
 msgstr "æ??æª¢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 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:43
 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:44
 msgid "Overdue tasks color"
 msgstr "é??æ??ç??å·¥ä½?è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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:46
 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:47
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 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:49
 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:50
 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:51
 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:52
 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:53
 msgid "Save directory for alarm audio"
 msgstr "å?²å?é¬§é?´é?³æ??æª?ç?®é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Scroll Month View by a week"
+msgstr "ä»¥é?±ç?ºå?®ä½?æ?²å??æ??æª¢è¦?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 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:57
 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:58
 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:59
 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:60
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Show the \"Preview\" pane"
 msgstr "é¡¯ç¤ºã??é ?è¦½ã??çª?æ ¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Show the \"Preview\" pane."
 msgstr "é¡¯ç¤ºã??é ?è¦½ã??çª?æ ¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 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:64
 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:65
 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:66
 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:67
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr "å¦?æ??è¨å®?å??æ??å?¨æ?¥æª¢è¦?ä¸é¡¯ç¤ºç¬¬äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??è¨å®?é?µç??ç?¨æ³?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Tasks due today color"
 msgstr "ä»?å¤©å?°æ??å·¥ä½?ç??è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Tasks vertical pane position"
 msgstr "å·¥ä½?å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr "ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??ç¶²å??ç¯?æ?¬ï¼?%u è¦?ä»¥é?»å?é?µä»¶ä½?å??ç??ä½¿ç?¨è??å??ç¨±é?¨å??ä¾?å??ä»£ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??ç¨±ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "ç?¨æ?¼è¡?äº?æ??ä¸æ?¥æ??è??æ??å?»ç??é ?è¨æ??å??ï¼?æ?ªç¿»è¯ç?? Olsen æ??å??è³?æ??åº«ä½?ç½®å°±å?? \"America/New York\"ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 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:74
 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:75
 msgid "Time divisions"
 msgstr "æ??é??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Time the last alarm ran, in time_t."
 msgstr "ä¸?æ¬¡é¬§é?´å?·è¡?ç??æ??é??(_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:77
 msgid "Timezone"
 msgstr "æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "è¡?äº?æ??æª¢è¦?ä¸ç??äº?ä»¶é??æ??å??æ??æ??ï¼?æ?¸å?¼ä»?æ?¼ 0 (å®?å?¨é??æ??)å?° 10 (ä¸?é??æ??)ä¹?é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Twenty four hour time format"
 msgstr "24 å°?æ??å?¶æ ¼å¼?"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "é ?è¨æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 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:82
+msgid "Use system timezone"
+msgstr "ä½¿ç?¨ç³»çµ±æ??å??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Week start"
 msgstr "ä¸?é?±é??å§?æ?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 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:86
 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:87
 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:88
 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:89
 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:90
 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:91
 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:92
 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:93
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "æ?¯å?¦ä»¥é?±ç?ºå?®ä½?æ?²å??æ??æª¢è¦?ï¼?è??é??ä»¥æ??ç?ºå?®ä½?ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 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:95
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 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:97
 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:98
 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:99
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "æ?¯å?¦ä½¿ç?¨ 24 å°?æ??å?¶æ??é??è??ä¸?æ?¯ä½¿ç?¨ä¸?å??/ä¸?å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 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:101
 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:102
 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:103
 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:104
 msgid "Work days"
 msgstr "å·¥ä½?æ?¥"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday end hour"
 msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Workday end minute"
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Workday start hour"
 msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 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
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "ä¸»æ?¨å??å?«"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "å??é¡?ç?º"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "å??è¨»å??å?«"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "ä½?ç½®å??å?«"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "æ?ªä¾? 7 å¤©ç??å·¥ä½?"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "é?²è¡?ä¸ç??å·¥ä½?"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "é??æ??ç??å·¥ä½?"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "å·²å®?æ??ç??å·¥ä½? "
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "æ??é??å? æª?æ¡?ç??å·¥ä½?"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "é?²è¡?ä¸ç??ç´?æ??"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "æ?ªä¾? 7 å¤©ç??ç´?æ??(_P)"
 
 # zh_HK: 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
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "æ??å?°"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:312
 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
+#: ../calendar/gui/calendar-commands.c:318
 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:654
-#: ../plugins/google-account-setup/google-contacts-source.c:368
+#: ../calendar/gui/calendar-commands.c:323
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:670
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "å¤©"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "å?¨ç¶²ç«?ä¸?"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "å¤©æ°£"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "æ?°å¢?è¡?äº?æ??(_N)"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "è¤?è£½(_C)..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "æ¨?è¨?ç?ºä¾?é?¢ç·?ä½¿ç?¨(_M)"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "ä¸?å??è¨±æ¤é ?å?¨é?¢ç·?ç??æ??ä½¿ç?¨(_D)"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "å??ç´?è¡?äº?æ??å¤±æ??ã??"
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s' ä¾?å»ºç«?äº?ä»¶å??æ??è°"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "æ²?æ??è¡?äº?æ??å?¯ç?¨ä¾?å»ºç«?äº?ä»¶å??æ??è°"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "è¡?äº?æ??ä¾?æº?é?¸æ??å?¨"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "æ?°å¢?ç´?æ??"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "æ?°å¢?æ??è°"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æ??è°(_E)"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "å»ºç«?æ?°æ??è°è¦?æ±?"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "å?¨æ?¥ç´?æ??(_P)"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "å»ºç«?æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "æ?°è¡?äº?æ??"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "å»ºç«?æ?°è¡?äº?æ??"
 
@@ -5459,20 +4090,20 @@ 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 "å??é¡?"
+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:568
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:351 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 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/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
@@ -5492,21 +4123,27 @@ 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:718
+#: ../plugins/save-calendar/csv-format.c:371
+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:567
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:349 ../calendar/gui/e-calendar-table.c:563
 #: ../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:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246
+#: ../calendar/gui/e-cal-model.c:340 ../calendar/gui/e-cal-model.c:347
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
@@ -5516,11 +4153,11 @@ 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:357
 msgid "Summary"
 msgstr "æ??è¦?"
 
@@ -5540,35 +4177,56 @@ 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
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "é??å??è¡?äº?æ??æ??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "é??å??è¡?äº?æ??æ??ä¸?æ?¯æ?´æ?¹æ³?"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "æ²?æ??é??å??è¡?äº?æ??ç??æ¬?é??"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438
+#: ../plugins/mail-to-task/mail-to-task.c:455 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "ç·¨è¼¯é¬§é?´"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "é¡¯ç¤ºæ??ç¤º"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "æ?æ?¾é?³æ??"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "å?·è¡?å¤?é?¨ç¨?å¼?"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "å?³é??é?»å?é?µä»¶"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>é¬§é?´</b>"
@@ -5598,83 +4256,70 @@ 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.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "å?·è¡?å¤?é?¨ç¨?å¼?"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "è«?é?¸å??æª?æ¡?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.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.glade.h:10
 msgid "_Arguments:"
 msgstr "å¼?æ?¸(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "å?·è¡?ç¨?å¼?(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "é??è¤?é¬§é?´(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "è?²é?³(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "ä¹?å¾?"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-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
-msgid "day(s)"
-msgstr "æ?¥"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "ç´?æ??çµ?æ??"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+#| msgid "before"
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"å??æ?¼\n"
+"æ??æ?¼"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "æ??é??é??é??æ¯?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "å°?æ??"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"å??é??\n"
+"å°?æ??\n"
+"æ?¥"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "å??é??"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"å??é??\n"
+"å°?æ??\n"
+"æ?¥"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "ç´?æ??é??å§?"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"ç´?æ??é??å§?\n"
+"ç´?æ??çµ?æ??"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5690,39 +4335,38 @@ msgstr "å? å?¥(_A)"
 msgid "Alarms"
 msgstr "é¬§é?´"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "é??å? æª?æ¡?"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:135
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/event-page.c:2959
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:783
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:706 ../mail/em-account-editor.c:1435
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../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
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:647
 msgid "Selected Calendars for Alarms"
 msgstr "é?¸æ??é¬§é?´è¡?äº?æ??"
 
@@ -5751,36 +4395,36 @@ msgid ""
 msgstr "<i>%u è?? %d æ??è¢«æ?¿æ??ç?ºé?»å?é?µä»¶ä½?å??ä¸ç??ä½¿ç?¨è??è??ç¶²å??å??ç¨±ã??</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">é¬§é?´</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">è¦å??</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">é ?è¨ç©ºé??/å¿?ç¢?ä¼ºæ??å?¨</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">ä¸?è?¬</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">å·¥ä½?æ¸?å?®</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">æ??é??</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">å·¥ä½?é?±</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "èª¿æ?´æ?¥å??ç¯?ç´?æ??é??(_V)"
-
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
@@ -5789,13 +4433,17 @@ msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
 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.glade.h:19
+msgid "Display alarms in _notification area only"
+msgstr "å?ªå?¨é??ç?¥å??å??ä¸é¡¯ç¤ºé¬§é?´(_N)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.c:1107
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5805,13 +4453,13 @@ msgstr ""
 "å°?æ??\n"
 "æ?¥"
 
-#: ../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.glade.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5829,215 +4477,231 @@ msgstr ""
 "æ??æ??å?\n"
 "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "æ??é?¸é¡?è?²"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 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.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "æ??æ??å?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Sc_roll Month View by a week"
+msgstr "ä»¥é?±æ?²å??æ??æª¢è¦?(_R)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Se_cond zone:"
 msgstr "ç¬¬äº?æ??å??(_C):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Select the calendars for alarm notification"
 msgstr "é?¸æ??é¬§é?´é??ç?¥ç??è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Sh_ow a reminder"
 msgstr "é¡¯ç¤ºæ??é??æ?¼ç´?æ??(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show a _reminder"
 msgstr "é¡¯ç¤ºæ??é??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week _numbers in date navigator"
 msgstr "å?¨æ?¥æ??å°?è¦½é¡¯ç¤ºé?±æ?¸(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 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.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "T_asks due today:"
 msgstr "ä»?å¤©å?°æ??ç??å·¥ä½?(_A):"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "T_hu"
 msgstr "é?±å??(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 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.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "æ??å??(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 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.glade.h:56
+#: ../calendar/gui/dialogs/recurrence-page.c:1104
+#: ../calendar/gui/e-itip-control.c:728
 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.glade.h:57
+msgid "Use s_ystem time zone"
+msgstr "ä½¿ç?¨ç³»çµ±æ??å??(_Y)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/recurrence-page.c:1105
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "Wee_k starts on:"
 msgstr "ä¸?é?±é??å§?æ?¼(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work days:"
 msgstr "å·¥ä½?æ?¥:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_12 hour (AM/PM)"
 msgstr "_12 å°?æ?? (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_24 hour"
 msgstr "_24 å°?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Ask for confirmation when deleting items"
 msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??ç¢ºèª?(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Compress weekends in month view"
 msgstr "å?¨æ??æª¢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Day begins:"
 msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Fri"
 msgstr "é?±äº?(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Hide completed tasks after"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Mon"
 msgstr "é?±ä¸?(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Overdue tasks:"
 msgstr "é??æ??ç??å·¥ä½?(_O):"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "_Sat"
 msgstr "é?±å?(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 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.glade.h:76
 msgid "_Time divisions:"
 msgstr "æ??é??é??é??(_T):"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
 msgid "_Tue"
 msgstr "é?±äº?(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
 msgid "_Wed"
 msgstr "é?±ä¸?(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
 msgid "before every anniversary/birthday"
 msgstr "å?¨æ¯?å??é?±å¹´ç´?å¿µæ?¥/ç??æ?¥ä¹?å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
 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: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
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 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 "iCalendar é?¯èª¤"
 
-#: ../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 "æ?°å¢?å??å¿?é??æ¸?å?®"
 
@@ -6090,297 +4754,233 @@ msgstr "%s  ä½ æ²?æ??å??ä»»ä½?æ?´æ?¹ï¼?æ?´æ?°é??å??ç·¨è¼¯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "ç¢ºèª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " å?° "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr "(æ??é??)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2362
 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:1770
-#: ../composer/e-msg-composer.c:1989
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "é??å?  1 å??è¨?æ?¯"
-msgstr[1] "é??å?  %d å??è¨?æ?¯"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2057
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "ç§»å??(_M)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "å??æ¶?æ??æ??(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "é??ä»¶"
+#: ../calendar/gui/dialogs/comp-editor.c:221
+msgid "Could not save attachments"
+msgstr "ç?¡æ³?å?²å?é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:483
 msgid "Could not update object"
 msgstr "ç?¡æ³?æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:572
 msgid "Edit Appointment"
 msgstr "ç·¨è¼¯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:579
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:581
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:587
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Task - %s"
 msgstr "å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:594
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:610
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:958
 msgid "Click here to close the current window"
 msgstr "æ??é??è£?ä»¥é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:965
 msgid "Copy selected text to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??æ??å?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "Cut selected text to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??æ??å?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:979
 msgid "Click here to view help available"
 msgstr "æ??é??è£?ä»¥æª¢è¦?å?¯ç?¨ç??èªªæ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:986
 msgid "Paste text from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1007
 msgid "Click here to save the current window"
 msgstr "æ??é??è£?ä»¥å?²å?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1014
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1021
 msgid "_Classification"
-msgstr "å??é¡?(_C)"
+msgstr "æ¸é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1035
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "æª?æ¡?(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1042
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1049
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1056
 msgid "_Options"
 msgstr "é?¸é ?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1063 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "é??ä»¶(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1075
 msgid "Click here to attach a file"
 msgstr "æ??é??è£?ä»¥é??å? æª?æ¡?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1102
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1104
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "_Private"
 msgstr "ç§?äºº(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "Classify as private"
 msgstr "æ¸é¡?ç?ºç§?äºº"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1116
 msgid "_Confidential"
 msgstr "æ©?å¯?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1118
 msgid "Classify as confidential"
 msgstr "æ¸é¡?ç?ºæ©?å¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "R_ole Field"
 msgstr "è§?è?²æ¬?ä½?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1142
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../composer/e-composer-private.c:66
 msgid "Recent _Documents"
 msgstr "æ??è¿?ä½¿ç?¨æ??ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1602
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "é??å? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> å??é??å? æª?æ¡?"
-msgstr[1] "<b>%d</b> å??é??å? æª?æ¡?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "é?±è??é??å? æª?æ¡?å??(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "é¡¯ç¤ºé??å? æª?æ¡?å??(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../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:2094
-#: ../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:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "é¡¯ç¤ºé??å? æª?æ¡?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "æ??ä¸?ç©ºç?½é?µå??æ??é??å? æª?æ¡?å??"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3348
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1913
+#: ../calendar/gui/dialogs/comp-editor.c:2760
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ??æ?°ç??æ?´æ?°ï¼?å??æ??æ?¾æ£?å°?æ¤é ?ç?®æ??å??ç??æ?´æ?¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3377
+#: ../calendar/gui/dialogs/comp-editor.c:2729 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "é??ä»¶"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2789
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?ä½¿ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
@@ -6453,7 +5053,7 @@ msgid "Contacts..."
 msgstr "è?¯çµ¡äºº..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "å§?è¨?çµ¦ï¼?"
 
@@ -6480,7 +5080,7 @@ msgstr "å°?æ¤é ?è¨ç?ºå¾ªç?°äº?ä»¶"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../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
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "å?³é??é?¸é ?"
 
@@ -6517,122 +5117,127 @@ msgstr "æ?¥è©¢æ¤å?°æ??è??ç??ç©ºé??/å¿?ç¢?è³?è¨?"
 msgid "Appoint_ment"
 msgstr "ç´?æ??(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:749
+#: ../calendar/gui/dialogs/event-page.c:2735
 msgid "This event has alarms"
 msgstr "é??å??äº?ä»¶å?·æ??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:799
+#: ../calendar/gui/dialogs/event-page.c:812
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "æ??è°å?¬é??äºº(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:859
 msgid "_Delegatees"
 msgstr "ä»£ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:861
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1046
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1049
 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:1218
+#: ../calendar/gui/dialogs/memo-page.c:639
+#: ../calendar/gui/dialogs/task-page.c:814
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1228
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1251
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1258
 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:1420
+#: ../calendar/gui/dialogs/memo-page.c:680
+#: ../calendar/gui/dialogs/task-page.c:874
 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:1426
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:880
 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:1451
+#: ../calendar/gui/dialogs/task-page.c:904
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1890
+#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "ç§»é?¤(_R)"
+
+#: ../calendar/gui/dialogs/event-page.c:1891
+#: ../calendar/gui/dialogs/task-page.c:1201
 msgid "_Add "
 msgstr "æ?°å¢?(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2611
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:2655
+#: ../calendar/gui/dialogs/memo-page.c:895
 #: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ä½ æ£æ??ä»» %s ç??ä»£ç??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2933
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 msgstr[1] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ç´?æ??å?? %d å°?æ??"
 msgstr[1] "ç´?æ??å?? %d å°?æ??"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ç´?æ??å?? %d å??é??"
 msgstr[1] "ç´?æ??å?? %d å??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2958
 msgid "Customize"
 msgstr "è?ªé?¸"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "ç´?æ??å?? 1 å¤©"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "ç´?æ??å?? 1 å°?æ??"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "ç´?æ??å?? 15 å??é??"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"ç´?æ??å?? 15 å??é??\n"
+"ç´?æ??å?? 1 å°?æ??\n"
+"ç´?æ??å?? 1 å¤©"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
@@ -6659,58 +5264,54 @@ 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
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
+#: ../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):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
-# (Abel) é??æ??ä¸?è??è¦?ç?¨ï¼?å°±æ?¯å? ç´?æ??ç?? main dialog:
-# æ??é??(T):  [æ?¥æ??] [æ??é??] [for] [1]æ?? [0]å??é??
-#. 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
-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
-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/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "æ??è°å?¬é??äºº:"
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"æ?¼\n"
+"ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:856
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
+#: ../calendar/gui/dialogs/memo-page.c:1011 ../mail/em-format-html.c:1565
+#: ../mail/em-format-html.c:1623 ../mail/em-format-html.c:1648
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "æ?¶ä»¶è??"
@@ -6750,37 +5351,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:559
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?ç·¨è¼¯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:888
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "End time of the recurrence was before event's start"
 msgstr "é?±æ??æ?§äº?ä»¶ç??çµ?æ??æ??å?»æ?©æ?¼é??å§?æ??å?»"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:957
 msgid "on"
 msgstr "ç??"
 
@@ -6788,7 +5389,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:1014
 msgid "first"
 msgstr "ä¸?"
 
@@ -6797,7 +5398,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:1020
 msgid "second"
 msgstr "äº?"
 
@@ -6805,7 +5406,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:1025
 msgid "third"
 msgstr "ä¸?"
 
@@ -6813,7 +5414,7 @@ msgstr "ä¸?"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1030
 msgid "fourth"
 msgstr "å??"
 
@@ -6821,13 +5422,13 @@ msgstr "å??"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 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:1059
 msgid "Other Date"
 msgstr "å?¶å®?æ?¥æ??"
 
@@ -6835,7 +5436,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:1065
 msgid "1st to 10th"
 msgstr "1æ?¥è?³10æ?¥"
 
@@ -6843,7 +5444,7 @@ msgstr "1æ?¥è?³10æ?¥"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "11th to 20th"
 msgstr "11æ?¥è?³20æ?¥"
 
@@ -6851,45 +5452,45 @@ msgstr "11æ?¥è?³20æ?¥"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "21st to 31st"
 msgstr "21æ?¥è?³31æ?¥"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 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:1231
 msgid "on the"
 msgstr "å?¨ç¬¬"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1401
 msgid "occurrences"
 msgstr "æ¬¡"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2096
 msgid "Add exception"
 msgstr "å? å?¥ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2137
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?ç·¨è¼¯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2143
 msgid "Modify exception"
 msgstr "ç·¨è¼¯ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2187
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2311
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
@@ -6906,50 +5507,52 @@ msgstr "<b>é ?è¦½</b>"
 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
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 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
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 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
-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
-msgid "month(s)"
-msgstr "æ??"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"å¤©\n"
+"é?±\n"
+"æ??\n"
+"å¹´"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "é?±"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "å¹´"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"æ?¼\n"
+"ç?´å?°\n"
+"æ°¸é? "
 
 #: ../calendar/gui/dialogs/send-comp.c:116
 msgid "Send my alarms with this event"
 msgstr "å°?æ??ç??é¬§é?´è??é??å??äº?ä»¶ä¸?èµ·é??å?º"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "ç¶²é ?"
 
@@ -6961,74 +5564,38 @@ msgstr "<span weight=\"bold\">é??é ?</span>"
 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:663 ../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:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-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:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-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:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "é?²è¡?ä¸"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"é«?\n"
+"ä¸\n"
+"ä½?\n"
+"æ?ªå®?ç¾©"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-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:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-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:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "æ?ªé??å§?"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"å°?æ?ªé??å§?\n"
+"é?²è¡?ä¸\n"
+"å·²å®?æ??\n"
+"å·²å??æ¶?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "å®?æ??ç?¾å??æ¯?(_E):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "ç??æ??(_U):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "æ?ªæ??å®?"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "å®?æ??æ?¥æ??(_D):"
@@ -7051,7 +5618,7 @@ 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
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
@@ -7068,7 +5635,7 @@ msgstr "å·¥ä½?è©³ç´°è³?æ??"
 msgid "Organi_zer:"
 msgstr "æ??è°å?¬é??äºº(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:787
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
@@ -7169,80 +5736,161 @@ msgstr "%s å?¨ %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:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+msgid "I_mport"
+msgstr "å?¯å?¥(_M)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+msgid "Select a Calendar"
+msgstr "é?¸æ??è¡?äº?æ??"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+msgid "Select a Task List"
+msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+msgid "I_mport to Calendar"
+msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr "å?¯å?¥è?³å·¥ä½?(_M)"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 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
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "é??å§?æ?¥æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../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
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "æ??è¿°:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "ç¶²é ?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "æ??è¦?:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 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:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "ç??æ??:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "é?²è¡?ä¸"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "å·²å®?æ??"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:657 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "æ?ªé??å§?"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "å?ªå??ç?ç´?:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:584 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "é«?"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1057 ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "ä¸?è?¬"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "ä½?"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+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:640
+#: ../calendar/gui/e-calendar-table.c:636
 msgid "Free"
 msgstr "ç©ºé??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7252,225 +5900,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1063
 #: ../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-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../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-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1063
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 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-cal-model.c:353 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c: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:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../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:1059
 msgid "Recurring"
 msgstr "å¾ªç?°æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1061
 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:2217
-msgid "Select folder to save selected attachments..."
-msgstr "é?¸æ??ç?¨ä¾?å?²å?é?¸å®?ç??é??å? æª?æ¡?ç??è³?æ??å¤¾..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../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 å?§é??å??..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:334
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2399
+#: ../calendar/gui/e-calendar-table.c:370
+#: ../calendar/gui/e-calendar-view.c:2427
 #, 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:375
-#: ../calendar/gui/e-calendar-view.c:2403
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2431
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è°å?¬é??äºº: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "Start: "
 msgstr "é??å§?:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "æ?ªæ??å®?"
+
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:892
+#: ../calendar/gui/e-calendar-view.c:657 ../calendar/gui/e-memo-table.c:444
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-view.c:871 ../calendar/gui/e-memo-table.c:649
 msgid "Updating objects"
 msgstr "æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1359
+#: ../calendar/gui/e-calendar-view.c:1331 ../calendar/gui/e-memo-table.c:823
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "å?¦å?æ?°æª?..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New _Task"
 msgstr "æ?°å¢?å·¥ä½?(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:928
 msgid "Open _Web Page"
 msgstr "é??å??ç¶²é ?(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1805 ../calendar/gui/e-memo-table.c:929
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "å?¦å?æ?°æª?(_S)..."
+
+#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1790 ../calendar/gui/e-memo-table.c:930
 msgid "P_rint..."
 msgstr "æ??å?°(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1810 ../calendar/gui/e-memo-table.c:934
 #: ../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:1607
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:936
 #: ../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:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1599 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "æ??æ´¾å·¥ä½?(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1600 ../calendar/gui/e-memo-table.c:940
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "ä»¥ iCale_ndar è½?å¯?"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1601
 msgid "_Mark as Complete"
 msgstr "æ¨?ç¤ºç?ºå®?æ??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark Selected Tasks as Complete"
 msgstr "æ¨?ç¤ºé?¸å®?ç??å·¥ä½?ç?ºå·²å®?æ??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Incomplete"
 msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "æ¨?ç¤ºé?¸å®?ç??å·¥ä½?ç?ºæ?ªå®?æ??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Delete Selected Tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1844
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "è«?æ??é??è£?å¢?å? æ?°ç??å·¥ä½?"
@@ -7488,167 +6111,167 @@ 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:368
 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:602
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "ç??æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1444
+#: ../calendar/gui/e-calendar-view.c:1476
 msgid "Moving items"
 msgstr "ç§»å??é ?ç?®"
 
-#: ../calendar/gui/e-calendar-view.c:1446
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Copying items"
 msgstr "è¤?è£½é ?ç?®"
 
-#: ../calendar/gui/e-calendar-view.c:1755
+#: ../calendar/gui/e-calendar-view.c:1784
 msgid "New _Appointment..."
 msgstr "æ?°å¢?ç´?æ??(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1756
+#: ../calendar/gui/e-calendar-view.c:1785
 msgid "New All Day _Event"
 msgstr "æ?°å¢?å?¨å¤©äº?ä»¶(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1757
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Meeting"
 msgstr "æ?°å¢?æ??è°(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
+#: ../calendar/gui/e-calendar-view.c:1797
 msgid "_Current View"
 msgstr "ç?®å??æª¢è¦?(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1770
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "Select T_oday"
 msgstr "é?¸æ??ä»?å¤©(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "_Select Date..."
 msgstr "é?¸æ??æ?¥æ??(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1777
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Pri_nt..."
 msgstr "æ??å?°(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1816
 msgid "Cop_y to Calendar..."
 msgstr "è¤?è£½è?³è¡?äº?æ??(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1817
 msgid "Mo_ve to Calendar..."
 msgstr "ç§»è?³è¡?äº?æ??(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "_Delegate Meeting..."
 msgstr "å§?æ´¾æ??è°(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "_Schedule Meeting..."
 msgstr "æ??è°æ??ç¨?(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Forward as iCalendar..."
 msgstr "ä»¥ iCale_ndar è½?å¯?..."
 
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Reply"
 msgstr "å??è¦?(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1822
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??äºº(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1798
+#: ../calendar/gui/e-calendar-view.c:1827
 msgid "Make this Occurrence _Movable"
 msgstr "å°?é??å??äº?ä»¶æ¨?ç¤ºæ??å?¯ç§»å??(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1828 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "å?ªé?¤é??å??äº?ä»¶(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Delete _All Occurrences"
 msgstr "å?ªé?¤å?¨é?¨äº?ä»¶(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:2254
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2282
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../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-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:2255
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../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-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2284
 #: ../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-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "æ?«è¨?"
 
-#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-calendar-view.c:2285
 #: ../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-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
 
-#: ../calendar/gui/e-calendar-view.c:2258
+#: ../calendar/gui/e-calendar-view.c:2286
 msgid "Needs action"
 msgstr "é??è¦?å??ä½?"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2447 ../calendar/gui/print.c:2501
 #, 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:2478
 #, 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:105
 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:108
 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:116
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7661,12 +6284,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:745
 #, 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:766
 msgid "Show the second time zone"
 msgstr "é¡¯ç¤ºç¬¬äº?æ??å??"
 
@@ -7676,48 +6299,48 @@ 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:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1570
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. 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:799 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 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:802 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 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:2320
+#: ../calendar/gui/e-day-view.c:2301
 #, c-format
 msgid "Week %d"
 msgstr "ç¬¬ %d é?±"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "æ?¯ã??(è¤?é??å¾ªç?°)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "æ¯?å¤©"
 msgstr[1] "æ¯? %d å¤©"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "æ¯?é?±"
 msgstr[1] "æ¯? %d é?±"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7725,35 +6348,35 @@ msgstr[0] "æ¯?é?±æ?¼"
 msgstr[1] "æ¯? %d é?±æ?¼"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " å?? "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s æ?¥æ?¼ "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s æ?¥æ?¼ "
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "æ¯?æ??"
 msgstr[1] "æ¯? %d æ??"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "æ¯?å¹´"
 msgstr[1] "æ¯? %d å¹´"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7761,36 +6384,36 @@ msgstr[0] "ç¸½å?± %d æ¬¡"
 msgstr[1] "ç¸½å?± %d æ¬¡"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr "ï¼?çµ?æ??æ?¼ "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "é??å§?"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "æ?ªæ¢"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar è³?è¨?"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 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
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7801,284 +6424,284 @@ msgid "An unknown person"
 msgstr "ä¸?æ??äººå£«"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 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:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "æ??è°å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨ä½ ç??è¡?äº?æ??ä¸æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1276
 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:1353
 #, 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:1354
 msgid "Meeting Information"
 msgstr "æ??è°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, 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:1362
 #, 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:1363
 msgid "Meeting Proposal"
 msgstr "æ??è°æ??æ¡?"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, 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:1370
 msgid "Meeting Update"
 msgstr "æ??è°æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, 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:1375
 msgid "Meeting Update Request"
 msgstr "æ??è°æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, 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:1383
 msgid "Meeting Reply"
 msgstr "æ??è°ç?è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, 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:1391
 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:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, 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:1402
 msgid "Bad Meeting Message"
 msgstr "ä¸?æ£ç¢ºç??æ??è°è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, 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:1430
 msgid "Task Information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, 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:1439
 #, 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:1440
 msgid "Task Proposal"
 msgstr "å·¥ä½?è¨?å??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, 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:1447
 msgid "Task Update"
 msgstr "å·¥ä½?æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, 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:1452
 msgid "Task Update Request"
 msgstr "å·¥ä½?æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, 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:1460
 msgid "Task Reply"
 msgstr "å·¥ä½?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, 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:1468
 msgid "Task Cancelation"
 msgstr "å·¥ä½?å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "ä¸?æ£ç¢ºç??å·¥ä½?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, 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:1504
 msgid "Free/Busy Information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, 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:1509
 msgid "Free/Busy Request"
 msgstr "ç©ºé??/å¿?ç¢?è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, 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:1514
 msgid "Free/Busy Reply"
 msgstr "ç©ºé??/å¿?ç¢?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "ä¸?æ£ç¢ºç??ç©ºé??/å¿?ç¢?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??è¢«é?©ç?¶å?°çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "é??ä»¶ä¸¦æ?ªå??å?«å??æ³?ç??è¡?äº?æ??è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "é??ä»¶æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "æ?´æ?°å®?æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 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:2036
 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:2060
 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:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 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:2098 ../calendar/gui/e-itip-control.c:2155
 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:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "ç?¡æ³?å?³é??é??å??é ?ç?®ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 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:590
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "æ??çµ?"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "æ?´æ?°å??æ??ç??æ??"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 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:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "å??æ¶?"
 
@@ -8102,6 +6725,10 @@ msgstr "è¼?å?¥è¡?äº?æ??"
 msgid "Loading calendar..."
 msgstr "è¼?å?¥è¡?äº?æ??..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "æ??è°å?¬é??äºº:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "ä¼ºæ??å?¨è¨?æ?¯:"
@@ -8127,72 +6754,72 @@ 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-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 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-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.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-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 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-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 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-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 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-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 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-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 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-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 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-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "é??è¦?å??ä½?"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 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:2083
 msgid "%A, %B %d, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
@@ -8200,78 +6827,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:2114
 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:392
 msgid "Out of Office"
 msgstr "ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "å?°æ??è??(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "é?¸é ?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "é¡¯ç¤ºç¸®å°?(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "æ??æ??äººå?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "æ??æ??äººå?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "å¿?è¦?ç??äººå?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?äººå?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -8299,15 +6926,15 @@ msgstr "èª?è¨?"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:945
 msgid "_Delete Selected Memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1094 ../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-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8316,165 +6943,145 @@ msgstr ""
 "ç?¼ç??æ?¼ %s ç??é?¯èª¤ï¼?\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "æ£å?¨å?ªé?¤é?¸å®?ç??ç?©ä»¶..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "æ£å?¨å®?æ??å·¥ä½?..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "é?¤å?»ä¸"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 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:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2637
+#: ../calendar/gui/gnome-cal.c:2670
 msgid "_Custom View"
 msgstr "è?ªé?¸æª¢è¦?(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2638
+#: ../calendar/gui/gnome-cal.c:2671
 msgid "_Save Custom View"
 msgstr "å?²å?è?ªé?¸æª¢è¦?(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2643
+#: ../calendar/gui/gnome-cal.c:2676
 msgid "_Define Views..."
 msgstr "å®?ç¾©æª¢è¦?(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2880
+#: ../calendar/gui/gnome-cal.c:2913
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "è¼?å?¥ %s ç??ç´?æ??"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#: ../calendar/gui/gnome-cal.c:2928
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "è¼?å?¥ %s ç??å·¥ä½?"
 
-#: ../calendar/gui/gnome-cal.c:2904
+#: ../calendar/gui/gnome-cal.c:2937
 #, c-format
 msgid "Loading memos at %s"
 msgstr "æ£å?¨è¼?å?¥ %s ç??å??å¿?é??"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#: ../calendar/gui/gnome-cal.c:3049
 #, c-format
 msgid "Opening %s"
 msgstr "æ£å?¨é??å?? %s"
 
-#: ../calendar/gui/gnome-cal.c:3984
+#: ../calendar/gui/gnome-cal.c:4009
 msgid "Purging"
 msgstr "æ¸?é?¤"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "å??æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "å?«æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "å??äº?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "äº?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "ä¸?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "ä¸?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "å?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "ä¸?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "äº?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "å??ä¸?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "å??æ??"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"ä¸?æ??\n"
+"äº?æ??\n"
+"ä¸?æ??\n"
+"å??æ??\n"
+"äº?æ??\n"
+"å?æ??\n"
+"ä¸?æ??\n"
+"å?«æ??\n"
+"ä¹?æ??\n"
+"å??æ??\n"
+"å??ä¸?æ??\n"
+"å??äº?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "é?¸æ??æ?¥æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "ä¹?æ??"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "é?¸æ??ä»?å¤©(_S)"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:548
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??äººã??"
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:776
 msgid "Event information"
 msgstr "äº?ä»¶è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:779
 msgid "Task information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:782
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:800
 msgid "Free/Busy information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:638
 msgid "Calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
@@ -8482,7 +7089,7 @@ msgstr "è¡?äº?æ??è³?è¨?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:672
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "å·²æ?¥å??"
@@ -8491,7 +7098,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:681
+#: ../calendar/gui/itip-utils.c:679
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
@@ -8503,7 +7110,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:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:686 ../calendar/gui/itip-utils.c:734
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -8512,7 +7119,7 @@ msgstr "å·²æ??çµ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:693
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
@@ -8520,7 +7127,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:708
+#: ../calendar/gui/itip-utils.c:706
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "å·²æ?´æ?°"
@@ -8528,7 +7135,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:715
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -8536,7 +7143,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:722
+#: ../calendar/gui/itip-utils.c:720
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "é??æ?°æ?´ç??"
@@ -8544,100 +7151,100 @@ 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:729
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??ç¥¨è¡¨å?³"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:797
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨? (%s å?° %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:805
 msgid "iCalendar information"
 msgstr "iCalendar è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:976
 msgid "You must be an attendee of the event."
 msgstr "ä½ å¿?é ?æ?¯æ¤äº?ä»¶ç??å?°æ??è??ã??"
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d é ?å??å¿?é??"
 msgstr[1] "%d é ?å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "ï¼?å·²é?¸æ?? %d å??"
 msgstr[1] "ï¼?å·²é?¸æ?? %d å??"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "å??ç´?å??å¿?é??å¤±æ??ã??"
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ç?¡æ³?é??å??å??å¿?é??æ¸?å?®ã??%sã??ä¾?å»ºç«?äº?ä»¶å??æ??è°"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "æ²?æ??å?¯ç?¨ç??è¡?äº?æ??ä¾?å»ºç«?å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "å??å¿?é??ä¾?æº?é?¸æ??å?¨"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "æ?°å¢?å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "å??å¿?é??(_O)"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "å»ºç«?æ?°ç??å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "æ?°å¢?å?±ç?¨å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "å?±ç?¨å??å¿?é??(_S)"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "å»ºç«?æ?°ç??å?±ç?¨å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "æ?°å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
 
 # zh_HK: msgstr "æ??å?°å??å¿?é??"
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "æ??å?°å??å¿?é??"
 
@@ -8664,297 +7271,289 @@ msgstr ""
 "ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "ç?¡æ³?å¾? evolution/config.xmldb ç§»è½?è??è¨å®?"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "ç?¡æ³?ç§»è½?ç§»è¡?äº?æ?? `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, 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/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 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:593
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "å?"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "ç¶²å??: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "è?¯çµ¡äºº: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "æ?°å¢?å·¥ä½?æ¸?å?®(_N)"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d é ?å·¥ä½?"
 msgstr[1] "%d é ?å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "å??ç´?å·¥ä½?å¤±æ??ã??"
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "ç?¡æ³?é??å??å·¥ä½?æ¸?å?® '%s' ä¾?å»ºç«?äº?ä»¶å??æ??è°"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "æ²?æ??å?¯ç?¨ç??è¡?äº?æ??ä¾?å»ºç«?å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "å·¥ä½?ä¾?æº?é?¸æ??å?¨"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "æ?°å¢?å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "å·¥ä½?(_T)"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "å»ºç«?æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "æ?°å·¥ä½?æ¸?å?®"
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "å·¥ä½?æ¸?å?®(_K)"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8965,11 +7564,11 @@ msgstr ""
 "\n"
 "ç¢ºå®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯ã??"
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "æ??å?°å·¥ä½?"
 
@@ -8986,11 +7585,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 "å°?æ?¼"
 
@@ -8998,37 +7597,37 @@ msgstr "å°?æ?¼"
 msgid "Appointments and Meetings"
 msgstr "ç´?æ??å??æ??è°"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 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 è¼¸å?¥å?¨"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "è¡?äº?æ??äº?ä»¶"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution è¡?äº?æ??æ?ºæ?§è¼¸å?¥å?¨"
 
@@ -10589,247 +9188,232 @@ msgstr "ç?¡æ³?é??å??è?ªå??å?²å?æª?æ¡?"
 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:84
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "é??é??ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 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
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "é ?è¦½æ??å?°(_V)"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "å?²å?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "å?¦å?æ?°æª?(_A)..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "ä»¥å?¦ä¸?å??å??ç¨±å?²å?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "å?²å?ç?ºè??ç¨¿(_D)"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "å?²å?ç?ºè??ç¨¿"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:186
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "å?³é??é??å??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "æ??å?¥å?³é??é?¸é ?"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "æ?°å¯«æ?°é?µä»¶(_M)"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "å?ç¬¦ç·¨ç¢¼(_E)"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "å®?å?¨æ?§(_S)"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PG_P å? å¯?"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "ä½¿ç?¨ PGP å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "P_GP å? ç°½"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨ä½ ç?? PGP å¯?ç¢¼å??ç?ºé?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "é?µä»¶å?ªå??æ¬?(_P)"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "å°?é?µä»¶å?ªå??æ¬?è¨ç?ºã??é«?ã??"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?(_Q)"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr "å?¨ä½ ç??é?µä»¶è¢«é?±è®?æ??å??å¾?é??ä¿¡é??ç?¥"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME å? å¯?"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ä½¿ç?¨ä½ ç?? S/MIME å? å¯?è?æ?¸å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME å? ç°½"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨ä½ ç?? S/MIME ç°½ç½²è?æ?¸ç?ºé?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "å¯?ä»¶å?¯æ?¬æ¬?ä½?(_B)"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "å??æ??å¯?ä»¶å?¯æ?¬æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "å?¯æ?¬æ¬?ä½?(_C)"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "å??æ??å?¯æ?¬æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "å¯?ä»¶è??æ¬?ä½?(_F)"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 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:476
 msgid "_Reply-To Field"
 msgstr "å??è¦?æ¬?ä½?(_R)"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "å??æ??å??è¦?æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "ä¸»æ?¨æ¬?ä½?(_S)"
-
-#: ../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:521
 msgid "Save Draft"
 msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:114
+msgid "Show"
+msgstr "é¡¯ç¤º"
+
+#: ../composer/e-composer-header.c:117
+msgid "Hide"
+msgstr "é?±è??"
+
+#: ../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:927
 msgid "Fr_om:"
 msgstr "å¯?ä»¶è??(_O):"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:936
 msgid "_Reply-To:"
 msgstr "å??è¦?å?°å??(_R):"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:941
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:947
 msgid "_Cc:"
 msgstr "å?¯æ?¬(_C):"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:947 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "å?¯æ?¬(CC)"
+
+#: ../composer/e-composer-header-table.c:953
 msgid "_Bcc:"
 msgstr "å¯?ä»¶å?¯æ?¬(_B):"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:953 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "å¯?ä»¶å?¯æ?¬(BCC)"
+
+#: ../composer/e-composer-header-table.c:958
 msgid "_Post To:"
 msgstr "å¼µè²¼å?°(_P):"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:962
 msgid "S_ubject:"
 msgstr "ä¸»æ?¨(_U):"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:971
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "æ??é??è£?æ?°å¢?ç?®é??æ??å??"
 
@@ -10845,38 +9429,26 @@ msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£?ï¼?é?¸å??è¦?å¼µè²¼ç??è³?æ??å¤¾"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1557
-msgid "Show _Attachment Bar"
-msgstr "é¡¯ç¤ºé??å? æª?æ¡?å??(_A)"
+#: ../composer/e-composer-private.c:203
+msgid "Save draft"
+msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:807
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?ç°½ç½²é??å?ºç??é?µä»¶ï¼?æ¤å¸³è??æ²?æ??è¨å®?ç°½ç½²è?æ?¸"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??è¨å®?å? å¯?è?æ?¸(æ¤å¸³è??)"
 
-#: ../composer/e-msg-composer.c:1499 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "é??ä»¶"
-msgstr[1] "é??ä»¶"
-
-#: ../composer/e-msg-composer.c:1555
-msgid "Hide _Attachment Bar"
-msgstr "é?±è??é??å? æª?æ¡?å??(_A)"
-
-#: ../composer/e-msg-composer.c:1572 ../composer/e-msg-composer.c:2797
+#: ../composer/e-msg-composer.c:1331 ../composer/e-msg-composer.c:2170
 msgid "Compose Message"
 msgstr "ç·¨è¼¯é?µä»¶"
 
-#: ../composer/e-msg-composer.c:4098
+#: ../composer/e-msg-composer.c:3328
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11026,7 +9598,7 @@ msgstr "å?²å?è??ç¨¿(_S)"
 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:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "Groupware å¥?è£?è»?ä»¶"
 
@@ -11059,7 +9631,7 @@ msgid "Evolution Query"
 msgstr "Evolution æ?¥è©¢"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
@@ -11095,11 +9667,11 @@ msgid "Log Level"
 msgstr "ç´?é??ç?ç´?"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "æ??é??"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2521
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "é?µä»¶"
@@ -11129,10 +9701,10 @@ msgstr "å?µé?¯"
 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
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:943
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:714
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
@@ -11181,244 +9753,244 @@ msgstr "è¦?è??æª?æ¡?ï¼?"
 msgid "_Overwrite"
 msgstr "è¦?å¯«(_O)"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "ç?¡æ³?é??å??è©²é?£çµ?ã??"
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "ç?¡æ³?é¡¯ç¤º Evolution ç??æ±?å?©æ??ä»¶ã??"
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "é??è¦?(_M)"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "å·¥ä½?(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "å??äºº(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "å¾?è¾¦äº?é ?(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "ç¨?å¾?(_L)"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "æ¨?ç±¤å??ç¨±(_N):"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "ç·¨è¼¯æ¨?ç±¤"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "å? å?¥æ¨?ç±¤"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "æ¨?ç±¤ç??å??ç¨±ä¸?è?½ç©ºç?½ã??"
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "ä¼ºæ??å?¨ä¸?å·²å?å?¨å??æ¨£ç??æ¨?ç±¤ã??è«?æ?´æ?¹ä½ ç??æ¨?ç±¤å??ç¨±ã??"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf é?¯èª¤ï¼?%s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 ç§?å¾?"
 msgstr[1] "%d ç§?å¾?"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 å??é??å¾?"
 msgstr[1] "%d å??é??å¾?"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 å°?æ??å¾?"
 msgstr[1] "%d å°?æ??å¾?"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 æ?¥å??"
 msgstr[1] "%d æ?¥å??"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 å¤©å¾?"
 msgstr[1] "%d å¤©å¾?"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 é?±å¾?"
 msgstr[1] "%d é?±å¾?"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 å??æ??å¾?"
 msgstr[1] "%d å??æ??å¾?"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 å¹´å¾?"
 msgstr[1] "%d å¹´å¾?"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 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/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "æ¸¬è©¦"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "è¦?å??å??ç¨±(_U):"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?ä»¶ç??é ?ç?®"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "å? å?¥æ¢?ä»¶(_D)"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "å°?æ?¾é ?ç?®(_F):"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "æ²?æ??å??å¾©æ??å??å§?é?µä»¶"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾£çµ?(_N)"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "å¤?å¯?"
 
@@ -11503,54 +10075,50 @@ msgstr ""
 "æ??é??ä½?æ¯?è¼?ã??"
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "ç?¸å°?æ?¼ç?®å??æ??é??ç??æ??å·®"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "å??"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "å¾?"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "æ??"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "ç§?å¾?"
-
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "ç?®å??æ??é??"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"ä¹?å??\n"
+"ä¹?å¾?"
+
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"ç§?\n"
+"å??\n"
+"æ??\n"
+"å¤©\n"
+"é?±\n"
+"æ??\n"
+"å¹´"
 
 #: ../filter/filter.glade.h:21
-msgid "the 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:655
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-msgid "weeks"
-msgstr "é?±"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "å¹´"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"ç?®å??ç??æ??å?»\n"
+"ä½ æ??å®?ç??æ??å?»\n"
+"ç?¸å°?æ?¼ç?®å??æ??å?»ç??æ??å·®"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "æ?°å¢?è¦?å??"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "ç·¨è¼¯è¦?å??"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "è¦?å??å??ç¨±"
 
@@ -11603,21 +10171,21 @@ msgstr "Evolution é?µä»¶å?ªå??è¨å®?æ?§å?¶"
 msgid "Evolution Network configuration control"
 msgstr "Evolution ç¶²çµ¡çµ?æ??æ?§å?¶"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../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
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:790
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "é?µä»¶"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "é?µä»¶å¸³è??"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "é?µä»¶å??å¥½è¨å®?"
 
@@ -11626,16 +10194,114 @@ msgid "Network Preferences"
 msgstr "ç¶²çµ¡å??å¥½è¨å®?"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:298
 msgid "_Mail"
 msgstr "é?µä»¶(_M)"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "è½?å¯?(_F)"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "å??è¦?å¯?ä»¶è??(_R)"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+msgid "%d attached messages"
+msgstr "%d å??é??å? ç??é?µä»¶"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1653
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:141
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "é??ä»¶"
+msgstr[1] "é??ä»¶"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:601
+msgid "Icon View"
+msgstr "å??ç¤ºæª¢è¦?"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:602
+msgid "List View"
+msgstr "æ¸?å?®æª¢è¦?"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "ç¬¦å??ï¼?%d"
+
+#: ../mail/e-mail-search-bar.c:520
+msgid "Close the find bar"
+msgstr "é??é??æ??å°?å·¥å?·å??"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "å°?æ?¾(_D):"
+
+#: ../mail/e-mail-search-bar.c:540
+msgid "Clear the search"
+msgstr "æ¸?é?¤æ¤æ??å°?"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "ä¸?ä¸?å??(_P)"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "ä¸?ä¸?å??(_N)"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr "å??å??å¤§å°?å¯«(_C)"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?ç«¯ç¹¼çº?"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "å?°é??é ?é?¢é ?ç«¯ï¼?å¾?åº?é?¨ç¹¼çº?"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "æ²?æ??å? å¯?"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS å? å¯?"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL å? å¯?"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11648,128 +10314,137 @@ msgstr ""
 " %s æ??æ¬?å??ç´?\n"
 "ä¸¦é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 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
+#: ../mail/em-account-editor.c:611 ../mail/em-account-editor.c:656
+#: ../mail/em-account-editor.c:723 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:781
+msgid "Never"
+msgstr "æ°¸ä¸?"
+
+#: ../mail/em-account-editor.c:782
+msgid "Always"
+msgstr "æ°¸é? "
+
+#: ../mail/em-account-editor.c:783
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "èº«å??"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1912 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2184
 msgid "Check for _new messages every"
 msgstr "è?ªå??æª¢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2192
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2382 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "å?³é??é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2441 ../mail/mail-config.glade.h:73
 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:2507 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 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:2544 ../mail/em-account-editor.c:2639
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é?¸é ?"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2545 ../mail/em-account-editor.c:2640
 msgid "Checking for New Messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "å¸³è??ç·¨è¼¯å?¨"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[é ?è¨å?¼]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "å¸³è??å??ç¨±"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 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
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "æ?ªå?½å??ç??"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:947
 msgid "Language(s)"
 msgstr "èª?è¨?"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:980
 msgid "Add signature script"
 msgstr "æ?°å¢?ç°½ç½²ç¨?åº?æª?"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1022
 msgid "Signature(s)"
 msgstr "ç°½å??æª?"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1113 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1564
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1570
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:2037
 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:2084
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} ${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2227
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "é??æ¿¾å?¨è¦?å??(_F)"
 
@@ -11786,18 +10461,10 @@ msgstr "æ??å®?è?²å½©"
 msgid "Assign Score"
 msgstr "æ??å®?ç?®æ¨?"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "å¯?ä»¶å?¯æ?¬(BCC)"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "å?¶è?²"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "å?¯æ?¬(CC)"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "å·²å®?æ??æ?¼"
@@ -11815,7 +10482,7 @@ msgid "Date sent"
 msgstr "é??ä»¶æ?¥æ??"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11866,226 +10533,234 @@ 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 ../mail/em-migrate.c:958
 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
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 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
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "é?µä»¶ä½?ç½®"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ç§»è?³è³?æ??å¤¾"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../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
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 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:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 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:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "å¾?æ??å°?å»ºç«?æ??å°?è³?æ??å¤¾(_R)..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "æ??æ??é?µä»¶"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "æ?ªè®?é?µä»¶"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "ç?¡æ¨?ç±¤"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "å·²è®?é?µä»¶"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "æ??è¿?ç??é?µä»¶"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "æ??è¿? 5 å¤©ç??é?µä»¶"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "æ??é??å? æª?æ¡?ç??é?µä»¶"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "é??è¦?é?µä»¶"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "é??å??å?¾é?µä»¶"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1199
 msgid "Account Search"
 msgstr "å¸³è??æ??å°?"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1252
 msgid "All Account Search"
 msgstr "æ??æ??ç??å¸³è??æ??å°?"
 
@@ -12115,11 +10790,11 @@ 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
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
@@ -12132,538 +10807,479 @@ msgstr "è³?æ??å¤¾å?§å®¹"
 msgid "<click here to select a folder>"
 msgstr "<æ??é??è£?é?¸æ??è³?æ??å¤¾>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "å»ºç«?(_R)"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 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:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "æ??å°?è³?æ??å¤¾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "ä¸?ç¬¦å??"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "è??ç¨¿"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "ç¯?æ?¬"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "å¯?ä»¶å?£"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "å·²å?³é??"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 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
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
-#, c-format
+#: ../mail/em-folder-tree.c:318
+#, fuzzy, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u)"
 msgctxt "folder-display"
-msgid "%s (%u)"
+msgid "%s (%u%s)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??å¤¾æ¨¹"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ£å?¨ç§»å??è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ£å?¨è¤?è£½è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2012
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ£å?¨å°?é?µä»¶ç§»è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2014
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ£å?¨è¤?è£½é?µä»¶è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?å±¤ç??å?²å?å??"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "ç§»è?³è³?æ??å¤¾(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2104
+msgid "_Move"
+msgstr "ç§»å??(_M)"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2106
+msgid "Cancel _Drag"
+msgstr "å??æ¶?æ??æ??(_D)"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "æ?°å¢?è³?æ??å¤¾(_N)..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "ç§»å??(_M)..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "é??æ?°æ?´ç??(_F)"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç??å¯?ä»¶å?£(_U)"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "æ¸?ç??å??æ?¶ç?(_E)"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "æ?ªè®?æ??å°?è³?æ??å¤¾(_U)"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "å°?ã??%sã??è¤?è£½å?°ã??%sã??"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder"
 msgstr "é?¸æ??è³?æ??å¤¾"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "è¤?è£½(_O)"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, 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
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 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:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?å»ºç«?è³?æ??å¤¾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "å?ªé?¤é?µä»¶å¤±æ??"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ä½ æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤æ¤å°?é?µä»¶ã??"
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "å??è¦?å¯?ä»¶è??(_R)"
-
-#: ../mail/em-folder-view.c:1333 ../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:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "å¾©å??(_N)"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "ç§»è?³è³?æ??å¤¾(_M)..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_I)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "æ¨?ç±¤(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "æ²?æ??(_N)"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "æ?°å¢?æ¨?ç±¤(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "æ¨?å¹?å·²å®?æ??(_G)"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "æ¸?é?¤æ¨?å¹?(_E)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "å¾?é?µä»¶å»ºç«?è¦?å??(_T)"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "å¾?ä¸»æ?¨å»ºç«?æ??å°?è³?æ??å¤¾(_S)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "å¾?å¯?ä»¶è??å»ºç«?æ??å°?è³?æ??å¤¾(_N)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "å¾?æ?¶ä»¶è??å»ºç«?æ??å°?è³?æ??å¤¾(_R)"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "å¾?é?µä»¶æ¸?å?®å»ºç«?æ??å°?è³?æ??å¤¾(_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "å¾?ä¸»æ?¨å»ºç«?é??æ¿¾å?¨(_J)"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "å¾?å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨(_D)"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_C)"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "å¾?é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨(_M)"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:220
+#: ../plugins/google-account-setup/google-source.c:505
+#: ../plugins/google-account-setup/google-source.c:715
 msgid "Default"
 msgstr "é ?è¨å?¼"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "å??å??é?µä»¶..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "æ?è??çµ¦(_A)..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_S)"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "å¾?é??å??ä½?å??(_F)"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "å?°é??å??ä½?å??(_T)"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "æ??ä¸?ä¸?æ?è??çµ¦ %s"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 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)"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:569 ../mail/em-format-html.c:653
 msgid "Unsigned"
 msgstr "æ?ªç°½ç½²"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:569
 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:656
+#: ../mail/em-format-html-display.c:570 ../mail/em-format-html.c:654
 msgid "Valid signature"
 msgstr "æ??æ??ç??ç°½ç½²"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:570
 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:657
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:655
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??ç°½ç½²"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:571
 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:658
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:656
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç°½ç½²æ??æ??ï¼?ä½?æ?¯ç?¡æ³?æª¢é©?å¯?ä»¶è??"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:572
 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:659
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:657
 msgid "Signature exists, but need public key"
 msgstr "ç°½ç½²å?å?¨ï¼?ä½?é??è¦?å?¬é??å¯?ç¢¼å??"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:573
 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:665
+#: ../mail/em-format-html-display.c:580 ../mail/em-format-html.c:663
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:580
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "æ¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??äº?è?¯ç¶²å?³é??å?¯è?½æ??è¢«æª¢é?±ã??"
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:664
 msgid "Encrypted, weak"
 msgstr "å·²å? å¯?ï¼?ä¸?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:581
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??äººå¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??æ?¥ï¼?ä¸¦ä¸?æ?¯ç?¡æ³?æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:665
 msgid "Encrypted"
 msgstr "å·²å? å¯?"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:582
 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:668
+#: ../mail/em-format-html-display.c:583 ../mail/em-format-html.c:666
 msgid "Encrypted, strong"
 msgstr "å·²å? å¯?ï¼?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:583
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½¿ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??ç¸±ä½¿ç¶?é??ä¸?æ®µæ??é??ï¼?å¤?é?¢ç??äººå¾?é?£æª¢é?±æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:684 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "æª¢è¦?è?æ?¸(_V)"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:699
 msgid "This certificate is not viewable"
 msgstr "æ¤è?æ?¸ç?¡æ³?æª¢è¦?"
 
-#: ../mail/em-format-html-display.c:1410
+#: ../mail/em-format-html-display.c:991
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "å®?æ??æ?¼ %Y å¹´ %-m æ?? %-d æ?¥%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:999
 msgid "Overdue:"
 msgstr "å?°æ??æ?¥:"
 
 # (Abel) combine with previous entry
-#: ../mail/em-format-html-display.c:1421
+#: ../mail/em-format-html-display.c:1002
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1082
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "æª¢è¦?è¡?å?§(_V)"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1083
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "é?±è??(_H)"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1084
 msgid "_Fit to Width"
 msgstr "ç¬¦å??é??åº¦(_F)"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1085
 msgid "Show _Original Size"
 msgstr "é¡¯ç¤ºå??å§?å¤§å°?(_O)"
 
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "å?¦å?é??å? æª?æ¡?ç?º"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "é?¸æ??ç?¨ä¾?å?²å?æ??æ??é??å? æª?æ¡?ç??è³?æ??å¤¾"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "å?²å?é?¸å??ç??(_S)..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d å??é??ä»¶(_T)"
-msgstr[1] "%d å??é??ä»¶(_T)"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "å?²å?(_A)"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "å?²å?å?¨é?¨(_A)"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "ç?¡é??ä»¶"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1586 ../mail/em-format-html-display.c:1625
 msgid "View _Unformatted"
 msgstr "æª¢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1588
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1645
 msgid "O_pen With"
 msgstr "ä»¥...é??å??(_O)"
 
-#: ../mail/em-format-html-display.c:2668
+#: ../mail/em-format-html-display.c:1722
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12674,156 +11290,156 @@ msgstr "Evolution ç?¡æ³?é¡¯ç¤ºæ¤å°?é?»å?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??
 msgid "Page %d of %d"
 msgstr "ç¬¬ %d / %d é ?"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "æ£å?¨æ?·å?? `%s'"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:928
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:936
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:966
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:977
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??ç¤º"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:979
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1000
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1011
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ä¸?æ??ç??å¤?é?¨æª?æ¡?æ??ç¤º (ã??%sã??é¡?å??)"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1239
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??é?µä»¶"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1413
 msgid "Formatting Message..."
 msgstr "æ ¼å¼?å??é?µä»¶..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1566 ../mail/em-format-html.c:1630
+#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "å?¯æ?¬"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1636
+#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "å¯?ä»¶å?¯æ?¬"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1746 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1434
 msgid "Mailer"
 msgstr "å¯?ä»¶è??"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
+#: ../mail/em-format-html.c:1773
 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:1781
+#: ../mail/em-format-html.c:1778
 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:1917
+#: ../mail/em-format-html.c:1914
 #, 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:885
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:923
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
+#: ../mail/message-tag-followup.c:296
 msgid "From"
 msgstr "å¯?ä»¶è??"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "æ?°è??ç¾£çµ?"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "é?¢è²?"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??å? æª?æ¡?"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?è§£æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??ç°½ç½²æ ¼å¼?"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "æª¢é©?ç°½ç½²ç?¼ç??é?¯èª¤"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "æª¢é©?ç°½ç½²ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
@@ -12843,77 +11459,82 @@ msgstr "æ¯?é?±ä¸?æ¬¡"
 msgid "Once per month"
 msgstr "æ¯?æ??ä¸?æ¬¡"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:331
 msgid "Add Custom Junk Header"
 msgstr "å? å?¥è?ªé?¸å??å?¾é?µä»¶æª?é "
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:335
 msgid "Header Name:"
 msgstr "æ¨?é å??ç¨±:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Value Contains:"
 msgstr "æ¨?é æ?¸å?¼å??å?«:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:437 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "é ?é¦?"
+
+#: ../mail/em-mailer-prefs.c:441
 msgid "Contains Value"
 msgstr "å??å?«æ?¸å?¼"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:464
 msgid "Color"
 msgstr "é¡?è?²"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:467
 msgid "Tag"
 msgstr "æ¨?ç±¤"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1062 ../mail/em-mailer-prefs.c:1116
 #, 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
+#: ../mail/em-mailer-prefs.c:1070 ../mail/em-mailer-prefs.c:1125
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?ä½¿ç?¨ã??è«?æª¢æ?¥æ?¯å?¦æ??å®?è£?è©²å¥?ä»¶ã??"
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1091
 msgid "No Junk plugin available"
 msgstr "æ²?æ??å?¯ç?¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
 
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "å¾?è¾¦"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "ç¨?å¾?"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "ç§»è½?"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?°è³?æ??å¤¾ `%s'ï¼?%s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ç?¡æ³?è¤?è£½è£½è³?æ??å¤¾ `%s' è?³ `%s'ï¼?%s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12924,31 +11545,31 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "ç?¡æ³?å»ºç«? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "ç?¡æ³?è¤?è£½ POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?¬å?°é?µä»¶å?²å?å?? `%s':%s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -12959,85 +11580,102 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "ç?¡æ³?å?¨ `%s' å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾:%s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr "ç?¡æ³?å¾?ä»¥å??ç?? Evolution è®?å??è¨å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å?å?¨æ??æ??æ¯?ã??"
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "å?¦å?æ?°æª?..."
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "untitled_image.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "è¨ç?ºè??æ?¯(_B)"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
 #. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "å? å?¥å?°é??è¨?é??(_A)"
 
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "å?¨ %s å?§é??å??..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "æ¤å?²å?å??ä¸?æ?¯æ?´è¨?é?±ï¼?æ??è??æ?ªå??ç?¨å®?å??ã??"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "å·²è¨?é?±"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:643
 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:858
 msgid "Please select a server."
 msgstr "è«?é?¸æ??ä¸?å??ä¼ºæ??å?¨ã??"
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "å°?æ?ªé?¸æ??ä¼ºæ??å?¨"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯(_D)"
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "é?µä»¶"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "å?²å?é?µä»¶â?¦"
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "æ?°å¢?å?°å??"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??å¤¾(_F)"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "æ??å°?è³?æ??å¤¾ä¾?æº?"
 
@@ -13247,88 +11885,91 @@ msgid "Enable or disable magic space bar"
 msgstr "å??ç?¨æ??å??ç?¨é?è¡?ç©ºç?½é?µ"
 
 #: ../mail/evolution-mail.schemas.in.h:49
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "å??ç?¨æ??å??ç?¨æ¨?è¨?å¤?å??é?µä»¶æ??ç??æ??ç¤ºã??"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable or disable type ahead search feature"
 msgstr "å??ç?¨æ??å??ç?¨é?¨æ??å?³æ?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders"
 msgstr "å??ç?¨æ??å°?è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders on startup."
 msgstr "å??ç?¨ç¨?å¼?é??å§?æ??æ??å°?è³?æ??å¤¾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 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 "å??ç?¨å?´é??æ¬?æ??å°?å??è?½ä½¿ä½ è?½è¼¸å?¥æ??å?é??å§?äº?å??å¼?æ??å°?ã??å®?ç??ä½?ç?¨æ?¯è®?ä½ å?ªé ?å?¨å?´é??æ¬?ä¸è¼¸å?¥è³?æ??å¤¾å??ç¨±å°±å?¯ä»¥è¼?é¬?ç??æ?¾å?°è©²è³?æ??å¤¾ï¼?è??ç?±é?¸å??ç??å??ä½?æ?´å?¯ä»¥è?ªå??è·³è?³è©²è³?æ??å¤¾ç??ä½?ç½®ã??"
+"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:54
 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:55
 msgid "Enable to render message text part of limited size."
 msgstr "å??ç?¨ä»¥é¡¯ç¤ºé??å?¶å¤§å°?ç??é?µä»¶æ??å?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 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:57 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook/GMail å½¢å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 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."
-msgstr "å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½è¾¨å?¥ç?± Evolution å¯?å?ºç??æ?¬å?°å??æª?æ¡?å??ç¨±ã??å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?æ£ç¢ºç?? RFC 2047 æ¨?æº?ã??"
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr "å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½æ£ç¢ºé¡¯ç¤ºç?± Evolution å¯?å?ºç?? UTF-8 å?ç¬¦æª?æ¡?å??ç¨±ï¼?å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?æ£ç¢ºç?? RFC 2047 æ¨?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??å¤¾é ?è¦½ä¸¦ç§»é?¤é?¸å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "å¦?æ??ä½¿ç?¨è??å??è©¦ä¸?æ¬¡é??å?? 10 æ??æ?´å¤?ç??é?µä»¶ï¼?è©¢å??ä½¿ç?¨è??æ?¯å?¦ç¢ºå®?è¦?é??éº¼å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 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:64
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
 "in GNOME's MIME type database may be used for displaying content."
 msgstr "å¦?æ??æ²?æ??å?§ç½®æª¢è¦?å?¨å?¯ç?¨æ?¼ Evolution è£?é?¢ç?¹æ®?ç?? MIME é¡?å??ï¼?ä»»ä½?é¡¯ç¤ºå?¨æ¤æ¸?å?®ç??  MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??åº«ä¹? Bonobo å??ä»¶æª¢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§å®¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 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:66
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13337,16 +11978,12 @@ msgid ""
 "detail."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?é??åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "é??æ??å??ç?¨/å??ç?¨æ¨?è¨?å¤?å??é?µä»¶æ??ç??æ??ç¤ºã??"
-
 #: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
@@ -13572,109 +12209,169 @@ msgid "Server synchronization interval"
 msgstr "ä¼ºæ??å?¨å??æ¥é??é??"
 
 #: ../mail/evolution-mail.schemas.in.h:121
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å?¯æ?¬ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "å¼µè²¼å?°æ?°è??ç¾£çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"From\" field when sending a mail message"
+msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "å¼µè²¼å?°æ?°è??ç¾£çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show Animations"
 msgstr "é¡¯ç¤ºå??ç?«"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Show animated images as animations."
 msgstr "æ?æ?¾å??ç?«å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:129
 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:130
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸é¡¯ç¤ºå?ªé?¤ç??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show photo of the sender"
 msgstr "é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:132
+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:133
+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:134
+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:135
+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:138
+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:139
+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:140
 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:141
 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:142
 msgid "Spell check inline"
 msgstr "è¡?å?§æ?¼å?æª¢æ?¥"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Spell checking color"
 msgstr "æ?¼å?æª¢æ?¥é¡?è?²"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Spell checking languages"
 msgstr "æ?¼å?æª¢æ?¥èª?è¨?"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Subscribe dialog default height"
 msgstr "è¨?é?±å°?è©±ç??é ?è¨é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Subscribe dialog default width"
 msgstr "è¨?é?±å°?è©±ç??é ?è¨é??åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Terminal font"
 msgstr "çµ?ç«¯æ©?å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Text message part limit"
 msgstr "æ??å?é?µä»¶é??å?¶"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?è¨å¤?æ??ç¨?å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 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:151
 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:152
 msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?ç«¯æ©?å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??é??åº¦å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 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:155
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr "é??è£?æ±ºå®?äº?é?µä»¶å?§æ??å?¨ Evolution ä¸å?¯æ??ç??ç??æ??å¤§å®¹é??ã??é ?è¨ç??å¤§å°?æ?¯ 4MB / 4096 KBï¼?ä»¥ KB ä¾?æ??å®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr "é??æ?¯é ?è¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??è£?å??å?ºç??é ?è¨å¤?æ??ç¨?å¼?ï¼?ä¸¦ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr "é??å??é?µå?¼å?ªè?½è®?å??ä¸?æ¬¡ï¼?ä¸¦æ??å?¨è®?å??å¾?è¨ç?ºã??falseã??ã??é??æ¨£æ??å??æ¶?å?¨æ¸?å?®ä¸å°?è©²é?µä»¶ç??é?¸å??ä¸¦ç§»é?¤å°?è©²è³?æ??å¤¾ç??é ?è¦½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 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;"
@@ -13682,159 +12379,119 @@ msgid ""
 "mail view."
 msgstr "æ¤å¯?ç¢¼å??æ??è©²å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªé?¸æª?é ï¼?ä»¥å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é æ??é¡¯ç¤ºå?¨é?µä»¶æª¢è¦?ï¼?å??è¨å®?æ?? enabledã??"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr "é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸æ?¥è©¢é?»å?é?µä»¶ä½?å??ä»¥ç?¨æ?¼å??å?¾é?µä»¶é??æ¿¾æ??ã??æ??é?¤å·²ç?¥è?¯çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 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:161
 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:162
 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:163
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?æ ¹æ??æ¯?å??é?µä»¶ç¾£çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??æ ¹æ??é?µä»¶ç??æ?¥æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Thread the message list."
 msgstr "ä¸²æ?¥é?µä»¶æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Thread the message-list"
 msgstr "ä¸²æ?¥é?µä»¶æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Thread the message-list based on Subject"
 msgstr "ä»¥ä¸»æ?¨ç?ºå?ºç¤?ä¸²æ?¥é?µä»¶æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Timeout for marking message as seen"
 msgstr "å°?é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Timeout for marking message as seen."
 msgstr "å°?é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ç??æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "UID string of the default account."
 msgstr "é ?è¨å¸³è??ç?? UID å?ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ä½¿ç?¨è¡?å?§æ?¼å?æª¢æ?¥æ??å°?æ?¼é?¯å?ç??åº?ç·?é¡?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Use SpamAssassin daemon and client"
 msgstr "ä½¿ç?¨ SpamAsssassin ä¼ºæ??ç¨?å¼?å??å®¢æ?¶ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ä½¿ç?¨ SpamAsssassin ä¼ºæ??ç¨?å¼?å??å®¢æ?¶ç«¯ (spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Use custom fonts"
 msgstr "ä½¿ç?¨è?ªé?¸å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Use custom fonts for displaying mail."
 msgstr "ä½¿ç?¨è?ªé?¸å?å??ä¾?é¡¯ç¤ºé?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use side-by-side or wide layout"
 msgstr "ä½¿ç?¨ç·?è²¼æ??å¯¬é??ç½®"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Variable width font"
 msgstr "è®?å??é??åº¦å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "æª¢è¦?/å¯?ä»¶å?¯æ?¬å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "æª¢è¦?/å¯?ä»¶å?¯æ?¬å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "æª¢è¦?/å?¯æ?¬å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "æª¢è¦?/å?¯æ?¬å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "æª¢è¦?/å¯?ä»¶è??å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "æª¢è¦?/å¯?ä»¶è??å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "æª¢è¦?/å¼µè²¼å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "æª¢è¦?/å¼µè²¼å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "æª¢è¦?/å??è¦?å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "æª¢è¦?/å??è¦?å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 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:180
 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:181
 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:182
 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:183
 msgid "Width of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼é??åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Width of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é??åº¦ã??"
 
@@ -13851,12 +12508,12 @@ msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:310
 msgid "Destination folder:"
 msgstr "ç?®ç??å?°è³?æ??å¤¾:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??å¤¾ä¾?è¼¸å?¥"
 
@@ -13874,8 +12531,8 @@ msgstr "æ£å?¨å?¯å?¥ä¿¡ç®±"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:455
+#: ../plugins/pst-import/pst-importer.c:561 ../shell/e-shell-importer.c:536
 #, c-format
 msgid "Importing `%s'"
 msgstr "æ£å?¨å?¯å?¥ â??%sâ??"
@@ -13902,108 +12559,108 @@ 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 é?µä»¶å??è¡¨"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "æ?°å¢?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d å°?å·²å?ªé?¤"
 msgstr[1] "%d å°?å·²å?ªé?¤"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 msgstr[1] "%d å°?å??å?¾"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å??è??ç¨¿"
 msgstr[1] "%d å??è??ç¨¿"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å?³é??"
 msgstr[1] "%d å°?å·²å?³é??"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå?³é??"
 msgstr[1] "%d å°?æ?ªå?³é??"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d å°?æ?ªè®?ï¼?"
 msgstr[1] "%d å°?æ?ªè®?ï¼?"
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å?± %d å°?"
 msgstr[1] "å?± %d å°?"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:949
 msgid "New Mail Message"
 msgstr "æ?°å¢?é?µä»¶"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:950
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "é?µä»¶è¨?æ?¯(_M)"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:951
 msgid "Compose a new mail message"
 msgstr "ç·¨è¼¯æ?°ç??é?µä»¶è¨?æ?¯"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:957
 msgid "New Mail Folder"
 msgstr "æ?°é?µä»¶è³?æ??å¤¾"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:958
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?µä»¶è³?æ??å¤¾(_F)"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:959
 msgid "Create a new mail folder"
 msgstr "å»ºç«?æ?°é?µä»¶è³?æ??å¤¾"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1106
 msgid "Failed upgrading Mail settings or folders."
 msgstr "å??ç´?é?µä»¶æ??è³?æ??å¤¾å¤±æ??ã??"
 
@@ -14169,59 +12826,81 @@ msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??æ°¸é? è?ªæ??å? å¯?(_M)"
 msgid "Always request rea_d receipt"
 msgstr "æ°¸é? è¦?æ±?è®?ä¿¡å??æ¢?(_D)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"é??ä»¶\n"
+"è¡?å?§\n"
+"å¼?æ??"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"é??ä»¶\n"
+"è¡?å?§ (Outlook é¢¨æ ¼)\n"
+"å¼?æ??\n"
+"ä¸?è¦?å¼?ç?¨"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå??æ??å?¥è¡¨æ??ç¬¦è??(_E)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "å?ç¬¦é??(_H):"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:56
 msgid "Ch_eck for Supported Types "
 msgstr " æª¢æ?¥å?¯æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "ä»¥è?ªé?¸æ¨?é æª¢æ?¥å??å?¾é?µä»¶(_S)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "æª¢æ?¥å?§é??é?µä»¶æ?¯å?¦ç?ºå??å?¾é?µä»¶(_M)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "ç?¶æ??è¼¸å?¥æ??æª¢æ?¥æ?¼å?(_T)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "æª¢æ?¥å?§é??ç??å??å?¾é?µä»¶è¨?æ?¯"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "æ¸?é?¤(_A)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "æ¸?é?¤(_R)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "æ?¼é?¯å?ç??é¡?è?²(_M):"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "å?ªé?¤è³?æ??å¤¾æ??ç¢ºèª?(_W)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14237,246 +12916,232 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "é ?è¨å?¼(_F)"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "é ?è¨å?ç¬¦ç·¨ç¢¼(_N):"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "é?¢é??æ??å?ªé?¤å??å?¾é?µä»¶(_X)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½² [é ?è¨å?¼] (_U)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "ä¸?æ??ç??é?µä»¶å?§æ??ç??æ??å?å¤§å°?ä¸?é??(_Z)"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "è?¥å¯?ä»¶è??å?¨æ??ç??é??è¨?é??ä¸å°±ä¸?è¦?å°?é?µä»¶æ¨?è¨?ç?ºå??å?¾é?µä»¶(_K)"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "ä¸?ä½¿ç?¨å¼?æ??"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "è??ç¨¿å?£(_F):"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "é?»å?é?µä»¶å¸³è??"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "é?»å?é?µä»¶ä½?å??(_A):"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "é?¢é??æ??æ¸?ç©ºå??æ?¶ç?è³?æ??å¤¾(_X)"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "å??ç?¨é?è¡?ç©ºç?½é?µ(_P)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "å??ç?¨æ??å°?è³?æ??å¤¾(_R)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "å? å¯?è?æ?¸(_P):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¤?é??ç??é?µä»¶ (é ?è¨å?¼)(_E)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "å?ºå®?é??åº¦(_X):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "å?ºå®?é??åº¦å?å??(_E):"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "å?å??å?§å®¹"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "å°?é?µä»¶æ ¼å¼?å??ç?º _HTML"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML é?µä»¶"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ä»£ç??ä¼ºæ??å?¨:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "æª?é "
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "å¼·èª¿å¼?æ??ç?º(_Q)"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "è¡?å?§"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "è¡?å?§ï¼?Outlook é¢¨æ ¼ï¼?"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr ""
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æ¨?ç±¤"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "èª?è¨?è¡¨"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "é?µä»¶æª?é è¡¨"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "ä¿¡ç®±ä½?ç½®"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "é?µä»¶ç·¨è¼¯å?¨"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "æ²?æ??ä»£ç??ä¼ºæ??å?¨çµ¦(_P):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "æ³¨æ??ï¼?å?¨æ¨?ç±¤å??ç¨±ä¸ç??åº?ç·?æ?¯ç?¨ä¾?æ¨?è¨?é?¸å?®ä¸ç??æ?·å¾?é?µã??"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 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.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°ç¬¦å??ç??è?ªé?¸å??å?¾é?µä»¶æ¨?é é??å??é?¸é ?å°±æ??è¢«å¿½ç?¥ã??"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "å??é«?(_G):"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG å¯?ç¢¼å?? ID:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "å¯?ç¢¼(_W):"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
 "è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??\n"
 "é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:120
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr "è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??ä½ ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²çµ¡æ??å??ä¾?æ??å??ã??"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 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
+#: ../mail/mail-config.glade.h:122
 msgid "Please select among the following options"
 msgstr "è«?å?¨ä¸?å??é?¸é ?ä¸é?¸æ??"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "é?£æ?¥å? :"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ç?¶å?³é??ç??é?µä»¶å?ªæ??æ??å®?å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??æ??é¡¯ç¤ºæ??ç¤º(_O)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "å¼?ç?¨"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "è¨?ä½?å¯?ç¢¼(_M)"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "å??è¦?å?°å??(_P):"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "è¨?ä½?å¯?ç¢¼(_P)"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "S_OCKS ä¸»æ©?:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "å?ªæ??å°?æ?¬å?°ç«¯é??è¨?é??ä¸ç??å¯?ä»¶è??ç?¸ç??(_E)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "é?¸å??(_E)..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "å?³é??é?µä»¶å??æ¢?(_E):"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "æ¨?æº?å?å??(_T):"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "é?¸æ??è??ç¨¿è³?æ??å¤¾"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "é?¸æ?? HTML å?ºå®?é??åº¦å?å??"
@@ -14493,71 +13158,71 @@ msgstr "é?¸æ?? HTML å?¯è®?é??åº¦å?å??"
 msgid "Select HTML variable width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼æ??å?°ç?? HTML å?¯è®?é??åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "é?¸æ??å¯?é??è³?æ??å¤¾"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "å?³é??é?µä»¶"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "å?³é??é?µä»¶è³?æ??å¤¾(_M):"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "ä¼ºæ??å?¨è¦?æ±?é©?è?(_V)"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "ä¼ºæ??å?¨é¡?å??(_T):"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "ç°½ç½²è?æ?¸(_N):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "ç°½å??æª?(_U):"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "ç°½ç½²"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "ç°½ç½²è¡¨"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "æ?¼å?æª¢æ?¥"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "å??è¦?æ??å¾?åº?é?¨é??å§?è¼¸å?¥(_T)"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "é¡?å??(_Y):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 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.glade.h:151
+#, 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. "
 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. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "é??å??å?½ä»¤ç¨¿ç??è¼¸å?ºæ??ç?¨ä¾?ä½?ç?ºä½ ç??\n"
 "ç°½å??æª?ã??ä½ æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?º\n"
 "é¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14565,26 +13230,26 @@ msgstr ""
 "è¼¸å?¥æ?³ç?¨ä¾?ä»£è¡¨é??å??å¸³è??ç??å??ç¨±ã??\n"
 "ä¾?å¦?ï¼?ã??å·¥ä½?ã??æ??ã??å??äººã??"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_E):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 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:615
-#: ../plugins/google-account-setup/google-contacts-source.c:316
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:629
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_N):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "å?¯è®?é??åº¦(_A):"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14592,129 +13257,129 @@ msgid ""
 msgstr ""
 "æ¡è¿?ä½¿ç?¨ Evolution é?µä»¶çµ?æ??å?©ç??ã??\n"
 "\n"
-"æ??ä¸?ä¸?ã??ä¸?ä¸?é ?ã??é??å§?ã?? "
+"æ??ä¸?ä¸?ã??å¾?å??ã??é??å§?ã?? "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "å? å?¥ç°½å??æª?(_A)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "ä¸?å®?è?ªç¶²çµ¡ä¸?è¼?å??ç??(_A)"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "è?ªå??ä»£ç??ä¼ºæ??å?¨çµ?æ??ç¶²å??(_A):"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "é ?è¨å??å?¾é?µä»¶å¤?æ??ç¨?å¼?(_D):"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "ç?´æ?¥é?£ç·?å?°äº?è?¯ç¶²(_D)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?ç°½ç½²æ??è°é??è«? (å?¼å®¹æ?¼ _Outlook)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "è½?å¯?æ?¹å¼?(_F):"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "å??ä¿¡æ??ä¿?ç??å??å§?é?µä»¶ç??ç°½ç½²(_K)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "è¼?å?¥ç?±è?¯çµ¡äººå¯?å?ºé?µä»¶ä¸ç??å??ç??(_L)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "å?ªå?¨æ?¬å?°é??è¨?é??æ?¥è©¢(_L)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "è¨ç?ºæ??ç??é ?è¨å¸³è??(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??(_M):"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²é?±è®?æ?¼(_M)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ä¸?å®?ä¸?è?ªç¶²çµ¡ä¸?è¼?å??ç??(_N)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "è·¯å¾?(_P):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 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.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ç?¶å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶æ??é¡¯ç¤ºæ??ç¤º(_P)"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "å??è¦?æ?¹å¼?(_R):"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "å?½ä»¤ç¨¿(_S):"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??ä¼ºæ??å?¨(_S):"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 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.glade.h:186
 msgid "_Show image animations"
 msgstr "é¡¯ç¤ºå??ç?«å??ç??(_S)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨é?µä»¶é ?è¦½é¡¯ç¤ºå¯?ä»¶è??ç?¸ç??(_S)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ç¸®ç? _To / Cc / Bcc æª?é ç?º"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "ä½¿ç?¨ç³»çµ±é ?è¨å?¼(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "ä½¿ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å?å??(_U)"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "å?°å??"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "è?²å½©"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "æ??è¿°"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "ç§?å¾?"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
@@ -14744,50 +13409,34 @@ msgid "All local folders"
 msgstr "æ??æ??æ?¬å?°ç«¯è³?æ??å¤¾"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "å??å??å¤§å°?å¯«(_S)"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "å°?æ?¾(_I):"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "å?¨é?µä»¶å?§å°?æ?¾"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "è¦?è·?é?¨ç??æ¨?å¹?"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "è³?æ??å¤¾è¨?é?±"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "æ??æ¬?å??ç´?"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "æ?ªé?¸å??"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "ä¼ºæ??å?¨(_E):"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "ä¿?å?¨æ?§è³?è¨?"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "æ??å®?ç??è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14795,19 +13444,19 @@ msgstr ""
 "ä½ é?¸æ??è¦?è·?é?¨ç??é?µä»¶å·²å?¨ä¸?é?¢å??å?ºã??\n"
 "è«?å¾?ã??æ¨?å¹?ã??é?¸å?®ä¸é?¸æ??è·?é?¨ç??å??ä½?ã??"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "æ?¥å??æ??æ¬?(_A)"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "å?°æ??æ?¼(_D):"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "æ¨?å¹?(_F):"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
@@ -14816,21 +13465,21 @@ msgstr "é?¸å??æ¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "é??æ¿¾é?¸æ??ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "æ?¥æ?¶é?µä»¶"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, 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:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14839,123 +13488,123 @@ msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
 "æ?¹é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??ã??"
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??ï¼?%s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "æ£å?¨å?³é??é?µä»¶"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, 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:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "å?²å?é?µä»¶å?°è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "å°?é?µä»¶ç§»å?° %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "å°?é?µä»¶è¤?è£½å?° %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "é??å??è³?æ??å¤¾ %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "å??å¾?è³?æ??å¤¾ %s ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "é??å??è²¯è?? %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "ç§»é?¤è³?æ??å¤¾ %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "è²¯è??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?ç©ºå??å?²å?å¸³è?? '%s'"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å?å¸³è?? '%s'"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "å?ªé?¤è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?ç©º '%s' ç??å??æ?¶ç?"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "å??å??é?µä»¶ %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "å?²å? %d å°?é?µä»¶"
 msgstr[1] "å?²å? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14964,11 +13613,11 @@ msgstr ""
 "å?²å?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "å?²å?é??ä»¶"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14977,27 +13626,27 @@ msgstr ""
 "ä¸?è?½å»ºç«?è¼¸å?ºæª?æ¡?ï¼?%sï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ç?¡æ³?å¯«å?¥è³?æ??ï¼?%s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "ä¸æ?·è?? %s ç??é?£ç·?"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "é??æ?°é?£ç·?å?° %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æº?å??å¸³è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "æª¢æ?¥æ??å??"
 
@@ -15021,31 +13670,31 @@ msgstr "æ?´æ?°ä¸..."
 msgid "Waiting..."
 msgstr "æ£å?¨ç?å¾?..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:813
 #, c-format
 msgid "Checking for new mail"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "è¼¸å?¥å¯?èª?"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?ç¢¼"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "è¼¸å?¥å¯?ç¢¼"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "ä½¿ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
@@ -15090,21 +13739,21 @@ msgstr "è³?æ??å¤¾ç?¡æ??:`%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "è¨å®?æ??å°?è³?æ??å¤¾ï¼? %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?° '%s:%s' ç??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "ç·¨è¼¯æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??å¤¾"
 
@@ -15678,85 +14327,85 @@ msgstr "æ¸?é?¤(_E)"
 msgid "_Open Messages"
 msgstr "é??å??é?µä»¶(_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "æ?ªé?±è®?"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "å·²é?±è®?"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "è½?å¯?"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
+#: ../widgets/table/e-cell-date.c:71
 msgid "Today %l:%M %p"
 msgstr "ä»?å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1670 ../widgets/table/e-cell-date.c:81
 msgid "Yesterday %l:%M %p"
 msgstr "æ?¨å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1682 ../widgets/table/e-cell-date.c:93
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1690 ../widgets/table/e-cell-date.c:101
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p %l:%M"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:103
 msgid "%b %d %Y"
 msgstr "%Y/%m/%d"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3981 ../mail/message-list.c:4454
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4293
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "æ²?æ??é?µä»¶ç¬¦å??ä½ ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4295
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -15786,6 +14435,7 @@ 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 "å¤§å°?"
 
@@ -15793,39 +14443,39 @@ msgstr "å¤§å°?"
 msgid "Subject - Trimmed"
 msgstr "ä¸»æ?¨ - å·²æ?ªç?"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "å??å§?ä½?ç½®"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "è«?å?¿è½?å¯?"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "è·?é?¨"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "çµ¦ä½ ç??è³?è¨?"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "è½?å¯?"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "ä¸?é??è¦?å??æ??"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "å??è¦?"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "å?¨é?¨å??è¦?"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "æª¢é?±"
 
@@ -15850,20 +14500,24 @@ msgid "Subject contains"
 msgstr "ä¸»æ?¨å??å?«"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "ä¸»æ?¨æ??æ?¶ä»¶è??å??å?«"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "ä¸»æ?¨æ??å¯?ä»¶è??å??å?«"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "æ?¬å?°ç«¯é??è¨?é??"
+msgid "Add local address books to Evolution."
+msgstr "å°?æ?¬å?°é??è¨?é??å? å?¥ Evolutionã??"
 
 #: ../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 ""
@@ -15877,8 +14531,8 @@ msgid ""
 "body."
 msgstr "è®?é??å? æª?æ¡?æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®ã??"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "é??é?µå?"
 
@@ -15888,10 +14542,8 @@ 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 "å?¨é?µä»¶ä¸å°?æ?¾é??é?µå?ä»¥æ??é??å?¶ä¸ç??é??å? æª?æ¡?ä¸¦ä¸?å?¯å?¨é??å? æª?æ¡?é?ºå¤±æ??æ??å?ºè¦å??"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ç?¶ä½ å¿?è¨?å°?é??ä»¶å? å?¥é?µä»¶æ??æ??é??ä½ ã??"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -15903,21 +14555,23 @@ 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/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr "ç?¨ä¾?é¡¯ç¤ºé?µä»¶ä¸é?³æ??é??ä»¶ç??æ ¼å¼?å¤?æ??ç¨?å¼?ï¼?å®?å?¯ä»¥è®?ä½ å?¨ Evolution ä¸ç?´æ?¥æ?æ?¾å®?å??ã??"
+msgid "Audio Inline"
+msgstr "è¡?å?§é?³æ??"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "é?µä»¶é?³è¨?å¤?æ??ç¨?å¼?"
+msgid "Play audio attachments directly from Evolution."
+msgstr "å¾? Evolution ç?´æ?¥æ?æ?¾é?³æ??é??ä»¶ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "é?¸æ?? Evolution å??ä»½æª?æ¡?ç??å??ç¨±"
 
@@ -15938,135 +14592,141 @@ msgid "Restore from backup"
 msgstr "å¾?å??ä»½é??å??"
 
 #: ../plugins/backup-restore/backup-restore.c:289
+#, 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."
 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:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "å¾?å??ä»½æª?æ¡?é??å?? Evol_ution"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution æª?æ¡?åº«ï¼?"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "é?¸æ??è¦?é??å??ç??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "å??ä»½ Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "å??å? Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "æª¢æ?¥ Evolution å??ä»½"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "ä½¿ç?¨å??å½¢ä½¿ç?¨è??ä»?é?¢"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "æ£å?¨é??é?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "å??ä»½ Evolution ç??å¸³è??è??è¨å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æ£å?¨å??ä»½ Evolution è³?æ?? (é?µä»¶ã??è?¯çµ¡äººã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "å??ä»½å®?æ??"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../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:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "å??ä»½ç?®å??ç?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "å¾?å??ä»½è§£é??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "æ£å?¨è®?å?? Evolution ç??è¨å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "ç§»é?¤æ?«å?ç??å??ä»½æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "æ£å?¨ç¢ºèª?æ?¬å?°ç«¯ä¾?æº?"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ£å??ä»½è?³è³?æ??å¤¾ %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../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:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolution å??ä»½"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "å??ä»½ Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??ä»½ä½ ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??ä½ ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../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:2
+msgid "Backup and Restore"
+msgstr "å??ä»½è??å??å?"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "å??ä»½è??å??å?å¤?æ??ç¨?å¼?ã??"
+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?"
@@ -16122,71 +14782,78 @@ msgstr "é??å??è¨å®?å?¼(_E)..."
 msgid "_Backup Settings..."
 msgstr "å??ä»½è¨å®?å?¼(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../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"
-msgstr "å?¨å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??ä¸å»ºç«?é ?ç?®(_A)"
+#: ../plugins/bbdb/bbdb.c:646
+msgid "Create _address book entries when sending mails"
+msgstr "å?¨å?³é??é?µä»¶æ??è?ªå??å»ºç«?é??è¨?é??é ?ç?®(_A)"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "é?¸æ??çµ¦è?ªå??å? å?¥è?¯çµ¡äººç?¨ç??é??è¨?é??"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "å?³æ??è¨?æ?¯è?¯çµ¡äºº"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "å®?æ??å¾? Pidgin ç??å¥½å??æ¸?å?®å??æ¥è?¯çµ¡äººè³?è¨?å??å??ç??"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "é?¸æ??çµ¦ Pidgin å¥½å??å??å?®ç?¨ç??é??è¨?é??"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 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 ""
+#| "Automatically fills your address book with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
 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 "å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??ä¸å¡«å?¥å§?å??è??é?»å?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸å¡«å?¥ IM è?¯çµ¡äººè³?è¨?ã??"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
-
 #. 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:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "å?¨ç?¢ç?? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter å?ç¨?åº?æ²?æ??å??æ??ï¼?ä¸æ¢å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ç?å¾? Bogofilter å?ç¨?åº?ä¸æ?·ï¼?çµ?çµ?å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "å°?ç®¡è?³ Bogofilter å¤±æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%dã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º _Unicode"
 
@@ -16201,73 +14868,80 @@ msgid ""
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º Unicode UTF-8 ä»¥çµ±ä¸?ä¾?è?ªä¸?å??å?é??ç?? spam/ham ç?¹å¾µã??"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter é?¸é ?"
+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."
+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 "ç¶²å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-source.c:622
+#: ../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:632
-#: ../plugins/google-account-setup/google-contacts-source.c:358
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:646
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "é?±"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV è¡?äº?æ??ä¾?æº?"
+msgid "Add CalDAV support to Evolution."
+msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV ä¾?æº?"
+msgid "CalDAV Support"
+msgstr "CalDAV æ?¯æ?´"
 
 #: ../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
 msgid "Weather: Fog"
@@ -16309,35 +14983,33 @@ msgstr "å¤©æ°£ï¼?é?·æ?´"
 msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "å?®ä½?(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 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 "ç?¨ä¾?å±?ç¤ºå½?å?ºå¼?é?¸å?®å¤?æ??ç¨?å¼?å??è?½ç??æ¸¬è©¦ç?¨å¤?æ??ç¨?å¼?ï¼?å®?å?¯ä»¥è®?ä½ è¤?è£½æ?±è¥¿å?°å?ªè²¼ç°¿è£?ã??"
+msgid "Copy Tool"
+msgstr "è¤?è£½å·¥å?·"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "è¤?è£½å·¥å?·"
+msgid "Copy things to the clipboard."
+msgstr "å°?å?§å®¹è¤?è£½å?°å?ªè²¼ç°¿ã??"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16349,11 +15021,11 @@ 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."
+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
@@ -16361,23 +15033,23 @@ 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
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "æ¨?ç¤ºç?ºé ?è¨é??è¨?é??(_D)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "æ¨?ç¤ºç?ºé ?è¨è¡?äº?æ??(_D)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å·¥ä½?æ¸?å?®(_D)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å??å¿?é??æ¸?å?®(_D)"
 
@@ -16386,32 +15058,30 @@ 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 "æ??ä¾?æ¨?è¨?é ?è¨è¡?äº?æ??æ??é??è¨?é??ç??å??è?½ã??"
+msgid "Mark your preferred address book and calendar as default."
+msgstr "å°?ä½ å??å¥½ç??é??è¨?é??å??è¡?äº?æ??æ¨?è¨?ç?ºé ?è¨ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "å®?å?¨æ?§:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
-msgstr "é??å¯?ä»¶"
+msgstr "æ?ªæ¸é¡?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "å·²ä¿?è·"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "å¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "æ¥µæ©?å¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "è?ªé?¸æ¨?é (_C)"
 
@@ -16420,7 +15090,7 @@ msgid "Key"
 msgstr "è¨å®?é?µ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:396
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "æ?¸å?¼"
 
@@ -16439,7 +15109,7 @@ 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 "Add custom headers to outgoing mail messages."
 msgstr "å?¨å¤?å¯?é?µä»¶ä¸å? å?¥è?ªé?¸æ¨?é ã??"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
@@ -16495,11 +15165,11 @@ msgid ""
 "password authentication."
 msgstr "æ¤é?¸é ?å°?æ??é?£æ?¥å?°ä½¿ç?¨æ¨?æº?ç´?æ??å?å¯?ç¢¼é©?è?ç?? Exchange ä¼ºæ??å?¨ã??"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16507,90 +15177,97 @@ msgstr ""
 "ä»¥ä¸?æ??å®?ç??è¨?æ?¯å°?æ??è?ªå??å?³é??çµ¦\n"
 "æ¯?ä¸?ä½?å?¨ä½ é?¢é??è¾¦å?¬å®¤æ??å?³é??é?µä»¶çµ¦ä½ ç??äººã??"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "æ??ç?®å??ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "æ??ç?®å??å?¨è¾¦å?¬å®¤"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "æ?¹è®? Exchange å¸³è??ç??å¯?ç¢¼"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "æ?´æ?¹å¯?ç¢¼"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "ç®¡ç?? Exchange å¸³è??ç??æ??æ¬?è¨å®?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "å§?æ´¾è¨å®?å?©ç??"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "é??é ?"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "æª¢è¦?æ??æ?? Exchange è³?æ??å¤¾ç??å¤§å°?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "è³?æ??å¤¾å¤§å°?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange è¨å®?å?¼"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 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:774
+msgid "Mailbox name is _different than user name"
+msgstr "ä¿¡ç®±å??ç¨±è??ä½¿ç?¨è??å??ç¨±ä¸?å??(_D)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "ä¿¡ä»¶å?£(_M):"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "é©?è?é¡?å??(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
 msgid "Ch_eck for Supported Types"
 msgstr "æª¢æ?¥æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "å¤§å°?:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -16629,38 +15306,35 @@ msgstr "æ?°å¯?ç¢¼ï¼?"
 msgid "Your current password has expired. Please change your password now."
 msgstr "ç?®å??ç??å¯?ç¢¼å·²é??æ??ã??è«?ç«?å?³æ?´æ?¹å¯?ç¢¼ã??"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "ä½ ç??å¯?ç¢¼å°?å?¨ %d å¤©å¾?å?°æ??"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "è?ªé?¸"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "ç·¨è¼¯è?? (è®?å??ã??å»ºç«?ã??ç·¨è¼¯)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "å??è??è?? (è®?å??ï¼?å»ºç«?)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "æª¢é?±è?? (å??é??è®?å??)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "ä»£ç??äººæ¬?é??"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s ç??æ¬?é??"
@@ -16668,7 +15342,7 @@ 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
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16676,84 +15350,96 @@ msgstr "é??å°?é?µä»¶æ?¯ç?± Evolution è?ªå??å¯?å?ºä»¥é??ç?¥ä½ å·²ç¶?è¢«æ??æ´¾ç?º
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "ä½ å·²ç¶?å¾?å?°æ??ç??è³?æ??å¤¾ç??æ¬?é??æ??ï¼?"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "ä½ ä¹?è¢«å??è¨±æ?¥ç??æ??ç??ç§?äººé ?ç?®ã??"
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "ç?¶è??ä½ ä¸¦æ?ªå¾?å?°å??è¨±è§?ç??æ??ç??ç§?äººé ?ç?®ã??"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "ä½ å·²ç¶?è¢«æ??æ´¾ç?º %s ç??ä»£ç??äºº"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "å§?è¨?çµ¦"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "è¦?ç§»é?¤ä»£ç??äºº %s å??ï¼?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "ç?¡æ³?å?å?? Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Active Directory ä¸æ?¾ä¸?å?°è?ªå·±"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Active Directory ä¸æ?¾ä¸?å?°ä»£ç??äºº %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "ç?¡æ³?ç§»é?¤ä»£ç??äºº %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "ç?¡æ³?æ?´æ?°ä»£ç??äººç??æ¸?å?®ã??"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "ç?¡æ³?æ?°å¢?ä»£ç??äºº %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "è®?å??ä»£ç??äººæ¸?å?®é?¯èª¤ã??"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "è¡?äº?æ??(_A):"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "è?¯çµ¡äºº(_N):"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "ä»£ç??äºº"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"æ²?æ??\n"
+"æª¢é?±è?? (å??é??è®?å??)\n"
+"å??è??è?? (è®?å??ï¼?å»ºç«?)\n"
+"ç·¨è¼¯è?? (è®?å??ã??å»ºç«?ã??ç·¨è¼¯)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "æ¬?é??æ??äº?"
 
@@ -16780,6 +15466,7 @@ msgstr "æ¬?é??æ??è¦?(_S)"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "å·¥ä½?(_T):"
 
@@ -16797,11 +15484,11 @@ msgid "Folder Size"
 msgstr "è³?æ??å¤¾å¤§å°?"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "ä½¿ç?¨è??"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??è³?æ??å¤¾"
@@ -16810,20 +15497,20 @@ msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??è³?æ??å¤¾"
 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
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "ç¢ºå®?è¦?å??æ¶?è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "å??æ¶?è¨?é?±ã??%sã??"
@@ -16887,18 +15574,18 @@ msgstr "ä½ ç??å¯?ç¢¼å°?å?¨ 7 å¤©å?§å?°æ??..."
 msgid "_Change Password"
 msgstr "æ?´æ?¹å¯?ç¢¼(_D)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(æ¬?é??è¢«æ??çµ?ã??)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "æ?°å¢?ä½¿ç?¨è??ï¼?"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "å? å?¥ä½¿ç?¨è??"
 
@@ -17016,11 +15703,11 @@ msgstr "æ??æ??åº¦(_S):"
 msgid "_User"
 msgstr "ä½¿ç?¨è??(_U)"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "é?¸æ??ä½¿ç?¨è??"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "é??è¨?é??..."
 
@@ -17033,10 +15720,8 @@ 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 å¸³è??æ??å®?æ??ä½?è??å??è?½é??å??ç??å¤?æ??ç¨?å¼?ã??"
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "ä½¿ç?¨ Evolution-Exchange å»¶ä¼¸å¥?ä»¶ã??"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17179,7 +15864,7 @@ msgid "Folder offline"
 msgstr "è³?æ??å¤¾é?¢ç·?"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "ä¸?è?¬é?¯èª¤"
 
@@ -17296,7 +15981,9 @@ 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:521
+#: ../plugins/google-account-setup/google-source.c:516
+#: ../plugins/mail-to-task/mail-to-task.c:343
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
@@ -17373,63 +16060,76 @@ msgid "Check folder permissions"
 msgstr "æª¢æ?¥è³?æ??å¤¾æ¬?é??"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "å?¨é?µä»¶ç·¨è¼¯å?¨ä¸æ??ä¸?æ??é?µæ??è?ªå??å?·è¡?ç·¨è¼¯å?¨"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "ç?¶ç·¨è¼¯æ?°é?µä»¶æ??è?ªå??å?·è¡?"
+
+#: ../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
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr "ä½¿ç?¨å¤?é?¨ç·¨è¼¯å?¨å??ç?ºé?µä»¶ç·¨è¼¯å?¨ç??å¤?æ??ç¨?å¼?ã??ä½ å?ªè?½å¯?å?ºç´?æ??å?é?µä»¶ã??"
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 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
+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 "Evoluton ç?¡æ³?å»ºç«?ç?¨ä¾?å?²å?ä½ é?µä»¶ç??æ?«å?æª?æ¡?ã??è«?ç¨?å¾?å??è©¦ã??"
 
-#: ../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:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "ç?¨ä¾?å??å??ç·¨è¼¯å?¨ç??æ??ä»¤: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Emacs ä½¿ç?¨ã??xemacsã??\n"
-"VI ä½¿ç?¨ã??gvimã??"
+"VI ä½¿ç?¨ã??gvim -fã??"
+
+#: ../plugins/external-editor/external-editor.c:307
+#: ../plugins/external-editor/external-editor.c:309
+msgid "Compose in External Editor"
+msgstr "å?¨å¤?é?¨ç·¨è¼¯å?¨ä¸æ?°å¯«"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -17445,34 +16145,45 @@ msgstr "é?¢è²?(_F)"
 
 #: ../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."
-msgstr "å?¨å¤?å¯?ç??é?µä»¶ä¸é??å? å¤§é è²¼æ¨?é ã??ç¬¬ä¸?æ¬¡ä½¿ç?¨æ??é??è¦?å??è¨å®?ä¸?å¼µ 48*48 ç?? png ç?¸ç??ã??å®?æ??ä»¥ base 64 ç·¨ç¢¼ä¸¦å?²å?æ?¼ ~/.evolution/faces é??æ??ç?¨å?¨æ?ªä¾?æ??å¯?å?ºç??é?µä»¶ä¸ã??"
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
+msgstr ""
+"å?¨å¤?å¯?ç??é?µä»¶ä¸é??å? å¤§é è²¼ç?§ç??ã??\n"
+"\n"
+"ç¬¬ä¸?æ¬¡ä½¿ç?¨æ??é??è¦?å??è¨å®?ä¸?å¼µ 48x48 ç?? PNG å??ç??ã??å®?æ??ä»¥ Base-64 ç·¨ç¢¼ä¸¦å?²å?æ?¼ ~/.evolution/faces ã??é??æ??ç?¨å?¨æ?ªä¾?æ??å¯?å?ºç??é?µä»¶ä¸ã??"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾ ã??%sã??"
 
 #: ../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/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr "è¦?å??æ¶?è¨?é?± IMAP è³?æ??å¤¾ï¼?å?¯å?¨è³?æ??å¤¾æ¨¹ä¸å°?å®?æ??æ»?é¼ å?³é?µã??"
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "å??æ¶?è¨?é?±(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:79
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:413
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "è¼¸å?¥ä½¿ç?¨è?? %s ç??å¯?ç¢¼ä»¥å?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:516
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17481,45 +16192,40 @@ msgstr ""
 "ä¸?è?½å¾? Google ä¼ºæ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:690
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:725
 msgid "Retrieve _list"
 msgstr "å??å??æ¸?å?®(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:306
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>ä¼ºæ??å?¨</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "ç?¨ä¾?è¨å®? Google æ?¥æ??è??è?¯çµ¡äººç??å¤?æ??ç¨?å¼?ã??"
+msgid "Add Google Calendars to Evolution."
+msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
 
 #: ../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-account-setup/camel-gw-listener.c:450
 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 è¡?äº?æ??è??è?¯çµ¡äººä¾?æº?ç??å¤?æ??ç¨?å¼?ã??"
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "å? å?¥ Evolution å°? Novell GroupWise ç??æ?¯æ?´ã??"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "GroupWare å¸³è??è¨å®?"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17544,11 +16250,11 @@ msgstr ""
 "æ??ã??ç¹¼çº?ã??ä»¥å®?è£?å??äº«è³?æ??å¤¾\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "å®?è£?å??äº«è³?æ??å¤¾"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "å??äº«è³?æ??å¤¾å®?è£?"
 
@@ -17586,21 +16292,21 @@ msgstr "å??ç?¨(_E)"
 msgid "_Junk List"
 msgstr "å??å?¾é?µä»¶æ¸?å?®(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "é?µä»¶å??æ¶?"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
 msgstr "å??å??é?µä»¶å?¯è?½æ??å°?è©²é?µä»¶è?ªæ?¸ä»¶è??ç?? mailbox ç§»é?¤ã??ä½ ç¢ºå®?è¦?é??éº¼å??ï¼?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "æ?¶å??é?µä»¶"
 
@@ -17609,87 +16315,79 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "å°? å?³é?? é?¸é ?å? å?¥ GroupWise è¨?æ?¯"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
+#, fuzzy
+#| msgid "A plugin for the features in GroupWise accounts."
+msgid "Fine-tune your GroupWise accounts."
 msgstr "æ??ä¾? GroupWise å¸³è??å??è?½ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 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
 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
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "å·²ç¶?æ??å??ç¨±ç?º &quot;{0}&quot; ç??å¸³è??å?å?¨ã??è«?æª¢æ?¥ä½ ç??è³?æ??å¤¾çµ?æ§?ã??"
+
+#: ../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 "ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥ä½ ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "ä¸?è?½è®?ä½¿ç?¨è?? &quot;{0}&quot; å?å??ä»£ç??ä¼ºæ??å?¨"
 
-#: ../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
 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
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "å·²ç¶?æ??å??ç¨±ç?º &quot;{0}&quot; ç??å¸³è??å?å?¨ã??è«?æª¢æ?¥ä½ ç??è³?æ??å¤¾çµ?æ§?ã??"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "å¸³è??å·²å?å?¨"
-
-#: ../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."
-msgstr "ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥ä½ ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-msgid "This is a recurring meeting"
-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
-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
-msgid "Would you like to decline it?"
-msgstr "ä½ æ?³è¦?æ??çµ?å®?å??ï¼?"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "ä½ ä¸?è?½è??æ??å®?ç??ä½¿ç?¨è?? &quot;{0}&quot; å??äº«é??å??è³?æ??å¤¾"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+#: ../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/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "æ?«æ??å¥?ç?¨"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+msgid "Rese_nd Meeting..."
+msgstr "é??å¯?æ??è°(_N)..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>ä½¿ç?¨è??ï¼?</b>"
@@ -17703,7 +16401,7 @@ msgid "Con_tacts..."
 msgstr "è?¯çµ¡äºº(_T)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "é?µä»¶"
 
@@ -17786,10 +16484,10 @@ msgstr "<b>å¸³è??å??ç¨±</b>"
 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/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sè«?è¼¸å?¥ %s æ??é??ç??å¯?ç¢¼(ä½¿ç?¨è?? %s)"
@@ -17802,12 +16500,12 @@ 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
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ä»£ç??ä¼ºæ??å?¨é ?ç±¤å?ªæ??å?¨å¸³è??ä¸?ç·?æ??æ??æ??å?ºç?¾ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ä»£ç??ä¼ºæ??å?¨é ?ç±¤å?ªæ??å?¨å??ç?¨æ¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 
@@ -17815,95 +16513,95 @@ msgstr "ä»£ç??ä¼ºæ??å?¨é ?ç±¤å?ªæ??å?¨å??ç?¨æ¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 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:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "ä½¿ç?¨è??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "è¼¸å?¥ä½¿ç?¨è??ä¸¦è¨å®?æ¬?é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "æ?°å¢?å??äº«è³?æ??å¤¾(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "å??äº«"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "è?ªé?¸é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "æ?°å¢?"
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "ä¿®æ?¹"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "ä¸»æ?¨:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "å¯?ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "å»ºç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "å·²å?ªé?¤:"
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "è¿½è¹¤é?µä»¶ç??æ??..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "ç?¨ä¾?è¨å®? hula è¡?äº?æ??ä¾?æº?ç??å¤?æ??ç¨?å¼?ã??"
+msgid "Add Hula support to Evolution."
+msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
 
 #: ../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/imap-features/imap-headers.c:320
 msgid "Custom Headers"
@@ -17955,58 +16653,24 @@ msgstr ""
 "è?¥æ²?æ??é??ä¿¡è«?å£?é??æ¿¾å?¨å??å?¯ä½¿ç?¨æ¤é ?"
 
 #: ../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 ""
 
 #: ../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 "ç?¡æ³?è¼?å?¥ç¡¬ä»¶æ?½è±¡å±¤"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
 msgstr "ã??haldã??æ??å??æ?¯å¿?è¦?ç??ä½?ç?®å??ä¸¦æ?ªå?·è¡?ã??è«?å??ç?¨è©²æ??å??å¾?å??å??å?°æ?¬ç¨?å¼?ï¼?æ??è??è?¯çµ¡ä½ ç??ç³»çµ±ç®¡ç??è??ã??"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "æ??å°? iPod å¤±æ??"
 
@@ -18022,200 +16686,203 @@ 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:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr "å°?ä½ ç??è³?æ??è?? Apple iPod å??æ¥å??ã??"
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod å??æ¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "è¼?å?¥è¡?äº?æ??ã??%sã??å¤±æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, 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:663
 #, 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:753
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??ä¸æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+msgid "Opening the calendar. Please wait.."
+msgstr "æ£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, 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:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºä¸?ç¢ºå®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??ä¸¦è¨ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è°å?¬é??äººå·²ç§»é?¤ä»£ç??äºº %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 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:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "æ??è°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "å·¥ä½?è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 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:1425
 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:1428
 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
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 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:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 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:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 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:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "æ¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?è©²å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?ä»¶ã??å·¥ä½?æ??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 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:2335
 msgid "This meeting recurs"
 msgstr "é??å??æ??è°ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 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:2574
 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:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 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
+#: ../widgets/misc/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "ä»?å¤©"
 
@@ -18580,113 +17247,109 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "é??å??è¡?äº?æ??(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../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
-msgid "_Decline"
-msgstr "æ??çµ?(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "æ??çµ?(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "æ?¥å??(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "å?¨é?¨æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "å?¨é?¨æ?«è¨?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "æ?«è¨?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "å?¨é?¨æ?¥å??(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "å?³é??è³?è¨?(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "æ?´æ?°å?ºå¸ç??æ??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "é??å§?æ??é??:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "çµ?æ??æ??é??:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "è¨»è§£:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "å?³é??æ?´æ?°çµ¦å?°æ??è??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "å¥?ç?¨è?³æ??æ??å¯¦é«?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "é¡¯ç¤ºæ??é??ç?ºç©ºé??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1160
 #, fuzzy
 #| msgid "Attachment Reminder"
 msgid "_Inherit reminder"
-msgstr "é??å? æª?æ¡?æ??é??ç¨?å¼?"
-
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "å·¥ä½?(_T):"
+msgstr "é¡¯ç¤ºæ??é??(_R)"
 
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "å??å¿?é??:"
+msgid "_Memos:"
+msgstr "å??å¿?é??(_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "é¡¯ç¤ºé?µä»¶ä¸ç??æ??å?/è¡?äº?æ??é?¨å??ã??"
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "é¡¯ç¤ºé?µä»¶ä¸ç??ã??text/calendarã?? MIME é?¨å??ã??"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18712,13 +17375,13 @@ 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-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "è¦?å??ç?¨å¸³è??ï¼?å?¯å?¨è³?æ??å¤¾æ¨¹ä¸å°?å®?æ??æ»?é¼ å?³é?µã??"
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "ç?¼å?ºå?¶è?²æ??æ?æ?¾è?²é?³æª?æ¡?ã??"
@@ -18785,20 +17448,20 @@ msgstr "å??ç¤ºæ?¯å?¦è¦?é??ç??ã??"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:256
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
 
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Evolution ç??æ?°é?µä»¶é??ç?¥"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:389
 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
+#: ../plugins/mail-notification/mail-notification.c:468
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18813,109 +17476,140 @@ msgstr[1] ""
 "ä½ å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? \n"
 "ä½?æ?¼ %sã??"
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:473
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ä½ å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 msgstr[1] "ä½ å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:490
+#: ../plugins/mail-notification/mail-notification.c:495
 msgid "New email"
 msgstr "æ?°é?µä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:555
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??ä¸é¡¯ç¤ºå??ç¤º(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:558
 msgid "B_link icon in notification area"
 msgstr "è®?é??ç?¥å??å??ç¤ºé??ç??(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:560
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??ç¤ºä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:741
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "_Beep"
 msgstr "å?¶è?²(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:759
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Play _sound file"
 msgstr "æ?æ?¾è?²é?³æª?æ¡?(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:770
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Specify _filename:"
 msgstr "æ??å®?æª?æ¡?å??ç¨±(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:772
+#: ../plugins/mail-notification/mail-notification.c:761
 msgid "Pl_ay"
 msgstr "æ?æ?¾(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:818
 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/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "é?µä»¶é??ç?¥"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "å?¯ä»¥å¾?é?µä»¶è¨?æ?¯ç??å?§å®¹å»ºç«?æ??è°ç??å¤?æ??ç¨?å¼?ã??"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "è½?æ??ç?ºæ??è°(_V)"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "å¯?ä¿¡å?°æ??è°"
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "ç?¶æ?°é?µä»¶å?°é??æ??é??ç?¥ä½ ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:343
 #, 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:350
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ¤ä¸?è?½å?¨é??è£?å»ºç«?äº?ä»¶ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:353
 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:356
 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/mail-to-task.c:455
+#, c-format
+msgid "Could not create object. %s"
+msgstr "ç?¡æ³?å»ºç«?ç?©ä»¶ã??%s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:555
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "ä¸?è?½å??å¾?ä¾?æº?æ¸?å?®ã??%s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "è½?æ??ç?ºå·¥ä½?(_V)"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+msgid "Convert to a Mem_o"
+msgstr "è½?æ??ç?ºå??å¿?é??(_O)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "å¯?ä¿¡å?°å·¥ä½?"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Convert to a _Meeting"
+msgstr "è½?æ??ç?ºæ??è°(_M)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+msgid "Convert to a _Task"
+msgstr "è½?æ??ç?ºå·¥ä½?(_T)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+msgid "Convert to an _Event"
+msgstr "è½?æ??ç?ºäº?ä»¶(_E)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+msgid "Mail-to-Task"
+msgstr "é?µä»¶è½?å·¥ä½?"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Convert the selected message to a new event"
+msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??äº?ä»¶"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new meeting"
+msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??æ??è°"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+msgid "Convert the selected message to a new memo"
+msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??å??å¿?é??"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
 msgid "Convert the selected message to a new task"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?æ??ç?ºæ?°ç??å·¥ä½?"
 
@@ -18941,9 +17635,8 @@ msgid "Mailing _List"
 msgstr "é??ä¿¡è«?å£?(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "æ??ä¾?ä¸?è?¬é??ä¿¡è«?å£?æ??ä»¤ç??å??ä½? ï¼?è¨?é?±ã??å??æ¶?è¨?é?±â?¦ï¼?ã??"
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "å?·è¡?ä¸?è?¬é??ä¿¡è«?å£?æ??ä»¤ç??å??ä½? ï¼?è¨?é?±ã??å??æ¶?è¨?é?±ç?ç?â?¦ï¼?ã??"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19105,20 +17798,20 @@ 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 "ç?¨ä¾?å°?è³?æ??å¤¾ä¸?ç??æ??æ??é?µä»¶æ¨?è¨?ç?ºå·²è®?"
+msgid "Mark all messages in 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 è¼?å?¥å?¨"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "æ?¯æ?´ä»¥ Mono ç·¨å¯«ç??å¤?æ??ç¨?å¼?ã??"
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "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
@@ -19155,26 +17848,19 @@ msgstr "æ¦?è¦½"
 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"
-
 #. 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/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:189
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
@@ -19196,8 +17882,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 "Evolution ä¸ç??è¨å®?çµ?å??è³?æ??äº?ä»¶ï¼?å?ªä¾?é??ç?¼è??ä½¿ç?¨ï¼?ã??"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19212,44 +17898,74 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??äººè³?æ??å¤¾ (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:335
 msgid "_Journal entries"
 msgstr "æ?¥èª?é ?ç?®(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "å??è¨±å°?è¡?äº?æ??ç?¼ä½?ç?ºç¶²é ?"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 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.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "å°?è¡?äº?æ??ç?¼ä½?ç?ºç¶²é ?ã??"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "ç?¼ä½?è¡?äº?æ??è³?è¨?(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+msgid "Could not open %s:"
+msgstr "ç?¡æ³?é??å?? %sï¼?"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "ç?¡æ³?é??å?? %sï¼?æ?ªç?¥ç??é?¯èª¤"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "ç?¼ä½?å?° %s æ??ç?¼ç??é?¯èª¤ï¼?"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "ç?¼ä½?å?° %s å·²æ??å??çµ?æ??"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "æ??è¼? %s å¤±æ??ï¼?"
+
+#: ../plugins/publish-calendar/publish-calendar.c:620
 msgid "Are you sure you want to remove this location?"
 msgstr "ç¢ºå®?è¦?ç§»é?¤é??å??ä½?ç½®ï¼?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:784
+msgid "Could not create publish thread."
+msgstr "ç?¡æ³?å»ºç«?ç?¼ä½?å?·è¡?ç·?ã??"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">ä½?ç½®</span>"
@@ -19306,27 +18022,41 @@ msgstr ""
 msgid "Service _type:"
 msgstr "æ??å??é¡?å??(_T):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "Time _duration:"
+msgstr "æ??é??é?±æ??(_D):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "æª?æ¡?(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "å¯?ç¢¼(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "ç?¼ä½?ç?º(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "è¨?ä½?å¯?ç¢¼(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"æ?¥\n"
+"é?±\n"
+"æ??"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19334,11 +18064,17 @@ msgstr ""
 "iCal\n"
 "ç©ºé??/å¿?ç¢?"
 
-#: ../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:481
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "ç·¨è¼¯ä½?ç½®"
 
@@ -19366,175 +18102,135 @@ msgstr "å?¯ä»¥è¼?å?¥å?¶ä»?ä»¥ Python å¯«ç??å??è?½ç??å¤?æ??ç¨?å¼?ã??"
 msgid "Python Loader"
 msgstr "Python è¼?å?¥å?¨"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (å?§ç½®)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "æ?¾ä¸?å?° SpamAssassinï¼?ä»£ç¢¼ï¼?%d"
 
-#: ../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
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "å»ºç«?å°?ç®¡å¤±æ??ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "fork ä¹?å¾?ç?¼ç??é?¯èª¤ï¼?%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 "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 "ç?å¾? 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 "å°?ç®¡è?³ SpamAssassin å¤±æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin ç?¡æ³?ä½¿ç?¨ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "é??æ??è®? SpamAssasin æ?´å?¯é? ï¼?ä½?é??åº¦è®?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 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 é??æ¿¾å??å?¾é?µä»¶ã??é??å??å¤?æ??ç¨?å¼?é??è¦?å®?è£? SpamAssassinã??"
+msgid "Filter junk messages using SpamAssassin."
+msgstr "ä½¿ç?¨ SpamAssassin é??æ¿¾å??å?¾é?µä»¶ã??"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin é?¸é ?"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin å??å?¾é?µä»¶é??æ¿¾å?¨"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
-
-#: ../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 "SpamAssassin é?¸é ?"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "æ??è¿°æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "å??é¡?æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 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:363
 msgid "Contact List"
 msgstr "è?¯çµ¡äººæ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "é??å§?"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "çµ?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "ï¼?å·²å®?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "ç¶²å??"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "å?°æ??è??æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "å·²ä¿®æ?¹"
 
-#: ../plugins/save-calendar/csv-format.c:532
+#: ../plugins/save-calendar/csv-format.c:523
 msgid "Advanced options for the CSV format"
 msgstr "CSV æ ¼å¼?ç??é?²é??é?¸é ?"
 
-#: ../plugins/save-calendar/csv-format.c:539
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "Prepend a header"
 msgstr "é ?è¨ç??æª?é "
 
-#: ../plugins/save-calendar/csv-format.c:548
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Value delimiter:"
 msgstr "æ?¸å?¼å®?ç??ç¬¦:"
 
-#: ../plugins/save-calendar/csv-format.c:554
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Record delimiter:"
 msgstr "è¨?é??å®?ç??ç¬¦:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:551
 msgid "Encapsulate values with:"
 msgstr "ä»¥æ¤å°?è£?æ?¸å?¼:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "é??è??é??é??ç??æ?¸å?¼æ ¼å¼? (.csv)"
 
@@ -19543,8 +18239,8 @@ 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 "å°?é?¸å®?ç??è¡?äº?æ??æ??å·¥ä½?å?²å?è?³ç£?ç¢?ã??"
+msgid "Save a calendar or task list to disk."
+msgstr "å°?è¡?äº?æ??æ??å·¥ä½?å?²å?è?³ç£?ç¢?ã??"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -19559,21 +18255,21 @@ msgstr "å?²å?è?³ç£?ç¢?(_S)"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF æ ¼å¼? (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:158
 msgid "Select destination file"
 msgstr "é?¸å??ç?®ç??æª?æ¡?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "é?¸æ??ä¸?å??ä¾?æº?"
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "å¿«é??é?¸å??è¦?æª¢è¦?ç??å?®ä¸?è¡?äº?æ??æ??å·¥ä½?æ¸?å?®ã??"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "é?¸æ??è¦?æª¢è¦?ç??å?®ä¸?è¡?äº?æ??æ??å·¥ä½?ä¾?æº?ã??"
+msgid "Select One Source"
+msgstr "é?¸æ??ä¸?å??ä¾?æº?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -19595,15 +18291,15 @@ msgstr "æ??å¼?ä½ å®?æ??å??å§?å¸³è??è¨å®?ã??"
 msgid "Setup Assistant"
 msgstr "è¨å®?å?©ç??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolution è¨å®?å?©ç??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "æ¡è¿?ä½¿ç?¨"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 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"
@@ -19615,35 +18311,35 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??æ??é??ç¹¼çº?ã?? "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "å?¯å?¥æª?æ¡?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 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:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "ä¾?è?ª %sï¼?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:529
 #, c-format
 msgid "Importing data."
 msgstr "å?¯å?¥è³?æ??ã??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:543
 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"
@@ -19664,15 +18360,15 @@ msgid ""
 "message body."
 msgstr "ä½¿ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå?/æ?¸å?¼çµ?æ¸?å?®ã??"
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "å?²å?ç?ºç¯?æ?¬(_T)"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "å?²å?ç?ºç¯?æ?¬"
 
@@ -19681,31 +18377,62 @@ 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
+msgid "Inline vCards"
+msgstr "è¡?å?§ vCard"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "ç?´æ?¥å?¨é?µä»¶ä¸é¡¯ç¤º vCardã??"
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "é¡¯ç¤ºå®?æ?´ç?? vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "é¡¯ç¤ºç²¾ç°¡ç?? vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+msgid "There is one other contact."
+msgstr "é??æ??è?¯çµ¡äººã??"
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "é??æ?? %d å??å?¶ä»?è?¯çµ¡äººã??"
+msgstr[1] "é??æ?? %d å??å?¶ä»?è?¯çµ¡äººã??"
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+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:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "ç¶²å??:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??ä½¿ç?¨ Apache < 2.2.8)"
 
@@ -19787,43 +18514,61 @@ msgid ""
 msgstr "å¦?æ??ç?º trueï¼?å°?ä»£ç??ä¼ºæ??å?¨ç??é?£ç·?å°±é??è¦?é©?è?ã??å?¶ä¸ä½¿ç?¨è??å??ç¨±æ??å¾? GConf ç??ã??apps/evolution/shell/network_config/authentication_userã??é?µå?¼å??å¾?ï¼?è??å¯?ç¢¼æ??å¾? gnome-keyring æ??ã??~/.gnome2_private/Evolutionã??ç??å¯?ç¢¼æª?æ¡?å??å¾?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "Initial attachment view"
+msgstr "å??å§?é??ä»¶æª¢è¦?"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Initial file chooser folder"
+msgstr "æª?æ¡?é?¸æ??å°?è©±ç??ç??å??å§?è³?æ??å¤¾"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser å°?è©±ç??ç??å??å§?è³?æ??å¤¾ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr "é??ä»¶å·¥å?·å??å??ä»¶ç??å??å§?æª¢è¦?ã??ã??0ã??æ?¯å??ç¤ºï¼?ã??1ã??æ?¯æ¸?å?®æª¢è¦?ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "ä¸?æ¬¡å??ç´?ç??çµ?æ??ç??æ?¬"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 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:21
 msgid "Non-proxy hosts"
 msgstr "ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ç??ä¸»æ©?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨æ??é?²è¡?èª?è?ç??å¯?ç¢¼ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "SOCKS ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "SOCKS ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19831,85 +18576,85 @@ msgid ""
 "\" respectively."
 msgstr "é?¸æ??ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?ã??æ?¯æ?´ç??æ?¸å?¼æ?? 0ã?? 1ã?? 2ã?? å?? 3ï¼?å??å?¥ä»£è¡¨ã??ä½¿ç?¨ç³»çµ±è¨å®?å?¼ã??ã??ã??ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ã??ã??ã??ä½¿ç?¨æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??å??ã??ä½¿ç?¨å?¨ autoconfig url ä¸æ??ä¾?ç??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "é¡¯ç¤ºå?´é??æ¬?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 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:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "ç??æ??å??è¨ç?ºé¡¯ç¤º"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "Evolution ç??çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 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:35
 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:36
 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:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr "ä¸?æ¬¡å??ç´?ç?? Evolution çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "ç?¨å?¨å®?å?¨å¼? HTTP ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "socks ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/http_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/secure_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/socks_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "text", "icons", "both", "toolbar", "toolbar"
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr "è¦?çª?æ??é??ç??é¢¨æ ¼ã??å?¯ä»¥æ?¯ã??textã??(æ??å?)ã??ã??iconsã??(å??ç¤º)ã??ã??bothã??(å?©è??)ã??ã??toolbarã??(å·¥å?·å??)ã??å¦?æ??è¨ç?ºã??toolbarã??(å·¥å?·å??)ï¼?æ??é??ç??é¢¨æ ¼æ??æ ¹æ?? GNOME å·¥å?·å??è¨å®?å?¼æ±ºå®?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19917,57 +18662,57 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr "é??å??é?µå?¼å??å?«äº?è¦?ç?´æ?¥é?£ç·?ï¼?ä¸?é??é??ä»£ç??ä¼ºæ??å?¨ï¼?å¦?æ??æ??ä½¿ç?¨ï¼?ç??ä¸»æ©?ã??æ?¸å?¼å?¯ä»¥ç?ºä¸»æ©?å??ç¨±ã??ç¶²å??ï¼?é??é ä½¿ç?¨è?¬ç?¨å?ç¬¦å¦? *.foo.comï¼?ã??IP ä½?å??ï¼?IPv4 å?? IPv6 ç??å?¯ï¼?æ??å¸¶æ??å?ç¶²çµ¡é?®ç½©ç??ä½?å??ï¼?å??æ?¯ 192.168.0.0/24ï¼?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "å·¥å?·å??å?¯ä»¥ç??å?°"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "æ??ä¾?ä»£ç??ä¼ºæ??å?¨çµ?æ??ç??ç¶²å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨æ??ç?¨ä¾?é©?è?ç??ä½¿ç?¨è??å??ç¨±ã??"
 
 # zh_HK: msgstr "Evolution æ?¯å?¦ä»¥é?¢ç·?æ¨¡å¼?å??å??å??ä»£ç·?ä¸?æ¨¡å¼?ã??"
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 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:51
 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:52
 msgid "Whether the sidebar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å?´é??æ¬?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "æ?¯å?¦é¡¯ç¤ºç??æ??å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å·¥å?·å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "æ?¯å?¦ç??ç?¥ Evulution é??ç?¼ç??æ?¬ç??è¦å??å°?è©±ç??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "è¦?çª?æ??é??é¢¨æ ¼"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
@@ -19983,21 +18728,21 @@ msgstr "ä½?ç?¨ä¸ç??é?£ç·?"
 msgid "Click OK to close these connections and go offline"
 msgstr "æ??ã??ç¢ºå®?ã??é??é??é??äº?é?£ç·?ä»¥é?¢ç·?"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "é?¸å??è¦?å?¯å?¥ Evolution ç??æª?æ¡?ï¼?ä¸¦ä¸?å?¨æ¸?å?®å?§é?¸å??æª?æ¡?é¡?å??ã??"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "é?¸æ??æ¤è¼¸å?¥ç??ç?®ç??å?°"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20009,58 +18754,62 @@ msgstr ""
 "è¼¸å?¥ç??è¨å®?å?¼ã??å¦?æ??ä½ æ?³\n"
 "å??è©¦ä¸?æ¬¡ï¼?è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??æ??é??ã??\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "æª?æ¡?å??ç¨±(_I):"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "å¾?è??ç¨?å¼?è¼¸å?¥è³?æ??å??è¨å®?å?¼(_O)"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "å?¯å?¥å?®ä¸?æª?æ¡?(_S)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:724
+msgid "_Import"
+msgstr "å?¯å?¥(_I)"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "Evolution å??å¥½è¨å®?"
 
 #. 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
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "ç³»çµ±ä¼¼ä¹?æ²?æ??å®?è£? GNOME Pilot å·¥å?·ã??"
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
-msgid "Error executing %s."
-msgstr "å?·è¡? %s ç?¼ç??é?¯èª¤ã??"
+msgid "Error executing %s. (%s)"
+msgstr "å?·è¡? %s ç?¼ç??é?¯èª¤ã??(%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "æ?ªå®?è£?è¨è¨?é?¯èª¤é?¨ä»½ã??"
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "ç?¡æ³?å?·è¡? Bug buddyã??"
 
 #. 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-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
@@ -20071,87 +18820,87 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "Evolution ç¶²ç«?"
 
 # zh_HK: msgstr "ç·?ä¸?å·¥ä½?(_W)"
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "ç·?ä¸?å·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "é?¢ç·?å·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "é?¢ç·?å·¥ä½?"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution æ£å?¨é?¢ç·?ç??ç¨?åº?ä¸ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 
-#: ../shell/e-shell-window.c:787
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ??è?³ %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "ä¸?æ??ç??ç³»çµ±é?¯èª¤ã??"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "ç¢ºå®?"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "ç?¡æ??ç??å¼?æ?¸"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "ä¸?è?½æ?¼ OAF è¨»å??"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "æ?¾ä¸?å?°çµ?æ??è³?æ??åº«"
 
-#: ../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-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "æ?°å¢?"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "æ?°æ¸¬è©¦"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "æ¸¬è©¦(_T)"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "å»ºç«?æ?°ç??æ¸¬è©¦é ?ç?®"
 
@@ -20194,7 +18943,7 @@ msgstr ""
 "å?¯å?¥å?° Evolutionã??"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20229,7 +18978,7 @@ msgstr ""
 "æ??å??å¸?æ??ä½ äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??ä½ æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20237,44 +18986,44 @@ msgstr ""
 "è¬?è¬?\n"
 "Evolution å°?çµ?æ?¬ä¸?\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??ä»¶"
 
 # zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "å¼·å?¶é??é??æ??æ?? Evoultion å??ä»¶"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??ä»¶ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??è?¯çµ¡äººå??å·¥ä½?ç??é ?è¦½çª?æ ¼ã??"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20422,65 +19171,65 @@ msgstr ""
 "\n"
 "ç·¨è¼¯ä¿¡ä»»è¨å®?å?¼ï¼?"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr "å? ç?ºä½ ä¿¡ä»»ç?¼å?ºæ¤è?æ?¸ç??è?æ?¸å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??ä½ å°?ä¿¡ä»»æ¤è?æ?¸ç??æ??æ??æ?§ã??"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr "å? ç?ºä½ ä¸?ä¿¡ä»»ç?¼å?ºæ¤è?æ?¸ç??è?æ?¸å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??ä½ å°?ä¸?ä¿¡ä»»æ¤è?æ?¸ç??æ??æ??æ?§ã??"
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "é?¸å??è¦?å?¯å?¥ç??è?æ?¸..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:145
 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:398
+#: ../smime/gui/certificate-manager.c:625
 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:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "è?æ?¸å??ç¨±"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 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:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "åº?è??"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "å?°æ??"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "æ??æ??ç??é?»å?é?µä»¶è?æ?¸æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "é?»å?é?µä»¶å?°å??"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "æ??æ??ç?? CA è?æ?¸æª?æ¡?"
 
@@ -20580,7 +19329,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr "ä¿¡ä»»æ¤æ ¸è?æ©?é??ä¹?å??ï¼?å¦?æ??å?¯ä»¥ç??è©±ï¼?ä½ æ??è©²å??æª¢æ?¥å®?ç??è?æ?¸ä»¥å??å®?ç??æ?¿ç?å??ç¨?åº?ã??"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "è?æ?¸"
 
@@ -20656,11 +19405,11 @@ msgstr "çµ?ç¹?å?®ä½? (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 æ??ç´?"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../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.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL ä¼ºæ??å?¨è?æ?¸"
 
@@ -20706,7 +19455,7 @@ msgid "_Edit CA Trust"
 msgstr "ç·¨è¼¯æ ¸è?æ©?é?? (_CA) ä¿¡ä»»åº¦"
 
 #. 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 "è?æ?¸å·²ç¶?å?å?¨"
 
@@ -20715,161 +19464,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 "PKCS #1 MD2 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "è?æ?¸å¯?ç¢¼å??ä½¿ç?¨"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "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 "è?æ?¸ç°½ç½²å?¼"
 
@@ -21019,7 +19768,7 @@ msgstr "å°?é?¸å??ç??è?¯çµ¡äººå?²å?ç?º VCard"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "å°?é?¸å®?è³?æ??å¤¾ä¸ç??è?¯çµ¡äººå?²å?ç?º VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2721
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "å?¨é?¨é?¸å??"
 
@@ -21153,7 +19902,7 @@ msgid "Month"
 msgstr "æ??"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
@@ -21162,8 +19911,8 @@ msgstr "ä¸?ä¸?å??"
 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
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
@@ -21474,7 +20223,7 @@ msgstr "ç?¸é??é?µä»¶æ¸?å?®"
 msgid "_Group By Threads"
 msgstr "æ ¹æ??ç?¸é??é?µä»¶ç?ºç¾£çµ?(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "é?µä»¶(_M)"
@@ -21729,201 +20478,185 @@ 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)"
 
 # zh_HK: msgstr "é ?è¦½é??è¦?æ??å?°ç??é?µä»¶"
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "é ?è¦½é??è¦?æ??å?°ç??é?µä»¶"
 
 # zh_HK: msgstr "æ??å?°é?µä»¶"
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "æ??å?°é?µä»¶"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ??æ??å?æª?æ¡?"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "é?¸å??æ??æ??æ??å?(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "é?¸æ??é?µä»¶ä¸ç??æ??æ??æ??å?"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "è¨å®?ä½ ç?®å??æ??å?°æ©?ç??ç??é?¢è¨å®?"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "é??ä»¶(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "æ¼?å?æ¨¡å¼?(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "æ¸?é?¤æ¨?å¹?(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "å?ªé?¤é?µä»¶(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "æ¨?å¹?å·²å®?æ??(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "ç§»è?³(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "é?µä»¶ä¾?æº?(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "æ£å¸¸å¤§å°?(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "å·²é?±è®?(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "å?²å?é?µä»¶(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "æ?ªé?±è®?(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "ç¸®æ?¾(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
@@ -22288,11 +21021,11 @@ msgid "With _Status"
 msgstr "è¨å®?ç??æ??(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c: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:421
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:423
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:425
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:764
 msgid "UTC"
 msgstr "UTC"
 
@@ -22321,19 +21054,19 @@ msgstr ""
 "ä½¿ç?¨æ»?é¼ å·¦é?µæ??è¿?å?°å??ç??å??å??ï¼?ç?¶å¾?é?¸å??æ??å??ã??\n"
 "ä½¿ç?¨æ»?é¼ å?³é?µæ??é? ã??"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../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-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "å®?ç¾© %s ç??æª¢è¦?"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "å®?ç¾©æª¢è¦?"
 
@@ -22343,17 +21076,16 @@ 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:281
 msgid "Save Current View"
 msgstr "å?²å?ç?®å??æª¢è¦?"
 
@@ -22366,17 +21098,17 @@ 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
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "è?ªé?¸æª¢è¦?"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "å?²å?è?ªé?¸æª¢è¦?"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "å®?ç¾©æª¢è¦?..."
 
@@ -22384,32 +21116,32 @@ msgstr "å®?ç¾©æª¢è¦?..."
 msgid "C_urrent View"
 msgstr "ç?®å??æª¢è¦?(_U)"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "é?¸æ??æª¢è¦?ï¼?%s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "ç?®å??ç??æª¢è¦?æ?¹å¼?æ?¯è?ªé?¸ç??æª¢è¦?"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "å?²å?è?ªé?¸æª¢è¦?..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "å?²å?ç?®å??ç??è?ªé?¸æª¢è¦?"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "å»ºç«?æ??ç·¨è¼¯æª¢è¦?(_C)"
 
-#: ../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:103
 msgid "Define New View"
 msgstr "å®?ç¾©æ?°ç??æª¢è¦?"
 
@@ -22425,64 +21157,166 @@ msgstr "æª¢è¦?ç??é¡?å??"
 msgid "Type of view:"
 msgstr "æª¢è¦?ç??é¡?å??:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "é??å? æª?æ¡?å??"
+#: ../widgets/misc/e-attachment.c:940
+msgid "Attached message"
+msgstr "é??å? ç??é?µä»¶"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2261
+#: ../widgets/misc/e-attachment-store.c:636
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2567
+msgid "A load operation is already in progress"
+msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?ä¸"
+
+#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2575
+msgid "A save operation is already in progress"
+msgstr "å?²å?æ??ä½?å·²å?¨é?²è¡?ä¸"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:1871
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "ä¸?è?½é??å? æª?æ¡? %sï¼? %s"
+msgid "Could not load '%s'"
+msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:1874
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "ä¸?è?½é??å? æª?æ¡? %sï¼?ä¸?æ?¯ä¸?å??å??æ³?ç??æª?æ¡?"
+msgid "Could not load the attachment"
+msgstr "ç?¡æ³?è¼?å?¥é??ä»¶"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2138
+#, c-format
+msgid "Could not open '%s'"
+msgstr "ç?¡æ³?é??å??ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:2141
+#, c-format
+msgid "Could not open the attachment"
+msgstr "ç?¡æ³?é??å??é??ä»¶"
+
+#: ../widgets/misc/e-attachment.c:2583
+msgid "Attachment contents not loaded"
+msgstr "ç?¡æ³?è¼?å?¥é??ä»¶å?§å®¹"
+
+#: ../widgets/misc/e-attachment.c:2660
+#, c-format
+msgid "Could not save '%s'"
+msgstr "ç?¡æ³?å?²å?ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:2663
+#, c-format
+msgid "Could not save the attachment"
+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-handler-image.c:95
+msgid "Could not set as background"
+msgstr "ç?¡æ³?è¨ç?ºè??æ?¯"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "ç?¡æ³?é??å?ºé??ä»¶ã??"
+msgstr[1] "ç?¡æ³?é??å?ºé??ä»¶ã??"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME é¡?å??:"
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "å?³é??è?³(_S)..."
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶"
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr "å?³é??é?¸å??ç??é??ä»¶å?°å?¥è??"
+
+#: ../widgets/misc/e-attachment-icon-view.c:473
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "è¼?å?¥ä¸"
+
+#: ../widgets/misc/e-attachment-icon-view.c:485
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "å?²å?ä¸"
+
+#: ../widgets/misc/e-attachment-paned.c:81
+msgid "Hide _Attachment Bar"
+msgstr "é?±è??é??å? æª?æ¡?å??(_A)"
+
+#: ../widgets/misc/e-attachment-paned.c:83
+#: ../widgets/misc/e-attachment-paned.c:620
+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] "å?²å?é??ä»¶"
+msgstr[1] "å?²å?é??ä»¶"
+
+#: ../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 "å? å?¥é??ä»¶(_A)..."
+
+#: ../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 ä¸é??å??é??å??é??ä»¶"
 
 #. 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 å¹´ %-m æ??"
 
-#: ../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:3641
-#: ../widgets/text/e-text.c:3642
+#: ../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:3648
-#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3656
-#: ../widgets/text/e-text.c:3657
+#: ../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:3663
-#: ../widgets/text/e-text.c:3664
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "å¡«å?¥ç¶²é»?"
 
@@ -22506,26 +21340,25 @@ 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:1004
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../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:1005
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../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
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "ç?¾å?¨"
 
@@ -22534,7 +21367,7 @@ msgstr "ç?¾å?¨"
 msgid "The time must be in the format: %s"
 msgstr "æ??é??å¿?é ?ç?ºæ¤æ ¼å¼?ï¼?%s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å?"
 
@@ -22633,144 +21466,90 @@ msgstr "å?¶å®?..."
 msgid "Ch_aracter Encoding"
 msgstr "å?ç¬¦ç·¨ç¢¼(_A)"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?è¼¸å?¥æ?¥æ??ç??æ??å?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "æ??æ¤æ??é??ä»¥é¡¯ç¤ºè¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "ç?¾å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "ä»?å¤©(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1613
 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
-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 "æ¨?ç±¤å??ä»¶"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "å?¯æ?¼ä¸?è?¬å±?é??å?¨æ¨?ç±¤ä¸é¡¯ç¤ºç??å??ä»¶"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "å±?é??å?¨å¤§å°?"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "å±?é??å?¨ç®è??ç??å¤§å°?"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "æ??ç¤ºå?¨é??è·?"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "å±?é??å?¨ç®é å?¨å??ç??é??è·?"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "å?²å?æ??å°?çµ?æ??"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "æ??å°?(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "æ??å°?"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "å?²å?æ??å°?çµ?æ??(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "ç·¨è¼¯å?²å?ç??æ??å°?çµ?æ??(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "é?²é??æ??å°?(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "æ??æ??ç??å¸³è??"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "ç?®å??ç??å¸³è??"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "ç?®å??ç??è³?æ??å¤¾"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "ç?®å??ç??é?µä»¶"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:166
 msgid "Choose Image"
 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."
@@ -22784,102 +21563,100 @@ msgstr "ä¸?ç·?"
 msgid "The button state is online"
 msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../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
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "ç©ºç?½é?µä»¶"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "å??æµ?æ¨¡å¼?"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 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
+#: ../widgets/misc/e-search-bar.c:339 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:339 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "æ??é??è£?ä»¥æ?¹è®?æ??å°?é¡?å??"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "ç«?å?³æ??å°?(_F)"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "æ¸?é?¤(_C)"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "é ?ç?® ID"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3563
-#: ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 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
+#: ../widgets/misc/e-search-bar.c:1011
 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
+#: ../widgets/misc/e-search-bar.c:1030
 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
+#: ../widgets/misc/e-search-bar.c:1046
 msgid " i_n "
 msgstr " i_n "
 
-#: ../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:519
 msgid "When de_leted:"
 msgstr "å?ªé?¤æ??(_L):"
 
@@ -22903,19 +21680,19 @@ msgstr "<b>ç??æ??è¿½è¹¤</b>"
 msgid "A_uto-delete sent item"
 msgstr "è?ªå??å?ªé?¤é ?ç?®(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "å»ºç«?æ?°ç??å?³é??é ?ç?®è?³è¿½è¹¤è³?è¨?(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "å·²é??é??è??å·²é??å??(_V)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "ä¸?è?¬é?¸é ?(_R)"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -22923,7 +21700,7 @@ msgstr ""
 "ç?¡\n"
 "è®?ä¿¡å??æ¢?"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -22939,15 +21716,15 @@ msgstr ""
 "æ¥µæ©?å¯?\n"
 "å?ªæ??ä½ è?½ç??"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "è¦?æ±?å??è¦?(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "ç??æ??è¿½è¹¤(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -22959,30 +21736,34 @@ msgstr ""
 "æ¨?æº?\n"
 "ä½?"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "ç?¶æ?¥å??æ??(_P):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "ç?¶å®?æ??æ??(_M):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "ç?¶æ??çµ?æ??(_N):"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "æ?¼å?§(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "ä¹?å¾?(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "å?¨é?¨è³?è¨?(_A)"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr "æ¸é¡?(_C):"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23009,43 +21790,27 @@ 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
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. 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
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% å®?æ??)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../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/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "å±¬æ?¼é??äº?å??é¡?ç??é ?ç?®(_C):"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "å?¯ç?¨ç??å??é¡?(_A):"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "å??é¡?"
-
-#: ../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
+#: ../widgets/table/e-cell-date.c:63
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
@@ -23061,23 +21826,23 @@ msgstr "è??ç?¦ç??æ¬?"
 msgid "Unselected Column"
 msgstr "æ?ªé?¸æ??ç??æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "å?ªé?¤ç·?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "åº?ç·?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "ç²?é«?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "è?²å½©æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "è??æ?¯è?²å½©æ¬?"
 
@@ -23101,12 +21866,12 @@ msgstr "æ?ªæ??åº?"
 msgid "No grouping"
 msgstr "æ?ªçµ?æ??ç¾£çµ?"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "é¡¯ç¤ºæ¬?ä½?"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "å?¯ç?¨ç??æ¬?ä½?"
 
@@ -23115,7 +21880,7 @@ 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-header-item.c:1579
 msgid "Ascending"
 msgstr "é??å¢?"
 
@@ -23128,7 +21893,7 @@ 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-header-item.c:1579
 msgid "Descending"
 msgstr "é??æ¸?"
 
@@ -23188,21 +21953,7 @@ msgstr "æ ¹æ??åº?é¡¯ç¤ºé??äº?æ¬?ä½?(_S):"
 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 "DnD ç¢¼"
-
-#: ../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 "å? å?¥ä¸?æ¬?..."
 
@@ -23218,310 +21969,1254 @@ msgstr ""
 "æ?³å?¨ä½ ç??è¡¨æ ¼ä¸å? å?¥æ¬?ä½?ï¼?å?ªè¦?å°?å®?\n"
 "æ??æ?³è?³ä½ å¸?æ??å®?å?ºç?¾ç??ä½?ç½®å?³å?¯ã??"
 
-#: ../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 å??é ?ç?®)"
 msgstr[1] "%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 å??é ?ç?®)"
 msgstr[1] "%s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../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:3028 ../widgets/table/e-table-item.c:3029
+#: ../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:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../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:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../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:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../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:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../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:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../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:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../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:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../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:3056 ../widgets/table/e-table-item.c:3057
+#: ../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:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../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:3021 ../widgets/table/e-table-item.c:3022
+#: ../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:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../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:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../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:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../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:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../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:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../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:1449
 msgid "Customize Current View"
 msgstr "è?ªé?¸ç?®å??ç??æª¢è¦?"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "é??å¢?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "é??æ¸?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "ä¸?æ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "æ ¹æ??æ¤æ¬?ä½?å??ç¾£çµ?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "æ ¹æ??æ?¹å¡?ç?ºç¾£çµ?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "ç§»é?¤æ¤æ¬?(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "å? å?¥ä¸?æ¬?(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "æ??å??(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "æ??é?©å¡«æ»¿(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??æ¬?(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "è?ªé?¸ç?®å??ç??æª¢è¦?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 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:3338 ../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:3345
+#: ../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-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:2733
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "å±?é??å?¨å¤§å°?"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "å±?é??å?¨ç®è??ç??å¤§å°?"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "è¼¸å?¥æ³?"
 
-#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "äº?ä»¶è??ç??å?¨"
 
-#: ../widgets/text/e-text.c:3570 ../widgets/text/e-text.c:3571
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "ç²?é«?"
 
-#: ../widgets/text/e-text.c:3577 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "å?ªé?¤ç·?"
 
-#: ../widgets/text/e-text.c:3584 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "é?¨é»?"
 
-#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "å·¦å?³å°?é½?"
 
-#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "å?ªè¼¯é??åº¦"
 
-#: ../widgets/text/e-text.c:3606 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "å?ªè¼¯é«?åº¦"
 
-#: ../widgets/text/e-text.c:3613 ../widgets/text/e-text.c:3614
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "å?ªè¼¯"
 
-#: ../widgets/text/e-text.c:3620 ../widgets/text/e-text.c:3621
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "å¡«æ»¿å?ªè¼¯æ?¹å¡?"
 
-#: ../widgets/text/e-text.c:3627 ../widgets/text/e-text.c:3628
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X ä½?ç§»"
 
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y ä½?ç§»"
 
-#: ../widgets/text/e-text.c:3670 ../widgets/text/e-text.c:3671
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "æ??å?é??åº¦"
 
-#: ../widgets/text/e-text.c:3677 ../widgets/text/e-text.c:3678
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "æ??å?é«?åº¦"
 
-#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "ä½¿ç?¨ç??ç?¥è??"
 
-#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "æ©¢å??"
 
-#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "æ??è¡?"
 
-#: ../widgets/text/e-text.c:3713 ../widgets/text/e-text.c:3714
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "ä¸æ?·å?ç¬¦"
 
-#: ../widgets/text/e-text.c:3720 ../widgets/text/e-text.c:3721
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "æ??å¤§è¡?æ?¸"
 
-#: ../widgets/text/e-text.c:3742 ../widgets/text/e-text.c:3743
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "ç¹ªè£½æ¡?ç·?"
 
-#: ../widgets/text/e-text.c:3749 ../widgets/text/e-text.c:3750
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "å??è¨±æ?°è¡?"
 
-#: ../widgets/text/e-text.c:3756 ../widgets/text/e-text.c:3757
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "ç¹ªè£½è??æ?¯"
 
-#: ../widgets/text/e-text.c:3763 ../widgets/text/e-text.c:3764
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "ç¹ªè£½æ??é??"
 
-#: ../widgets/text/e-text.c:3770 ../widgets/text/e-text.c:3771
+#: ../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:3778 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "IM å¿«é¡¯è¦?çª?"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
 
-#~ msgid ""
-#~ "We were unable to open this address book.  This either means you have "
-#~ "entered an incorrect URI, or the LDAP server is unreachable."
-#~ msgstr ""
-#~ "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??è¡¨ç¤ºæ?¨è¼¸å?¥é?¯èª¤ç?? URIï¼?æ??ç?¡æ³?é?£ç·? LDAP ä¼ºæ??å?¨ã??"
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "å??æ??é??å? æª?æ¡?å??"
+
+#~ msgid "activate"
+#~ msgstr "ä½¿ä½?ç?¨"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>é¡?å??:</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "æ?°å¢?é??è¨?é??"
+
+#~ msgid "Anonymously"
+#~ msgstr "å?¿å??"
+
+#~ msgid "Basic"
+#~ msgstr "å?ºæ?¬"
+
+#~ msgid "Distinguished name"
+#~ msgstr "å?¯è¾¨è?å??ç¨±"
+
+#~ msgid "Email address"
+#~ msgstr "é?»å?é?µä»¶å?°å??"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?"
+
+#~ msgid "Search filter"
+#~ msgstr "æ??å°?é??æ¿¾å?¨"
+
+#~ msgid "Sub"
+#~ msgstr "å?ç?®é??"
+
+#~ msgid "Using email address"
+#~ msgstr "ä½¿ç?¨é?»å?é?µä»¶ä½?å??"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "æ¯?æ¬¡å?¯è?½ç??æ??å??"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "æ?°å¢?é??è¨?é??(_A)"
+
+#~ 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 "æ?¼å³¶"
+
+#~ 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 "Mayotte"
+#~ 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 "Seychelles"
+#~ 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 Instant Messenger"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo Messenger"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu Messenger"
+
+#~ 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 "Dr."
+#~ msgstr "Dr."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "Jr."
+
+#~ msgid "Miss"
+#~ msgstr "Miss"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Sr."
+#~ msgstr "Sr."
+
+#~ msgid "Add IM Account"
+#~ msgstr "æ?°å¢? IM å¸³è??"
+
+#~ msgid "_Account name:"
+#~ msgstr "å¸³è??å??ç¨±(_A):"
+
+#~ msgid "_IM Service:"
+#~ msgstr "_IM æ??å??:"
+
+#~ 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 "Format"
+#~ msgstr "æ ¼å¼?"
+
+#~ msgid "Header/Footer"
+#~ msgstr "é ?é¦?/é ?å°¾"
+
+#~ msgid "Headings"
+#~ msgstr "æª?é "
+
+#~ msgid "Headings for each letter"
+#~ msgstr "æ¯?å°?ä¿¡ç??æª?é "
+
+#~ msgid "Height:"
+#~ msgstr "é«?åº¦:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "ä¸?å??ç·?æ?¥è??å?¦ä¸?å??"
+
+#~ msgid "Include:"
+#~ msgstr "å??å?«:"
+
+#~ msgid "Landscape"
+#~ msgstr "æ©«å??"
+
+#~ msgid "Left:"
+#~ msgstr "å·¦:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "å?æ¯?æ¨?ç±¤æ?¼æ??é??"
+
+#~ msgid "Margins"
+#~ msgstr "é??ç??"
+
+#~ msgid "Number of columns:"
+#~ msgstr "æ¬?æ?¸:"
+
+#~ msgid "Options"
+#~ msgstr "é?¸é ?"
+
+#~ msgid "Orientation"
+#~ msgstr "ç´?å¼µæ?¹å??"
+
+#~ msgid "Page"
+#~ msgstr "é ?"
+
+#~ msgid "Page Setup:"
+#~ msgstr "é ?é?¢è¨å®?:"
+
+#~ msgid "Paper"
+#~ msgstr "ç´?å¼µ"
+
+#~ msgid "Paper source:"
+#~ msgstr "ç´?å¼µä¾?æº?:"
+
+#~ msgid "Portrait"
+#~ msgstr "ç?´å??"
+
+#~ msgid "Preview:"
+#~ msgstr "é ?è¦½:"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ef03a68..ac934ca 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,13 +6,13 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005.
 # Abel Cheung <abelcheung gmail com>, 2006.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:631
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.25.91\n"
+"Project-Id-Version: evolution 2.27.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 21:48+0800\n"
-"PO-Revision-Date: 2009-02-15 22:16+0800\n"
+"POT-Creation-Date: 2009-07-15 06:18+0800\n"
+"PO-Revision-Date: 2009-07-14 06:37+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -22,21 +22,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "evolution é??è¨?é??"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "æ?°å¢?é?£çµ¡äºº"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "æ?°å¢?é?£çµ¡äººæ¸?å?®"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -59,32 +59,32 @@ msgstr "é?£çµ¡äºº: "
 msgid "evolution minicard"
 msgstr "Evolution è¿·ä½ å??ç??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "å®?å?·æ??é¬§é?´ã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "é??æ?¯ä¸?é ?æ??è°ã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ??è¦?ç?º %sã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ²?æ??æ??è¦?ã??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "è¡?äº?æ??æª¢è¦?äº?ä»¶"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "å¾?å?°ç?¦é»?"
 
@@ -108,8 +108,8 @@ msgstr "ç§»è?³ä»?æ?¥"
 msgid "Go to Date"
 msgstr "ç§»è?³æ?¥æ??"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
 
@@ -153,7 +153,7 @@ msgid "calendar view for one or more days"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??æª¢è¦?"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -164,18 +164,18 @@ msgstr "%Y/%m/%d (%a)"
 #. 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:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1587
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%-m æ?? %-d æ?¥ (%a)"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 
@@ -183,10 +183,10 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 #: ../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:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
@@ -196,15 +196,15 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 #. 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:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1603
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%-m æ?? %-d æ?¥"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Gnome è¡?äº?æ??"
 
@@ -216,11 +216,11 @@ msgstr "æ??å°?å??"
 msgid "evolution calendar search bar"
 msgstr "evolution è¡?äº?æ??æ??å°?å??"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "è·³èº?æ??é??"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "æ??é??è£¡ï¼?æ?¨å?¯ä»¥æ?¾å?°æ?´å¤?äº?ä»¶ã??"
 
@@ -251,50 +251,50 @@ msgstr "å½?å?º"
 msgid "popup a child"
 msgstr "å½?å?ºå?é?¸å?®"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "ç·¨è¼¯"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "é??å§?ç·¨è¼¯æ¤å?²å?æ ¼"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "å??æ??"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "å??æ??å?²å?æ ¼"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 msgid "expand"
 msgstr "å±?é??"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 msgid "expands the row in the ETree containing this cell"
 msgstr "å±?é?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
 msgstr "æ?¶æ?º"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr "æ??ç?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 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
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "è«?æ??é??è£¡å? å?¥"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "å?®æ??"
 
@@ -328,14 +328,6 @@ msgstr "ä½¿ç?¨é ?è¨å?¼"
 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 ""
@@ -384,9 +376,9 @@ msgstr "ç?¡æ³?ç§»é?¤é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:11
 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 å??äººé?£çµ¡äºº"
@@ -410,7 +402,7 @@ msgstr "ç?¡æ³?é©?è? LDAP ä¼ºæ??å?¨ã??"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1743
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤é?£çµ¡äººå¤±æ??"
 
@@ -553,17 +545,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "é ?è¨ç??å??æ¥å?°å??:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "ç?¡æ³?è¼?å?¥é??è¨?é??"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "ç?¡æ³?è®?å?? pilot é??è¨?é??ç¨?å¼?å??å¡?"
 
@@ -584,14 +576,12 @@ msgstr "æ??è?"
 msgid "Configure autocomplete here"
 msgstr "å?¨æ¤è¨å®?è?ªå??å®?æ??"
 
-#. ensure the group name is in current locale, not read from configuration
 #. 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:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "é?£çµ¡äºº"
 
@@ -627,30 +617,26 @@ msgstr "Evolution è³?æ??å¤¾è¨å®?çµ?æ??æ?§å?¶"
 msgid "Manage your S/MIME certificates here"
 msgstr "å?¨æ¤ç®¡ç??æ?¨ç?? S/MIME æ??è?"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "å?¨ LDAP ä¼ºæ??å?¨"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -662,144 +648,188 @@ msgstr "æ??ç??é?»è?¦"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../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/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "å??äºº"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "å?¨ LDAP ä¼ºæ??å?¨"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "é?£çµ¡äºº(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "å»ºç«?æ?°ç??é?£çµ¡äºº"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "é?£çµ¡äººæ¸?å?®(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "å»ºç«?æ?°ç??é?£çµ¡äººæ¸?å?®"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "æ?°é??è¨?é??"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "å»ºç«?æ?°é??è¨?é??"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "å??ç´?é??è¨?é??è¨å®?å?¼æ??è³?æ??å¤¾å¤±æ??ã??"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯"
+"æ?´ SSL)ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯"
+"æ?´ TLS)ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?æ?¨ç??ä¼ºæ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??è¡¨ç¤ºæ?¨ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?æ?¨ç??"
+"å®?å?¨æ??æ¼?æ´?ã?? "
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "å?ºæ?¬"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 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
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"é??æ?¯ LDAP ä¼ºæ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??è©¦é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?"
+"æ´½è©¢æ?¨ç??ç³»çµ±ç®¡ç??å?¡ï¼?ç?è§£æ?¨æ??è©²æ??å®?ç??å? ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è?æ?¨ç??æ?¹æ³?ã??æ³¨æ??è¦?è¨å®?æ¤é ?è?³ã??é?»å?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿"
+"å??å?å??æ?¨ç?? LDAP ä¼ºæ??å?¨ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"æ??å°?ç¯?å??æ??å®?ç¾©æ?¨æ?³å¾?ç¶²è·¯ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??\"sub\" ç??æ??å°?ç¯?å??æ??å??æ?¬æ??"
+"å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??ä¸?å??ã??ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ä¸?è?¬"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../addressbook/gui/component/addressbook-config.c:1021
+#: ../addressbook/gui/widgets/e-addressbook-view.c:553
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "é??è¨?é??"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "ä¼ºæ??å?¨è³?è¨?"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "é©?è?"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "è©³ç´°è³?æ??"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1022
 msgid "Searching"
 msgstr "æ£å?¨æ??å°?"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "ä¸?è¼?ä¸"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "é??è¨?é??å?§å®¹"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "æ£å?¨ç§»è½?..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "æ£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP ä¼ºæ??å?¨"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "è?ªå??å®?æ??è¨å®?"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -810,7 +840,7 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -820,7 +850,7 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -830,7 +860,7 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -841,18 +871,18 @@ msgstr ""
 "ç?¶ Evolution ç§»è½?æ?¨ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç?å??..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "é??æ?°å?½å??ã??%sã??è³?æ??å¤¾ç?ºï¼?"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "é??æ?°å?½å??è³?æ??å¤¾"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«æ??ç·?ã??"
 
@@ -865,19 +895,19 @@ msgid "Save As vCard..."
 msgstr "å?²å?ç?º vCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "é??æ?°å?½å??(_R)..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1608
+#: ../calendar/gui/e-calendar-view.c:1826 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -885,11 +915,10 @@ msgid "_Delete"
 msgstr "å?ªé?¤(_D)"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../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
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "å±¬æ?§(_P)"
 
@@ -902,20 +931,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?æ??è?å¤±æ??ã??\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:414
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "è¼¸å?¥å¯?ç¢¼"
@@ -961,7 +990,7 @@ 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Vertical pane position"
 msgstr "å??ç?´çª?æ ¼ä½?ç½®"
 
@@ -988,21 +1017,19 @@ 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"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 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>"
@@ -1015,144 +1042,73 @@ msgstr "<b>ä¸?è¼?ä¸</b>"
 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 "å?¿å??"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"å?¿å??\n"
+"ä½¿ç?¨é?»å?é?µä»¶ä½?å??\n"
+"ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "ç??è¦½é??å??é??è¨?é??ç?´å?°é??å?¶(_R)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "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
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 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 "ä¸?å±¤"
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+#, fuzzy
+#| msgid "One"
+msgid ""
+"One\n"
+"Sub"
+msgstr "one fourth"
 
-#. 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:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL å? å¯?\n"
+"TLS å? å¯?\n"
+"ä¸?å? å¯?"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Search Filter"
 msgstr "æ??å°?é??æ¿¾å?¨"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 msgstr "æ??å°?èµ·é»?(_B):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 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
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 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\"."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
 "æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?æ²?æ??è¢«ä¿®æ?¹ï¼?é ?è¨ç??æ??å°?ç?®æ¨?æ?¯"
 "ã??personã??ç?©ä»¶é¡?å??ã??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯"
-"æ?´ SSL)ã??"
-
-#: ../addressbook/gui/component/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 ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯"
-"æ?´ TLS)ã??"
-
-#: ../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
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 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
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1161,124 +1117,79 @@ 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 ""
-"æ??å°?ç¯?å??æ??å®?ç¾©æ?¨æ?³å¾?ç¶²è·¯ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??\"sub\" ç??æ??å°?ç¯?å??æ??å??æ?¬æ??"
-"å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??ä¸?å??ã??ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "é??æ?¯æ?¨ç?? LDAP ä¼ºæ??å?¨ç??å®?æ?´å??ç¨±ã??ä¾?å¦?ï¼?ã??ldap.mycompany.comã??ã??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr "é??æ?¯è¦?ä¸?è¼?é ?ç?®ç??æ?¸ç?®ä¸?é??ã??å°?æ¤æ?¸å?è¨å®?æ??å¤ªå¤§æ??æ¸?æ?¢é??è¨?é??ç??é??åº¦ã??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h: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
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
 "é??æ?¯æ¤ä¼ºæ??å?¨ç??å??ç¨±ï¼?æ??é¡¯ç¤ºå?¨æ?¨ç?? Evolution è³?æ??å¤¾æ¸?å?®ä¸ã??å®?å??ç?¨æ?¼é¡¯ç¤ºç?¨é??ã?? "
 
-#: ../addressbook/gui/component/ldap-config.glade.h: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
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "ä¸?è¼?é??å?¶(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 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
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "é?£æ?¥å? (_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 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
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "ä¼ºæ??å?¨(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "æ??é??(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "å??ç??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../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:652
-#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:668
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "å??é??"
 
@@ -1303,27 +1214,25 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>é??é ?</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>å??è¨»</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>å?¶ä»?</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>é?»è©±</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>ç¶²å??</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>å·¥ä½?</b>"
 
-#: ../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"
-
 #: ../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
@@ -1331,16 +1240,16 @@ 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-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../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/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "é?£çµ¡äººç·¨è¼¯å?¨"
 
@@ -1349,1281 +1258,260 @@ msgid "Full _Name..."
 msgstr "å?¨å??(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2478
 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.glade.h:17
 msgid "Mailing Address"
 msgstr "é?µå¯?å?°å??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.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.glade.h:20
-msgid "Novell Groupwise"
-msgstr "Novell GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "å??è¨»"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "å??äººè³?è¨?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 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
-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.glade.h:21
 msgid "_Address:"
 msgstr "å?°å??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "é?±å¹´ç´?å¿µæ?¥(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "å?©ç??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "ç??æ?¥(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:792
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:805
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "è¡?äº?æ??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "ç¸£/å¸?(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "å?¬å?¸(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "å??å®¶/å?°å??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "é?¨é??(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "æ¸æª?ç?º(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "ç©ºé??/å¿?ç¢?(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "é¦?é ?(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 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.glade.h:34
 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.glade.h:35
 msgid "_PO Box:"
 msgstr "é?µç®±(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "è?·æ¥(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 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.glade.h:38
 msgid "_State/Province:"
 msgstr "å·?/ç??(_S):"
 
 # (Abel) è?·ç¨±å??è¼¸å?¥é?£çµ¡äººæ??ç?? Title (Dr., Ms.) æ??è¡?çª?
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "é é??(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "è¦?è¨?äº¤è«?(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "å?¯æ?¥å?? H_TML é?µä»¶"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "ç¶²èª?(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "é??è¨?é??(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 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:85
+#: ../mail/em-mailer-prefs.c:472
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../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-editor/e-contact-editor.c:289
 #: ../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-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../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/widgets/e-minicard-view.c:544
+#: ../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:3685
-#: ../widgets/text/e-text.c:3686
+#: ../widgets/table/e-cell-text.c:1816 ../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 "æ?¼å³¶"
-
-#: ../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 Instant Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+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:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 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 "ä½¿ç?¨è??å??ç¨±"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "å·¥ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "ä½?å®¶"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2287
 msgid "Other"
 msgstr "å?¶ä»?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "ä¾?æº?é??è¨?é??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "ç?®æ¨?é??è¨?é??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "æ?¯æ?°é?£çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "å?¯å¯«ç??æ¬?ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "å¿?è¦?æ¬?ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 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:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, 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:2832
 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:2833
 msgid "_No image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2631,43 +1519,43 @@ msgstr ""
 "é?£çµ¡äººè³?æ??ç?¡æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, 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:3115
 #, 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:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, 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:3154
 msgid "Invalid contact."
 msgstr "ç?¡æ??ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "å¿«é??æ?°å¢?é?£çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "ç·¨è¼¯å?¨é?¨(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "å?¨å??(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "é?»å?é?µä»¶(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "é?¸æ??é??è¨?é??(_S)"
 
@@ -2705,111 +1593,61 @@ msgstr ""
 "æ?¨ç¢ºå®?è¦?å?ªé?¤\n"
 "é??äº?é?£çµ¡äººï¼?"
 
-#: ../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/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "é?µé??å??è??(_Z):"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "å?¨å??"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Miss"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Mr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "å??å?(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "å§?æ°?(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "(_Middle):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "(_Suffix):"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "æ?°å¢? IM å¸³è??"
-
-#: ../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 "_IM æ??å??:"
-
-#: ../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>"
@@ -2820,9 +1658,9 @@ 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:211
+#: ../calendar/gui/e-day-view-time-item.c:810
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "é?¸æ??..."
 
@@ -2848,11 +1686,11 @@ 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-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
+#: ../addressbook/gui/widgets/e-addressbook-view.c:210
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "æ?¸æ?¬"
 
@@ -2896,33 +1734,33 @@ msgstr ""
 "æ?¼æ¤è³?æ??å¤¾ã??æ?¨ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "å??ä½µ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "å??ä½µé?£çµ¡äºº"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "é?»å?é?µä»¶"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Email begins with"
 msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 
@@ -2930,35 +1768,35 @@ msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 msgid "Name contains"
 msgstr "å??ç¨±å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "æ²?æ??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??é?£çµ¡äºº"
 msgstr[1] "%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-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "æ?¥è©¢"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 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:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3549
-#: ../widgets/text/e-text.c:3550
+#: ../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 "æ¨¡å??"
 
@@ -2966,114 +1804,112 @@ msgstr "æ¨¡å??"
 msgid "Error modifying card"
 msgstr "ç·¨è¼¯å??ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
+#: ../addressbook/gui/widgets/e-addressbook-view.c:157
 msgid "Name begins with"
 msgstr "å??ç¨±é??å§?æ?¼"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
 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:565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:811
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1962
 msgid "Save as vCard..."
 msgstr "å?²å?ç?º vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:931
+#: ../calendar/gui/e-calendar-table.c:1586
+#: ../calendar/gui/e-calendar-view.c:1804 ../calendar/gui/e-memo-table.c:927
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "é??å??(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 msgid "_New Contact..."
 msgstr "æ?°å¢?é?£çµ¡äºº(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "New Contact _List..."
 msgstr "æ?°å¢?é?£çµ¡äººæ¸?å?®(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "_Save as vCard..."
 msgstr "å?²å?æ?? _vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Forward Contact"
 msgstr "è½?å¯?é?£çµ¡äºº(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contacts"
 msgstr "è½?å¯?é?£çµ¡äºº(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "Send _Message to Contact"
 msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to List"
 msgstr "å?³é??é?µä»¶çµ¦æ¸?å?®(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contacts"
 msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "_Print"
 msgstr "å??å?°(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Cop_y to Address Book..."
 msgstr "è¤?è£½å?°é??è¨?é??(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Mo_ve to Address Book..."
 msgstr "ç§»è?³é??è¨?é??(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 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:1606
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2056 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2103 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "è¤?è£½(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "P_aste"
 msgstr "è²¼ä¸?(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "å?©ç??"
 
@@ -3103,7 +1939,7 @@ 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/e-cal-component-memo-preview.c:135
 #: ../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
@@ -3111,7 +1947,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:619
 msgid "Company"
 msgstr "å?¬å?¸"
 
@@ -3160,22 +1996,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:623
 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:644
 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:597
 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:657
 msgid "Note"
 msgstr "å??è¨»"
 
@@ -3204,14 +2040,14 @@ msgid "Radio"
 msgstr "ç?¡ç·?é?»é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:577
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "è§?è?²"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "é??å?¶"
 
@@ -3241,55 +2077,53 @@ 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/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../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:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3727 ../widgets/text/e-text.c:3728
+#: ../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:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3735 ../widgets/text/e-text.c:3736
+#: ../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 "æ??å¤§æ¬?ä½?å??ç¨±é?·åº¦"
 
@@ -3297,7 +2131,7 @@ msgstr "æ??å¤§æ¬?ä½?å??ç¨±é?·åº¦"
 msgid "Column Width"
 msgstr "æ¬?å¯¬"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3307,7 +2141,7 @@ msgstr ""
 "\n"
 "æ??å°?é?£çµ¡äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3321,7 +2155,7 @@ msgstr ""
 "\n"
 "é??æ??é??è£¡ä»¥å»ºç«?æ?°ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3335,7 +2169,7 @@ msgstr ""
 "\n"
 "é??æ??é??è£¡ä»¥å»ºç«?æ?°ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3345,7 +2179,7 @@ msgstr ""
 "\n"
 "å°?æ?¾é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3355,41 +2189,41 @@ msgstr ""
 "\n"
 "æ²?æ??é ?ç?®å?¯ä¾?é??ç¨®æª¢è¦?æ?¹å¼?é¡¯ç¤ºã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 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:825
 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
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "å?¨ç??è¦½å?¨å?§é??å??é?£çµ?(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 
@@ -3398,96 +2232,101 @@ msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 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:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 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:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 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:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "æ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "é?¨é??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "è?·æ¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 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
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2545
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/event-editor.c:116
 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:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "é?»è©±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "å?³ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "å?°å??"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "ç¶²èª?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2578
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2539
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2579
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "è?·ç¨±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog"
 
@@ -3542,12 +2381,11 @@ 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:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
@@ -3558,13 +2396,13 @@ msgstr "ç?¡æ³?å??æ¶?"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "é©?è¨¼å¤±æ??"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "è¦?æ±?é©?è?"
 
@@ -3675,7 +2513,7 @@ msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "æ?°å¢?é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
@@ -3692,7 +2530,7 @@ msgid "Error removing list"
 msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "ç§»é?¤é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
@@ -3720,7 +2558,7 @@ msgid "Display _All Contacts"
 msgstr "é¡¯ç¤ºæ??æ??ç??é?£çµ¡äºº(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3729,46 +2567,46 @@ msgstr ""
 "%s å·²ç¶?å?å?¨\n"
 "æ?¨æ?¯å?¦è¦?è¦?å¯«å®?ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "è¦?å¯«"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "å??é?£çµ¡äºº"
 msgstr[1] "å??é?£çµ¡äºº"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "æ¸?å?®"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "å°?é?£çµ¡äººç§»å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "è¤?è£½é?£çµ¡äººå?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "å°?é?£çµ¡äººç§»å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "è¤?è£½é?£çµ¡äººå?°"
 
@@ -3792,329 +2630,128 @@ msgstr "é?£çµ¡äººè³?è¨?"
 msgid "Contact information for %s"
 msgstr "%s ç??é?£çµ¡äººè³?è¨?"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 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] "å??å?¦å¤? 1 å??é?£çµ¡äººã??"
-msgstr[1] "å??å?¦å¤? %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:512
 #: ../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:687 ../shell/shell.error.xml.h:7
 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:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP è³?æ??äº¤æ??æ ¼å¼? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 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 (.vcfã??.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 "é ?è¦½:"
-
-# zh_HK: msgstr "ä½¿ç?¨ç?°é??æ??å?°"
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "ä½¿ç?¨ç?°é??æ??å?°"
-
-# zh_HK: 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 "æ?ªè??ç??ç??é?¯èª¤"
 
@@ -4488,7 +3125,7 @@ msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨æ?¨ç??å·¥ä½?ã??"
 msgid "_Discard Changes"
 msgstr "æ?¾æ£?è®?æ?´(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "å?²å?(_S)"
 
@@ -4510,56 +3147,56 @@ msgstr "å?³é??é??ç?¥(_S)"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "å??å?²å¤?æ?¥äº?ä»¶:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../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/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "ç?¡æ³?å??å?? Evolution è³?æ??ä¼ºæ??å?¨"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "ç?¡æ³?è®?å?? pilot è¡?äº?æ??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å??å¿?é??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "ç?¡æ³?å¯«å?¥ pilot å??å¿?é??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "é ?è¨å?ªå??é ?åº?:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å¾?è¾¦äº?é ?ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å¾?è¾¦äº?é ?ç¨?å¼?å??å¡?"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "è¡?äº?æ??"
 
@@ -4600,24 +3237,24 @@ msgid "Memo_s"
 msgstr "å??å¿?é??(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:288 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1843 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "å??å¿?é??"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:720 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1711 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c: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
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "å·¥ä½?"
@@ -4628,7 +3265,7 @@ msgstr "è¡?äº?æ??(_C)"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "å·¥ä½?(_T)"
 
@@ -4636,27 +3273,26 @@ msgstr "å·¥ä½?(_T)"
 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:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../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:653
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
@@ -4671,10 +3307,10 @@ msgstr "å?¨é?¨è§£é?¤(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../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:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "ä½?ç½®:"
 
@@ -4687,11 +3323,11 @@ msgid "_Dismiss"
 msgstr "è§£é?¤(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4707,32 +3343,32 @@ msgstr "å»¶æ??(_S)"
 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-queue.c:1458
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 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:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1469
 msgid "No description available."
 msgstr "æ²?æ??ä»»ä½?æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No location information available."
 msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, 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
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1710
 #: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1686
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4744,7 +3380,7 @@ msgstr ""
 "é??å?ºé?»å?é?µä»¶ã??  Evolution æ??é¡¯ç¤º\n"
 "æ?®é??ç??æ??é??å°?è©±ç??ä¾?ä»£æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4761,7 +3397,7 @@ msgstr ""
 "\n"
 "æ?¨ç¢ºå®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1730
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
@@ -4834,275 +3470,283 @@ 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 "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:13
 msgid "Default appointment reminder"
 msgstr "é ?è¨ç??ç´?æ??æ??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder units"
 msgstr "é ?è¨æ??é??ç??å?®ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder value"
 msgstr "é ?è¨æ??é??ç??æ?¸å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 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:17
 msgid "Event Gradient"
 msgstr "äº?ä»¶æ¼¸å±¤æ??æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Transparency"
 msgstr "äº?ä»¶é??æ??æ??æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy server URLs"
 msgstr "ç©ºé??/å¿?ç¢?ä¼ºæ??å?¨ç¶²å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy template URL"
 msgstr "ç©ºé??/å¿?ç¢?ç¯?æ?¬ç¶²å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 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:22
 msgid "Hide completed tasks"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task units"
 msgstr "é?±è??å·¥ä½?å?®ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task value"
 msgstr "é?±è??å·¥ä½?æ?¸å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Horizontal pane position"
 msgstr "æ°´å¹³çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 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:27
 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:28
 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:29
 msgid "Last alarm time"
 msgstr "ä¸?æ¬¡é¬§é?´æ??å?»"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 #: ../mail/evolution-mail.schemas.in.h:72
 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:31
 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:32
 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:33
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains ç·?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 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:35
 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:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "å?¨ã??day_second_zonesã??æ¸?å?®ä¸è¦?è¨?ä½?ç??æ??è¿?ä½¿ç?¨æ??å??æ?¸ç?®ç??æ??å¤§å?¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 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:38
 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:39
 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:40
 msgid "Month view horizontal pane position"
 msgstr "æ??æª¢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Month view vertical pane position"
 msgstr "æ??æª¢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 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:43
 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:44
 msgid "Overdue tasks color"
 msgstr "é??æ??ç??å·¥ä½?è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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:46
 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:47
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 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:49
 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:50
 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:51
 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:52
 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:53
 msgid "Save directory for alarm audio"
 msgstr "å?²å?é¬§é?´é?³æ??æª?ç?®é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Scroll Month View by a week"
+msgstr "ä»¥é?±ç?ºå?®ä½?æ?²å??æ??æª¢è¦?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 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:57
 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:58
 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:59
 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:60
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Show the \"Preview\" pane"
 msgstr "é¡¯ç¤ºã??é ?è¦½ã??çª?æ ¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Show the \"Preview\" pane."
 msgstr "é¡¯ç¤ºã??é ?è¦½ã??çª?æ ¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 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:64
 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:65
 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:66
 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:67
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
 "å¦?æ??è¨å®?å??æ??å?¨æ?¥æª¢è¦?ä¸é¡¯ç¤ºç¬¬äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??è¨å®?é?µç??ç?¨æ³?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Tasks due today color"
 msgstr "ä»?å¤©å?°æ??å·¥ä½?ç??è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Tasks vertical pane position"
 msgstr "å·¥ä½?å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5111,7 +3755,7 @@ msgstr ""
 "ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??ç¶²å??ç¯?æ?¬ï¼?%u è¦?ä»¥é?»å?é?µä»¶ä½?å??ç??ä½¿ç?¨è??å??ç¨±é?¨å??ä¾?å??"
 "ä»£ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??ç¨±ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5119,216 +3763,215 @@ msgstr ""
 "ç?¨æ?¼è¡?äº?æ??ä¸æ?¥æ??è??æ??å?»ç??é ?è¨æ??å??ï¼?æ?ªç¿»è¯ç?? Olsen æ??å??è³?æ??åº«ä½?ç½®å°±å?? "
 "\"America/New York\"ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 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:74
 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:75
 msgid "Time divisions"
 msgstr "æ??é??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Time the last alarm ran, in time_t."
 msgstr "ä¸?æ¬¡é¬§é?´å?·è¡?ç??æ??é??(_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:77
 msgid "Timezone"
 msgstr "æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
 "è¡?äº?æ??æª¢è¦?ä¸ç??äº?ä»¶é??æ??å??æ??æ??ï¼?æ?¸å?¼ä»?æ?¼ 0 (å®?å?¨é??æ??)å?° 10 (ä¸?é??æ??)ä¹?é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Twenty four hour time format"
 msgstr "24 å°?æ??å?¶æ ¼å¼?"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "é ?è¨æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 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:82
+msgid "Use system timezone"
+msgstr "ä½¿ç?¨ç³»çµ±æ??å??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Week start"
 msgstr "ä¸?é?±é??å§?æ?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 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:86
 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:87
 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:88
 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:89
 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:90
 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:91
 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:92
 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:93
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "æ?¯å?¦ä»¥é?±ç?ºå?®ä½?æ?²å??æ??æª¢è¦?ï¼?è??é??ä»¥æ??ç?ºå?®ä½?ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 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:95
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 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:97
 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:98
 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:99
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "æ?¯å?¦ä½¿ç?¨ 24 å°?æ??å?¶æ??é??è??ä¸?æ?¯ä½¿ç?¨ä¸?å??/ä¸?å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 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:101
 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:102
 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:103
 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:104
 msgid "Work days"
 msgstr "å·¥ä½?æ?¥"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday end hour"
 msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Workday end minute"
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Workday start hour"
 msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 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
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "ä¸»æ?¨å??å?«"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "å??é¡?ç?º"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "å??è¨»å??å?«"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "ä½?ç½®å??å?«"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "æ?ªä¾? 7 å¤©ç??å·¥ä½?"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "é?²è¡?ä¸ç??å·¥ä½?"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "é??æ??ç??å·¥ä½?"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "å·²å®?æ??ç??å·¥ä½? "
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "æ??é??å? æª?æ¡?ç??å·¥ä½?"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "é?²è¡?ä¸ç??ç´?æ??"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "æ?ªä¾? 7 å¤©ç??ç´?æ??(_P)"
 
 # zh_HK: 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
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "å??å?°"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:312
 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 "
@@ -5336,137 +3979,125 @@ msgid ""
 msgstr ""
 "æ¤ä½?æ¥æ??æ°¸ä¹?æ?§å?ªé?¤æ¯?é?¸å??æ??é??é??è??ç??æ??æ??äº?ä»¶ã??å¦?æ??æ?¨ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?äº?ä»¶ã??"
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:318
 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:654
-#: ../plugins/google-account-setup/google-contacts-source.c:368
+#: ../calendar/gui/calendar-commands.c:323
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:670
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "å¤©"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "å?¨ç¶²ç«?ä¸?"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "å¤©æ°£"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "æ?°å¢?è¡?äº?æ??(_N)"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "è¤?è£½(_C)..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "æ¨?è¨?ç?ºä¾?é?¢ç·?ä½¿ç?¨(_M)"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "ä¸?å??è¨±æ¤é ?å?¨é?¢ç·?ç??æ??ä½¿ç?¨(_D)"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "å??ç´?è¡?äº?æ??å¤±æ??ã??"
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s' ä¾?å»ºç«?äº?ä»¶å??æ??è°"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "æ²?æ??è¡?äº?æ??å?¯ç?¨ä¾?å»ºç«?äº?ä»¶å??æ??è°"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "è¡?äº?æ??ä¾?æº?é?¸æ??å?¨"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "æ?°å¢?ç´?æ??"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "æ?°å¢?æ??è°"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æ??è°(_E)"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "å»ºç«?æ?°æ??è°è¦?æ±?"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "å?¨æ?¥ç´?æ??(_P)"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "å»ºç«?æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "æ?°è¡?äº?æ??"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "å»ºç«?æ?°è¡?äº?æ??"
 
@@ -5508,20 +4139,20 @@ 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 "å??é¡?"
+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:568
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:351 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 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/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
@@ -5541,21 +4172,27 @@ 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:718
+#: ../plugins/save-calendar/csv-format.c:371
+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:567
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:349 ../calendar/gui/e-calendar-table.c:563
 #: ../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:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246
+#: ../calendar/gui/e-cal-model.c:340 ../calendar/gui/e-cal-model.c:347
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
@@ -5565,11 +4202,11 @@ 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:357
 msgid "Summary"
 msgstr "æ??è¦?"
 
@@ -5589,35 +4226,56 @@ 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
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "é??å??è¡?äº?æ??æ??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "é??å??è¡?äº?æ??æ??ä¸?æ?¯æ?´æ?¹æ³?"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "æ²?æ??é??å??è¡?äº?æ??ç??æ¬?é??"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438
+#: ../plugins/mail-to-task/mail-to-task.c:455 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "ç·¨è¼¯é¬§é?´"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "é¡¯ç¤ºæ??ç¤º"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "æ?æ?¾é?³æ??"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "å?·è¡?å¤?é?¨ç¨?å¼?"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "å?³é??é?»å?é?µä»¶"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>é¬§é?´</b>"
@@ -5647,83 +4305,70 @@ 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.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "å?·è¡?å¤?é?¨ç¨?å¼?"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "è«?é?¸å??æª?æ¡?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.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.glade.h:10
 msgid "_Arguments:"
 msgstr "å¼?æ?¸(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "å?·è¡?ç¨?å¼?(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "é??è¤?é¬§é?´(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "è?²é?³(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "ä¹?å¾?"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-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
-msgid "day(s)"
-msgstr "æ?¥"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "ç´?æ??çµ?æ??"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+#| msgid "before"
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"å??æ?¼\n"
+"æ??æ?¼"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "æ??é??é??é??æ¯?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "å°?æ??"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"å??é??\n"
+"å°?æ??\n"
+"æ?¥"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "å??é??"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"å??é??\n"
+"å°?æ??\n"
+"æ?¥"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "ç´?æ??é??å§?"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"ç´?æ??é??å§?\n"
+"ç´?æ??çµ?æ??"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5739,39 +4384,38 @@ msgstr "å? å?¥(_A)"
 msgid "Alarms"
 msgstr "é¬§é?´"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "é??å? æª?æ¡?"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:135
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/event-page.c:2959
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:783
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:706 ../mail/em-account-editor.c:1435
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../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
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:647
 msgid "Selected Calendars for Alarms"
 msgstr "é?¸æ??é¬§é?´è¡?äº?æ??"
 
@@ -5800,36 +4444,36 @@ msgid ""
 msgstr "<i>%u è?? %d æ??è¢«æ?¿æ??ç?ºé?»å?é?µä»¶ä½?å??ä¸ç??ä½¿ç?¨è??è??ç¶²å??å??ç¨±ã??</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">é¬§é?´</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">è¦å??</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">é ?è¨ç©ºé??/å¿?ç¢?ä¼ºæ??å?¨</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">ä¸?è?¬</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">å·¥ä½?æ¸?å?®</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">æ??é??</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">å·¥ä½?é?±</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "èª¿æ?´æ?¥å??ç¯?ç´?æ??é??(_V)"
-
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
@@ -5838,13 +4482,17 @@ msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
 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.glade.h:19
+msgid "Display alarms in _notification area only"
+msgstr "å?ªå?¨é??ç?¥å??å??ä¸é¡¯ç¤ºé¬§é?´(_N)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.c:1107
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5854,13 +4502,13 @@ msgstr ""
 "å°?æ??\n"
 "æ?¥"
 
-#: ../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.glade.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5878,215 +4526,231 @@ msgstr ""
 "æ??æ??å?\n"
 "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "æ??é?¸é¡?è?²"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 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.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "æ??æ??å?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Sc_roll Month View by a week"
+msgstr "ä»¥é?±æ?²å??æ??æª¢è¦?(_R)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Se_cond zone:"
 msgstr "ç¬¬äº?æ??å??(_C):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Select the calendars for alarm notification"
 msgstr "é?¸æ??é¬§é?´é??ç?¥ç??è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Sh_ow a reminder"
 msgstr "é¡¯ç¤ºæ??é??æ?¼ç´?æ??(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show a _reminder"
 msgstr "é¡¯ç¤ºæ??é??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week _numbers in date navigator"
 msgstr "å?¨æ?¥æ??å°?è¦½é¡¯ç¤ºé?±æ?¸(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 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.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "T_asks due today:"
 msgstr "ä»?å¤©å?°æ??ç??å·¥ä½?(_A):"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "T_hu"
 msgstr "é?±å??(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 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.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "æ??å??(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 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.glade.h:56
+#: ../calendar/gui/dialogs/recurrence-page.c:1104
+#: ../calendar/gui/e-itip-control.c:728
 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.glade.h:57
+msgid "Use s_ystem time zone"
+msgstr "ä½¿ç?¨ç³»çµ±æ??å??(_Y)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/recurrence-page.c:1105
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "Wee_k starts on:"
 msgstr "ä¸?é?±é??å§?æ?¼(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work days:"
 msgstr "å·¥ä½?æ?¥:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_12 hour (AM/PM)"
 msgstr "_12 å°?æ?? (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_24 hour"
 msgstr "_24 å°?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Ask for confirmation when deleting items"
 msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??ç¢ºèª?(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Compress weekends in month view"
 msgstr "å?¨æ??æª¢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Day begins:"
 msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Fri"
 msgstr "é?±äº?(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Hide completed tasks after"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Mon"
 msgstr "é?±ä¸?(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Overdue tasks:"
 msgstr "é??æ??ç??å·¥ä½?(_O):"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "_Sat"
 msgstr "é?±å?(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 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.glade.h:76
 msgid "_Time divisions:"
 msgstr "æ??é??é??é??(_T):"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
 msgid "_Tue"
 msgstr "é?±äº?(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
 msgid "_Wed"
 msgstr "é?±ä¸?(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
 msgid "before every anniversary/birthday"
 msgstr "å?¨æ¯?å??é?±å¹´ç´?å¿µæ?¥/ç??æ?¥ä¹?å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
 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: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
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 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 "iCalendar é?¯èª¤"
 
-#: ../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 "æ?°å¢?å??å¿?é??æ¸?å?®"
 
@@ -6139,297 +4803,233 @@ msgstr "%s  æ?¨æ²?æ??å??ä»»ä½?è®?æ?´ï¼?æ?´æ?°é??å??ç·¨è¼¯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "ç¢ºèª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " å?° "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr "(æ??é??)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "æ??é?? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "é??å? è¨?æ?¯ - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:221
+msgid "Could not save attachments"
+msgstr "ç?¡æ³?å?²å?é??ä»¶"
 
-#. 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:1770
-#: ../composer/e-msg-composer.c:1989
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "é??å?  1 å??è¨?æ?¯"
-msgstr[1] "é??å?  %d å??è¨?æ?¯"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2057
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "ç§»å??(_M)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "å??æ¶?æ??æ??(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "é??ä»¶"
-
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:483
 msgid "Could not update object"
 msgstr "ç?¡æ³?æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:572
 msgid "Edit Appointment"
 msgstr "ç·¨è¼¯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:579
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:581
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:587
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Task - %s"
 msgstr "å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:594
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:610
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:958
 msgid "Click here to close the current window"
 msgstr "æ??é??è£¡ä»¥é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:965
 msgid "Copy selected text to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??æ??å?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "Cut selected text to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??æ??å?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:979
 msgid "Click here to view help available"
 msgstr "æ??é??è£¡ä»¥æª¢è¦?å?¯ç?¨ç??èªªæ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:986
 msgid "Paste text from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1007
 msgid "Click here to save the current window"
 msgstr "æ??é??è£¡ä»¥å?²å?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1014
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1021
 msgid "_Classification"
-msgstr "å??é¡?(_C)"
+msgstr "æ¸é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1035
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "æª?æ¡?(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1042
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1049
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1056
 msgid "_Options"
 msgstr "é?¸é ?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1063 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "é??ä»¶(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1075
 msgid "Click here to attach a file"
 msgstr "æ??é??è£¡ä»¥é??å? æª?æ¡?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1102
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1104
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "_Private"
 msgstr "ç§?äºº(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "Classify as private"
 msgstr "æ¸é¡?ç?ºç§?äºº"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1116
 msgid "_Confidential"
 msgstr "æ©?å¯?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1118
 msgid "Classify as confidential"
 msgstr "æ¸é¡?ç?ºæ©?å¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "R_ole Field"
 msgstr "è§?è?²æ¬?ä½?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1142
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../composer/e-composer-private.c:66
 msgid "Recent _Documents"
 msgstr "æ??è¿?ä½¿ç?¨æ??ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1602
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "é??å? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> å??é??å? æª?æ¡?"
-msgstr[1] "<b>%d</b> å??é??å? æª?æ¡?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "é?±è??é??å? æª?æ¡?å??(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "é¡¯ç¤ºé??å? æª?æ¡?å??(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../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:2094
-#: ../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:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "é¡¯ç¤ºé??å? æª?æ¡?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "æ??ä¸?ç©ºç?½é?µå??æ??é??å? æª?æ¡?å??"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3348
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1913
+#: ../calendar/gui/dialogs/comp-editor.c:2760
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ??æ?°ç??æ?´æ?°ï¼?å??æ??æ?¾æ£?å°?æ¤é ?ç?®æ??å??ç??è®?æ?´"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3377
+#: ../calendar/gui/dialogs/comp-editor.c:2729 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "é??ä»¶"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2789
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?ä½¿ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
@@ -6502,7 +5102,7 @@ msgid "Contacts..."
 msgstr "é?£çµ¡äºº..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "å§?è¨?çµ¦ï¼?"
 
@@ -6529,7 +5129,7 @@ msgstr "å°?æ¤é ?è¨ç?ºå¾ªç?°äº?ä»¶"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../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
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "å?³é??é?¸é ?"
 
@@ -6566,122 +5166,127 @@ msgstr "æ?¥è©¢æ¤å?°æ??è??ç??ç©ºé??/å¿?ç¢?è³?è¨?"
 msgid "Appoint_ment"
 msgstr "ç´?æ??(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:749
+#: ../calendar/gui/dialogs/event-page.c:2735
 msgid "This event has alarms"
 msgstr "é??å??äº?ä»¶å?·æ??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:799
+#: ../calendar/gui/dialogs/event-page.c:812
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "æ??è°å?¬é??äºº(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:859
 msgid "_Delegatees"
 msgstr "ä»£ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:861
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1046
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1049
 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:1218
+#: ../calendar/gui/dialogs/memo-page.c:639
+#: ../calendar/gui/dialogs/task-page.c:814
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1228
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1251
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1258
 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:1420
+#: ../calendar/gui/dialogs/memo-page.c:680
+#: ../calendar/gui/dialogs/task-page.c:874
 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:1426
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:880
 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:1451
+#: ../calendar/gui/dialogs/task-page.c:904
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1890
+#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "ç§»é?¤(_R)"
+
+#: ../calendar/gui/dialogs/event-page.c:1891
+#: ../calendar/gui/dialogs/task-page.c:1201
 msgid "_Add "
 msgstr "æ?°å¢?(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2611
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:2655
+#: ../calendar/gui/dialogs/memo-page.c:895
 #: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æ?¨æ£æ??ä»» %s ç??ä»£ç??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2933
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 msgstr[1] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ç´?æ??å?? %d å°?æ??"
 msgstr[1] "ç´?æ??å?? %d å°?æ??"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ç´?æ??å?? %d å??é??"
 msgstr[1] "ç´?æ??å?? %d å??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2958
 msgid "Customize"
 msgstr "è?ªè¨?"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "ç´?æ??å?? 1 å¤©"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "ç´?æ??å?? 1 å°?æ??"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "ç´?æ??å?? 15 å??é??"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"ç´?æ??å?? 15 å??é??\n"
+"ç´?æ??å?? 1 å°?æ??\n"
+"ç´?æ??å?? 1 å¤©"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
@@ -6708,58 +5313,54 @@ 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
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
+#: ../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):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
-# (Abel) é??æ??ä¸?è??è¦?ç?¨ï¼?å°±æ?¯å? ç´?æ??ç?? main dialog:
-# æ??é??(T):  [æ?¥æ??] [æ??é??] [for] [1]æ?? [0]å??é??
-#. 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
-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
-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/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "æ??è°å?¬é??äºº:"
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"æ?¼\n"
+"ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:856
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
+#: ../calendar/gui/dialogs/memo-page.c:1011 ../mail/em-format-html.c:1565
+#: ../mail/em-format-html.c:1623 ../mail/em-format-html.c:1648
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "æ?¶ä»¶è??"
@@ -6799,37 +5400,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:559
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?ç·¨è¼¯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:888
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "End time of the recurrence was before event's start"
 msgstr "é?±æ??æ?§äº?ä»¶ç??çµ?æ??æ??å?»æ?©æ?¼é??å§?æ??å?»"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:957
 msgid "on"
 msgstr "ç??"
 
@@ -6837,7 +5438,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:1014
 msgid "first"
 msgstr "ä¸?"
 
@@ -6846,7 +5447,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:1020
 msgid "second"
 msgstr "äº?"
 
@@ -6854,7 +5455,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:1025
 msgid "third"
 msgstr "ä¸?"
 
@@ -6862,7 +5463,7 @@ msgstr "ä¸?"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1030
 msgid "fourth"
 msgstr "å??"
 
@@ -6870,13 +5471,13 @@ msgstr "å??"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 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:1059
 msgid "Other Date"
 msgstr "å?¶å®?æ?¥æ??"
 
@@ -6884,7 +5485,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:1065
 msgid "1st to 10th"
 msgstr "1æ?¥è?³10æ?¥"
 
@@ -6892,7 +5493,7 @@ msgstr "1æ?¥è?³10æ?¥"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "11th to 20th"
 msgstr "11æ?¥è?³20æ?¥"
 
@@ -6900,45 +5501,45 @@ msgstr "11æ?¥è?³20æ?¥"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "21st to 31st"
 msgstr "21æ?¥è?³31æ?¥"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 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:1231
 msgid "on the"
 msgstr "å?¨ç¬¬"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1401
 msgid "occurrences"
 msgstr "æ¬¡"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2096
 msgid "Add exception"
 msgstr "å? å?¥ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2137
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?ç·¨è¼¯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2143
 msgid "Modify exception"
 msgstr "ç·¨è¼¯ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2187
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2311
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
@@ -6955,50 +5556,52 @@ msgstr "<b>é ?è¦½</b>"
 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
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 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
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 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
-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
-msgid "month(s)"
-msgstr "æ??"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"å¤©\n"
+"é?±\n"
+"æ??\n"
+"å¹´"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "é?±"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "å¹´"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"æ?¼\n"
+"ç?´å?°\n"
+"æ°¸é? "
 
 #: ../calendar/gui/dialogs/send-comp.c:116
 msgid "Send my alarms with this event"
 msgstr "å°?æ??ç??é¬§é?´è??é??å??äº?ä»¶ä¸?èµ·é??å?º"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "ç¶²é ?"
 
@@ -7010,74 +5613,38 @@ msgstr "<span weight=\"bold\">é??é ?</span>"
 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:663 ../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:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-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:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-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:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "é?²è¡?ä¸"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"é«?\n"
+"ä¸\n"
+"ä½?\n"
+"æ?ªå®?ç¾©"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-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:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-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:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "æ?ªé??å§?"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"å°?æ?ªé??å§?\n"
+"é?²è¡?ä¸\n"
+"å·²å®?æ??\n"
+"å·²å??æ¶?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "å®?æ??ç?¾å??æ¯?(_E):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "ç??æ??(_U):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "æ?ªæ??å®?"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "å®?æ??æ?¥æ??(_D):"
@@ -7100,7 +5667,7 @@ 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
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
@@ -7117,7 +5684,7 @@ msgstr "å·¥ä½?è©³ç´°è³?æ??"
 msgid "Organi_zer:"
 msgstr "æ??è°å?¬é??äºº(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:787
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
@@ -7218,80 +5785,161 @@ msgstr "%s å?¨ %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:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+msgid "I_mport"
+msgstr "å?¯å?¥(_M)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+msgid "Select a Calendar"
+msgstr "é?¸æ??è¡?äº?æ??"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+msgid "Select a Task List"
+msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+msgid "I_mport to Calendar"
+msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr "å?¯å?¥è?³å·¥ä½?(_M)"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 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
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "é??å§?æ?¥æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../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
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "æ??è¿°:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "ç¶²é ?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "æ??è¦?:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 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:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "ç??æ??:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "é?²è¡?ä¸"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "å·²å®?æ??"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:657 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "æ?ªé??å§?"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "å?ªå??ç?ç´?:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:584 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "é«?"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1057 ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "ä¸?è?¬"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "ä½?"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+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:640
+#: ../calendar/gui/e-calendar-table.c:636
 msgid "Free"
 msgstr "ç©ºé??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7301,225 +5949,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1063
 #: ../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-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../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-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1063
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 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-cal-model.c:353 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c: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:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../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:1059
 msgid "Recurring"
 msgstr "å¾ªç?°æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1061
 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:2217
-msgid "Select folder to save selected attachments..."
-msgstr "é?¸æ??ç?¨ä¾?å?²å?é?¸å®?ç??é??å? æª?æ¡?ç??è³?æ??å¤¾..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../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 å?§é??å??..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:334
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2399
+#: ../calendar/gui/e-calendar-table.c:370
+#: ../calendar/gui/e-calendar-view.c:2427
 #, 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:375
-#: ../calendar/gui/e-calendar-view.c:2403
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2431
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è°å?¬é??äºº: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "Start: "
 msgstr "é??å§?:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "æ?ªæ??å®?"
+
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:892
+#: ../calendar/gui/e-calendar-view.c:657 ../calendar/gui/e-memo-table.c:444
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-view.c:871 ../calendar/gui/e-memo-table.c:649
 msgid "Updating objects"
 msgstr "æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1359
+#: ../calendar/gui/e-calendar-view.c:1331 ../calendar/gui/e-memo-table.c:823
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "å?¦å?æ?°æª?..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New _Task"
 msgstr "æ?°å¢?å·¥ä½?(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:928
 msgid "Open _Web Page"
 msgstr "é??å??ç¶²é ?(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1805 ../calendar/gui/e-memo-table.c:929
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "å?¦å?æ?°æª?(_S)..."
+
+#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1790 ../calendar/gui/e-memo-table.c:930
 msgid "P_rint..."
 msgstr "å??å?°(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1810 ../calendar/gui/e-memo-table.c:934
 #: ../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:1607
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:936
 #: ../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:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1599 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "æ??æ´¾å·¥ä½?(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1600 ../calendar/gui/e-memo-table.c:940
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "ä»¥ iCale_ndar è½?å¯?"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1601
 msgid "_Mark as Complete"
 msgstr "æ¨?ç¤ºç?ºå®?æ??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark Selected Tasks as Complete"
 msgstr "æ¨?ç¤ºé?¸å®?ç??å·¥ä½?ç?ºå·²å®?æ??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Incomplete"
 msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "æ¨?ç¤ºé?¸å®?ç??å·¥ä½?ç?ºæ?ªå®?æ??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Delete Selected Tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1844
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "è«?æ??é??è£¡å¢?å? æ?°ç??å·¥ä½?"
@@ -7537,167 +6160,167 @@ 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:368
 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:602
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "ç??æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1444
+#: ../calendar/gui/e-calendar-view.c:1476
 msgid "Moving items"
 msgstr "ç§»å??é ?ç?®"
 
-#: ../calendar/gui/e-calendar-view.c:1446
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Copying items"
 msgstr "è¤?è£½é ?ç?®"
 
-#: ../calendar/gui/e-calendar-view.c:1755
+#: ../calendar/gui/e-calendar-view.c:1784
 msgid "New _Appointment..."
 msgstr "æ?°å¢?ç´?æ??(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1756
+#: ../calendar/gui/e-calendar-view.c:1785
 msgid "New All Day _Event"
 msgstr "æ?°å¢?å?¨å¤©äº?ä»¶(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1757
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Meeting"
 msgstr "æ?°å¢?æ??è°(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
+#: ../calendar/gui/e-calendar-view.c:1797
 msgid "_Current View"
 msgstr "ç?®å??æª¢è¦?(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1770
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "Select T_oday"
 msgstr "é?¸æ??ä»?å¤©(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "_Select Date..."
 msgstr "é?¸æ??æ?¥æ??(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1777
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Pri_nt..."
 msgstr "å??å?°(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1816
 msgid "Cop_y to Calendar..."
 msgstr "è¤?è£½è?³è¡?äº?æ??(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1817
 msgid "Mo_ve to Calendar..."
 msgstr "ç§»è?³è¡?äº?æ??(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "_Delegate Meeting..."
 msgstr "å§?æ´¾æ??è°(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "_Schedule Meeting..."
 msgstr "æ??è°æ??ç¨?(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Forward as iCalendar..."
 msgstr "ä»¥ iCale_ndar è½?å¯?..."
 
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Reply"
 msgstr "å??è¦?(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1822
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??äºº(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1798
+#: ../calendar/gui/e-calendar-view.c:1827
 msgid "Make this Occurrence _Movable"
 msgstr "å°?é??å??äº?ä»¶æ¨?ç¤ºæ??å?¯ç§»å??(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1828 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "å?ªé?¤é??å??äº?ä»¶(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Delete _All Occurrences"
 msgstr "å?ªé?¤å?¨é?¨äº?ä»¶(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:2254
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2282
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../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-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:2255
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../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-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2284
 #: ../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-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "æ?«è¨?"
 
-#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-calendar-view.c:2285
 #: ../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-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
 
-#: ../calendar/gui/e-calendar-view.c:2258
+#: ../calendar/gui/e-calendar-view.c:2286
 msgid "Needs action"
 msgstr "é??è¦?å??ä½?"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2447 ../calendar/gui/print.c:2501
 #, 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:2478
 #, 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:105
 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:108
 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:116
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7710,12 +6333,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:745
 #, 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:766
 msgid "Show the second time zone"
 msgstr "é¡¯ç¤ºç¬¬äº?æ??å??"
 
@@ -7725,48 +6348,48 @@ 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:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1570
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. 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:799 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 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:802 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 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:2320
+#: ../calendar/gui/e-day-view.c:2301
 #, c-format
 msgid "Week %d"
 msgstr "ç¬¬ %d é?±"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "æ?¯ã??(è¤?é??å¾ªç?°)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "æ¯?å¤©"
 msgstr[1] "æ¯? %d å¤©"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "æ¯?é?±"
 msgstr[1] "æ¯? %d é?±"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7774,35 +6397,35 @@ msgstr[0] "æ¯?é?±æ?¼"
 msgstr[1] "æ¯? %d é?±æ?¼"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " å?? "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s æ?¥æ?¼ "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s æ?¥æ?¼ "
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "æ¯?æ??"
 msgstr[1] "æ¯? %d æ??"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "æ¯?å¹´"
 msgstr[1] "æ¯? %d å¹´"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7810,36 +6433,36 @@ msgstr[0] "ç¸½å?± %d æ¬¡"
 msgstr[1] "ç¸½å?± %d æ¬¡"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr "ï¼?çµ?æ??æ?¼ "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "é??å§?"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "æ?ªæ¢"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar è³?è¨?"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 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
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7850,284 +6473,284 @@ msgid "An unknown person"
 msgstr "ä¸?æ??äººå£«"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 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:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "æ??è°å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨æ?¨ç??è¡?äº?æ??ä¸æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1276
 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:1353
 #, 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:1354
 msgid "Meeting Information"
 msgstr "æ??è°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, 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:1362
 #, 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:1363
 msgid "Meeting Proposal"
 msgstr "æ??è°æ??æ¡?"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, 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:1370
 msgid "Meeting Update"
 msgstr "æ??è°æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, 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:1375
 msgid "Meeting Update Request"
 msgstr "æ??è°æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, 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:1383
 msgid "Meeting Reply"
 msgstr "æ??è°ç?è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, 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:1391
 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:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, 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:1402
 msgid "Bad Meeting Message"
 msgstr "ä¸?æ£ç¢ºç??æ??è°è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, 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:1430
 msgid "Task Information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, 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:1439
 #, 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:1440
 msgid "Task Proposal"
 msgstr "å·¥ä½?è¨?å??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, 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:1447
 msgid "Task Update"
 msgstr "å·¥ä½?æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, 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:1452
 msgid "Task Update Request"
 msgstr "å·¥ä½?æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, 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:1460
 msgid "Task Reply"
 msgstr "å·¥ä½?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, 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:1468
 msgid "Task Cancelation"
 msgstr "å·¥ä½?å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "ä¸?æ£ç¢ºç??å·¥ä½?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, 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:1504
 msgid "Free/Busy Information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, 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:1509
 msgid "Free/Busy Request"
 msgstr "ç©ºé??/å¿?ç¢?è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, 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:1514
 msgid "Free/Busy Reply"
 msgstr "ç©ºé??/å¿?ç¢?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "ä¸?æ£ç¢ºç??ç©ºé??/å¿?ç¢?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??è¢«é?©ç?¶å?°çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "é??ä»¶ä¸¦æ?ªå??å?«å??æ³?ç??è¡?äº?æ??è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "é??ä»¶æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "æ?´æ?°å®?æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 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:2036
 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:2060
 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:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 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:2098 ../calendar/gui/e-itip-control.c:2155
 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:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "ç?¡æ³?å?³é??é??å??é ?ç?®ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 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:590
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "æ??çµ?"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "æ?´æ?°å??æ??ç??æ??"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 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:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "å??æ¶?"
 
@@ -8151,6 +6774,10 @@ msgstr "è¼?å?¥è¡?äº?æ??"
 msgid "Loading calendar..."
 msgstr "è¼?å?¥è¡?äº?æ??..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "æ??è°å?¬é??äºº:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "ä¼ºæ??å?¨è¨?æ?¯:"
@@ -8176,72 +6803,72 @@ 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-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 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-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.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-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 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-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 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-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 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-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 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-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 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-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 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-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "é??è¦?å??ä½?"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 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:2083
 msgid "%A, %B %d, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
@@ -8249,78 +6876,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:2114
 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:392
 msgid "Out of Office"
 msgstr "ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "å?°æ??è??(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "é?¸é ?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "é¡¯ç¤ºç¸®å°?(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "æ??æ??äººå?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "æ??æ??äººå?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "å¿?è¦?ç??äººå?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?äººå?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -8348,15 +6975,15 @@ msgstr "èª?è¨?"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:945
 msgid "_Delete Selected Memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1094 ../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-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8365,165 +6992,145 @@ msgstr ""
 "ç?¼ç??æ?¼ %s ç??é?¯èª¤ï¼?\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "æ£å?¨å?ªé?¤é?¸å®?ç??ç?©ä»¶..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "æ£å?¨å®?æ??å·¥ä½?..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "é?¤å?»ä¸"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 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:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2637
+#: ../calendar/gui/gnome-cal.c:2670
 msgid "_Custom View"
 msgstr "è?ªè¨?æª¢è¦?(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2638
+#: ../calendar/gui/gnome-cal.c:2671
 msgid "_Save Custom View"
 msgstr "å?²å?è?ªè¨?æª¢è¦?(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2643
+#: ../calendar/gui/gnome-cal.c:2676
 msgid "_Define Views..."
 msgstr "å®?ç¾©æª¢è¦?(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2880
+#: ../calendar/gui/gnome-cal.c:2913
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "è¼?å?¥ %s ç??ç´?æ??"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#: ../calendar/gui/gnome-cal.c:2928
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "è¼?å?¥ %s ç??å·¥ä½?"
 
-#: ../calendar/gui/gnome-cal.c:2904
+#: ../calendar/gui/gnome-cal.c:2937
 #, c-format
 msgid "Loading memos at %s"
 msgstr "æ£å?¨è¼?å?¥ %s ç??å??å¿?é??"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#: ../calendar/gui/gnome-cal.c:3049
 #, c-format
 msgid "Opening %s"
 msgstr "æ£å?¨é??å?? %s"
 
-#: ../calendar/gui/gnome-cal.c:3984
+#: ../calendar/gui/gnome-cal.c:4009
 msgid "Purging"
 msgstr "æ¸?é?¤"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "å??æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "å?«æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "å??äº?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "äº?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "ä¸?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "ä¸?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "å?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "ä¸?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "äº?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "å??ä¸?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "å??æ??"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"ä¸?æ??\n"
+"äº?æ??\n"
+"ä¸?æ??\n"
+"å??æ??\n"
+"äº?æ??\n"
+"å?æ??\n"
+"ä¸?æ??\n"
+"å?«æ??\n"
+"ä¹?æ??\n"
+"å??æ??\n"
+"å??ä¸?æ??\n"
+"å??äº?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "é?¸æ??æ?¥æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "ä¹?æ??"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "é?¸æ??ä»?å¤©(_S)"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:548
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??äººã??"
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:776
 msgid "Event information"
 msgstr "äº?ä»¶è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:779
 msgid "Task information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:782
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:800
 msgid "Free/Busy information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:638
 msgid "Calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
@@ -8531,7 +7138,7 @@ msgstr "è¡?äº?æ??è³?è¨?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:672
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "å·²æ?¥å??"
@@ -8540,7 +7147,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:681
+#: ../calendar/gui/itip-utils.c:679
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
@@ -8552,7 +7159,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:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:686 ../calendar/gui/itip-utils.c:734
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -8561,7 +7168,7 @@ msgstr "å·²æ??çµ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:693
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
@@ -8569,7 +7176,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:708
+#: ../calendar/gui/itip-utils.c:706
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "å·²æ?´æ?°"
@@ -8577,7 +7184,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:715
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -8585,7 +7192,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:722
+#: ../calendar/gui/itip-utils.c:720
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "é??æ?°æ?´ç??"
@@ -8593,100 +7200,100 @@ 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:729
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??ç¥¨è¡¨å?³"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:797
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨? (%s å?° %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:805
 msgid "iCalendar information"
 msgstr "iCalendar è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:976
 msgid "You must be an attendee of the event."
 msgstr "æ?¨å¿?é ?æ?¯æ¤äº?ä»¶ç??å?°æ??è??ã??"
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d é ?å??å¿?é??"
 msgstr[1] "%d é ?å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "ï¼?å·²é?¸æ?? %d å??"
 msgstr[1] "ï¼?å·²é?¸æ?? %d å??"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "å??ç´?å??å¿?é??å¤±æ??ã??"
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ç?¡æ³?é??å??å??å¿?é??æ¸?å?®ã??%sã??ä¾?å»ºç«?äº?ä»¶å??æ??è°"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "æ²?æ??å?¯ç?¨ç??è¡?äº?æ??ä¾?å»ºç«?å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "å??å¿?é??ä¾?æº?é?¸æ??å?¨"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "æ?°å¢?å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "å??å¿?é??(_O)"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "å»ºç«?æ?°ç??å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "æ?°å¢?å?±ç?¨å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "å?±ç?¨å??å¿?é??(_S)"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "å»ºç«?æ?°ç??å?±ç?¨å??å¿?é??"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "æ?°å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
 
 # zh_HK: msgstr "æ??å?°å??å¿?é??"
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "æ??å?°å??å¿?é??"
 
@@ -8713,297 +7320,289 @@ msgstr ""
 "ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "ç?¡æ³?å¾? evolution/config.xmldb ç§»è½?è??è¨å®?"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "ç?¡æ³?ç§»è½?ç§»è¡?äº?æ?? `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, 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/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 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:593
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "å?"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "ç¶²å??: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "é?£çµ¡äºº: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "æ?°å¢?å·¥ä½?æ¸?å?®(_N)"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d é ?å·¥ä½?"
 msgstr[1] "%d é ?å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "å??ç´?å·¥ä½?å¤±æ??ã??"
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "ç?¡æ³?é??å??å·¥ä½?æ¸?å?® '%s' ä¾?å»ºç«?äº?ä»¶å??æ??è°"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "æ²?æ??å?¯ç?¨ç??è¡?äº?æ??ä¾?å»ºç«?å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "å·¥ä½?ä¾?æº?é?¸æ??å?¨"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "æ?°å¢?å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "å·¥ä½?(_T)"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "å»ºç«?æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "æ?°å·¥ä½?æ¸?å?®"
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "å·¥ä½?æ¸?å?®(_K)"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9015,11 +7614,11 @@ msgstr ""
 "\n"
 "ç¢ºå®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯ã??"
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "å??å?°å·¥ä½?"
 
@@ -9036,11 +7635,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 "å°?æ?¼"
 
@@ -9048,37 +7647,37 @@ msgstr "å°?æ?¼"
 msgid "Appointments and Meetings"
 msgstr "ç´?æ??å??æ??è°"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 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 è¼¸å?¥å?¨"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "è¡?äº?æ??äº?ä»¶"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution è¡?äº?æ??æ?ºæ?§è¼¸å?¥å?¨"
 
@@ -10639,248 +9238,233 @@ msgstr "ç?¡æ³?é??å??è?ªå??å?²å?æª?æ¡?"
 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:84
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "é??é??ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 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
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "é ?è¦½å??å?°(_V)"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "å?²å?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "å?¦å?æ?°æª?(_A)..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "ä»¥å?¦ä¸?å??å??ç¨±å?²å?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "å?²å?ç?ºè??ç¨¿(_D)"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "å?²å?ç?ºè??ç¨¿"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:186
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "å?³é??é??å??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "æ??å?¥å?³é??é?¸é ?"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "æ?°å¯«æ?°é?µä»¶(_M)"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "å?å??ç·¨ç¢¼(_E)"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "å®?å?¨æ?§(_S)"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PG_P å? å¯?"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "ä½¿ç?¨ PGP å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "P_GP å? ç°½"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨æ?¨ç?? PGP é??é?°ç?ºé?µä»¶å? ä¸?æ?¸ä½?ç°½ç« "
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "é?µä»¶å?ªå??æ¬?(_P)"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "å°?é?µä»¶å?ªå??æ¬?è¨ç?ºã??é«?ã??"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?(_Q)"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr "å?¨æ?¨ç??é?µä»¶è¢«é?±è®?æ??å??å¾?é??ä¿¡é??ç?¥"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME å? å¯?"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ä½¿ç?¨æ?¨ç?? S/MIME å? å¯?æ??è?å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME å? ç°½"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME ç°½å??æ??è?ç?ºé?µä»¶å? ä¸?æ?¸ä½?ç°½ç« "
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "å¯?ä»¶å?¯æ?¬æ¬?ä½?(_B)"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "å??æ??å¯?ä»¶å?¯æ?¬æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "å?¯æ?¬æ¬?ä½?(_C)"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "å??æ??å?¯æ?¬æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "å¯?ä»¶è??æ¬?ä½?(_F)"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 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:476
 msgid "_Reply-To Field"
 msgstr "å??è¦?æ¬?ä½?(_R)"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "å??æ??å??è¦?æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "ä¸»æ?¨æ¬?ä½?(_S)"
-
-#: ../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:521
 msgid "Save Draft"
 msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:114
+msgid "Show"
+msgstr "é¡¯ç¤º"
+
+#: ../composer/e-composer-header.c:117
+msgid "Hide"
+msgstr "é?±è??"
+
+#: ../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:927
 msgid "Fr_om:"
 msgstr "å¯?ä»¶è??(_O):"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:936
 msgid "_Reply-To:"
 msgstr "å??è¦?å?°å??(_R):"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:941
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:947
 msgid "_Cc:"
 msgstr "å?¯æ?¬(_C):"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:947 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "å?¯æ?¬(CC)"
+
+#: ../composer/e-composer-header-table.c:953
 msgid "_Bcc:"
 msgstr "å¯?ä»¶å?¯æ?¬(_B):"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:953 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "å¯?ä»¶å?¯æ?¬(BCC)"
+
+#: ../composer/e-composer-header-table.c:958
 msgid "_Post To:"
 msgstr "å¼µè²¼å?°(_P):"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:962
 msgid "S_ubject:"
 msgstr "ä¸»æ?¨(_U):"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:971
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "æ??é??è£¡æ?°å¢?ç?®é??æ??å??"
 
@@ -10896,38 +9480,26 @@ msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£¡ï¼?é?¸å??è¦?å¼µè²¼ç??è³?æ??å¤¾"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1557
-msgid "Show _Attachment Bar"
-msgstr "é¡¯ç¤ºé??å? æª?æ¡?å??(_A)"
+#: ../composer/e-composer-private.c:203
+msgid "Save draft"
+msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:807
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?ç°½ç½²é??å?ºç??é?µä»¶ï¼?æ¤å¸³è??æ²?æ??è¨å®?ç°½ç« æ??è?"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??è¨å®?å? å¯?æ??è?(æ¤å¸³è??)"
 
-#: ../composer/e-msg-composer.c:1499 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "é??ä»¶"
-msgstr[1] "é??ä»¶"
-
-#: ../composer/e-msg-composer.c:1555
-msgid "Hide _Attachment Bar"
-msgstr "é?±è??é??å? æª?æ¡?å??(_A)"
-
-#: ../composer/e-msg-composer.c:1572 ../composer/e-msg-composer.c:2797
+#: ../composer/e-msg-composer.c:1331 ../composer/e-msg-composer.c:2170
 msgid "Compose Message"
 msgstr "ç·¨è¼¯é?µä»¶"
 
-#: ../composer/e-msg-composer.c:4098
+#: ../composer/e-msg-composer.c:3328
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11082,7 +9654,7 @@ msgstr "å?²å?è??ç¨¿(_S)"
 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:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "Groupware å¥?è£?è»?é«?"
 
@@ -11115,7 +9687,7 @@ msgid "Evolution Query"
 msgstr "Evolution æ?¥è©¢"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
@@ -11151,11 +9723,11 @@ msgid "Log Level"
 msgstr "ç´?é??ç?ç´?"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "æ??é??"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2521
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "é?µä»¶"
@@ -11185,10 +9757,10 @@ msgstr "å?µé?¯"
 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
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:943
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:714
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
@@ -11237,244 +9809,244 @@ msgstr "è¦?è??æª?æ¡?ï¼?"
 msgid "_Overwrite"
 msgstr "è¦?å¯«(_O)"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "ç?¡æ³?é??å??è©²é?£çµ?ã??"
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "ç?¡æ³?é¡¯ç¤º Evolution ç??æ±?å?©æ??ä»¶ã??"
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "é??è¦?(_M)"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "å·¥ä½?(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "å??äºº(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "å¾?è¾¦äº?é ?(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "ç¨?å¾?(_L)"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "æ¨?ç±¤å??ç¨±(_N):"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "ç·¨è¼¯æ¨?ç±¤"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "å? å?¥æ¨?ç±¤"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "æ¨?ç±¤ç??å??ç¨±ä¸?è?½ç©ºç?½ã??"
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "ä¼ºæ??å?¨ä¸?å·²å?å?¨å??æ¨£ç??æ¨?ç±¤ã??è«?æ?´æ?¹æ?¨ç??æ¨?ç±¤å??ç¨±ã??"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf é?¯èª¤ï¼?%s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 ç§?å¾?"
 msgstr[1] "%d ç§?å¾?"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 å??é??å¾?"
 msgstr[1] "%d å??é??å¾?"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 å°?æ??å¾?"
 msgstr[1] "%d å°?æ??å¾?"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 æ?¥å??"
 msgstr[1] "%d æ?¥å??"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 å¤©å¾?"
 msgstr[1] "%d å¤©å¾?"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 é?±å¾?"
 msgstr[1] "%d é?±å¾?"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 å??æ??å¾?"
 msgstr[1] "%d å??æ??å¾?"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 å¹´å¾?"
 msgstr[1] "%d å¹´å¾?"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 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/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "æ¸¬è©¦"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "è¦?å??å??ç¨±(_U):"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?ä»¶ç??é ?ç?®"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "å? å?¥æ¢?ä»¶(_D)"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "å°?æ?¾é ?ç?®(_F):"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "æ²?æ??å??å¾©æ??å??å§?é?µä»¶"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾¤çµ?(_N)"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "å¤?å¯?"
 
@@ -11559,54 +10131,50 @@ msgstr ""
 "æ??é??ä½?æ¯?è¼?ã??"
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "ç?¸å°?æ?¼ç?®å??æ??é??ç??æ??å·®"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "å??"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "å¾?"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "æ??"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "ç§?å¾?"
-
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "ç?®å??æ??é??"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"ä¹?å??\n"
+"ä¹?å¾?"
+
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"ç§?\n"
+"å??\n"
+"æ??\n"
+"å¤©\n"
+"é?±\n"
+"æ??\n"
+"å¹´"
 
 #: ../filter/filter.glade.h:21
-msgid "the 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:655
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-msgid "weeks"
-msgstr "é?±"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "å¹´"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"ç?®å??ç??æ??å?»\n"
+"æ?¨æ??å®?ç??æ??å?»\n"
+"ç?¸å°?æ?¼ç?®å??æ??å?»ç??æ??å·®"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "æ?°å¢?è¦?å??"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "ç·¨è¼¯è¦?å??"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "è¦?å??å??ç¨±"
 
@@ -11659,21 +10227,21 @@ msgstr "Evolution é?µä»¶å?ªå??è¨å®?æ?§å?¶"
 msgid "Evolution Network configuration control"
 msgstr "Evolution ç¶²è·¯çµ?æ??æ?§å?¶"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../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
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:790
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "é?µä»¶"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "é?µä»¶å¸³è??"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "é?µä»¶å??å¥½è¨å®?"
 
@@ -11682,16 +10250,114 @@ msgid "Network Preferences"
 msgstr "ç¶²è·¯å??å¥½è¨å®?"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:298
 msgid "_Mail"
 msgstr "é?µä»¶(_M)"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "è½?å¯?(_F)"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "å??è¦?å¯?ä»¶è??(_R)"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+msgid "%d attached messages"
+msgstr "%d å??é??å? ç??é?µä»¶"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1653
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:141
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "é??ä»¶"
+msgstr[1] "é??ä»¶"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:601
+msgid "Icon View"
+msgstr "å??ç¤ºæª¢è¦?"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:602
+msgid "List View"
+msgstr "æ¸?å?®æª¢è¦?"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "ç¬¦å??ï¼?%d"
+
+#: ../mail/e-mail-search-bar.c:520
+msgid "Close the find bar"
+msgstr "é??é??æ??å°?å·¥å?·å??"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "å°?æ?¾(_D):"
+
+#: ../mail/e-mail-search-bar.c:540
+msgid "Clear the search"
+msgstr "æ¸?é?¤æ¤æ??å°?"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "ä¸?ä¸?å??(_P)"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "ä¸?ä¸?å??(_N)"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr "å??å??å¤§å°?å¯«(_C)"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?ç«¯ç¹¼çº?"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "å?°é??é ?é?¢é ?ç«¯ï¼?å¾?åº?é?¨ç¹¼çº?"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "æ²?æ??å? å¯?"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS å? å¯?"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL å? å¯?"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11704,118 +10370,127 @@ msgstr ""
 " %s æ??æ¬?å??ç´?\n"
 "ä¸¦é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 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
+#: ../mail/em-account-editor.c:611 ../mail/em-account-editor.c:656
+#: ../mail/em-account-editor.c:723 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:781
+msgid "Never"
+msgstr "æ°¸ä¸?"
+
+#: ../mail/em-account-editor.c:782
+msgid "Always"
+msgstr "æ°¸é? "
+
+#: ../mail/em-account-editor.c:783
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "èº«å??"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1912 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2184
 msgid "Check for _new messages every"
 msgstr "è?ªå??æª¢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2192
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2382 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "å?³é??é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2441 ../mail/mail-config.glade.h:73
 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:2507 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 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:2544 ../mail/em-account-editor.c:2639
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é?¸é ?"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2545 ../mail/em-account-editor.c:2640
 msgid "Checking for New Messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "å¸³è??ç·¨è¼¯å?¨"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[é ?è¨å?¼]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "å¸³è??å??ç¨±"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 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
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "æ?ªå?½å??ç??"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:947
 msgid "Language(s)"
 msgstr "èª?è¨?"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:980
 msgid "Add signature script"
 msgstr "æ?°å¢?ç°½å??ç¨?åº?æª?"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1022
 msgid "Signature(s)"
 msgstr "ç°½å??æª?"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1113 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1564
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1570
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:2037
 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:2084
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11823,11 +10498,11 @@ msgstr ""
 "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} "
 "${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2227
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "é??æ¿¾å?¨è¦?å??(_F)"
 
@@ -11844,18 +10519,10 @@ msgstr "æ??å®?è?²å½©"
 msgid "Assign Score"
 msgstr "æ??å®?ç?®æ¨?"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "å¯?ä»¶å?¯æ?¬(BCC)"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "å?¶è?²"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "å?¯æ?¬(CC)"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "å·²å®?æ??æ?¼"
@@ -11873,7 +10540,7 @@ msgid "Date sent"
 msgstr "é??ä»¶æ?¥æ??"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11924,226 +10591,234 @@ 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 ../mail/em-migrate.c:958
 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
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 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
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "é?µä»¶ä½?ç½®"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ç§»è?³è³?æ??å¤¾"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../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
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 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:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 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:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "å¾?æ??å°?å»ºç«?æ??å°?è³?æ??å¤¾(_R)..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "æ??æ??é?µä»¶"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "æ?ªè®?é?µä»¶"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "ç?¡æ¨?ç±¤"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "å·²è®?é?µä»¶"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "æ??è¿?ç??é?µä»¶"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "æ??è¿? 5 å¤©ç??é?µä»¶"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "æ??é??å? æª?æ¡?ç??é?µä»¶"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "é??è¦?é?µä»¶"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "é??å??å?¾é?µä»¶"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1199
 msgid "Account Search"
 msgstr "å¸³è??æ??å°?"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1252
 msgid "All Account Search"
 msgstr "æ??æ??ç??å¸³è??æ??å°?"
 
@@ -12173,11 +10848,11 @@ 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
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
@@ -12190,429 +10865,400 @@ msgstr "è³?æ??å¤¾å?§å®¹"
 msgid "<click here to select a folder>"
 msgstr "<æ??é??è£?é?¸æ??è³?æ??å¤¾>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "å»ºç«?(_R)"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 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:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "æ??å°?è³?æ??å¤¾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "ä¸?ç¬¦å??"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "è??ç¨¿"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "ç¯?æ?¬"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "å¯?ä»¶å?£"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "å·²å?³é??"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 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
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
-#, c-format
+#: ../mail/em-folder-tree.c:318
+#, fuzzy, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u)"
 msgctxt "folder-display"
-msgid "%s (%u)"
+msgid "%s (%u%s)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??å¤¾æ¨¹"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ£å?¨ç§»å??è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ£å?¨è¤?è£½è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2012
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ£å?¨å°?é?µä»¶ç§»è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2014
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ£å?¨è¤?è£½é?µä»¶è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?å±¤ç??å?²å?å??"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "ç§»è?³è³?æ??å¤¾(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2104
+msgid "_Move"
+msgstr "ç§»å??(_M)"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2106
+msgid "Cancel _Drag"
+msgstr "å??æ¶?æ??æ??(_D)"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "æ?°å¢?è³?æ??å¤¾(_N)..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "ç§»å??(_M)..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "é??æ?°æ?´ç??(_F)"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç??å¯?ä»¶å?£(_U)"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "æ¸?ç??å??æ?¶ç?(_E)"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "æ?ªè®?æ??å°?è³?æ??å¤¾(_U)"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "å°?ã??%sã??è¤?è£½å?°ã??%sã??"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder"
 msgstr "é?¸æ??è³?æ??å¤¾"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "è¤?è£½(_O)"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, 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
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 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:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?å»ºç«?è³?æ??å¤¾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "å?ªé?¤é?µä»¶å¤±æ??"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "æ?¨æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤æ¤å°?é?µä»¶ã??"
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "å??è¦?å¯?ä»¶è??(_R)"
-
-#: ../mail/em-folder-view.c:1333 ../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:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "å¾©å??(_N)"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "ç§»è?³è³?æ??å¤¾(_M)..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_I)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "æ¨?ç±¤(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "æ²?æ??(_N)"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "æ?°å¢?æ¨?ç±¤(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "æ¨?å¹?å·²å®?æ??(_G)"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "æ¸?é?¤æ¨?å¹?(_E)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "å¾?é?µä»¶å»ºç«?è¦?å??(_T)"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "å¾?ä¸»æ?¨å»ºç«?æ??å°?è³?æ??å¤¾(_S)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "å¾?å¯?ä»¶è??å»ºç«?æ??å°?è³?æ??å¤¾(_N)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "å¾?æ?¶ä»¶è??å»ºç«?æ??å°?è³?æ??å¤¾(_R)"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "å¾?é?µä»¶æ¸?å?®å»ºç«?æ??å°?è³?æ??å¤¾(_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "å¾?ä¸»æ?¨å»ºç«?é??æ¿¾å?¨(_J)"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "å¾?å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨(_D)"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_C)"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "å¾?é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨(_M)"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:220
+#: ../plugins/google-account-setup/google-source.c:505
+#: ../plugins/google-account-setup/google-source.c:715
 msgid "Default"
 msgstr "é ?è¨å?¼"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "å??å??é?µä»¶..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "æ?è??çµ¦(_A)..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_S)"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "å¾?é??å??ä½?å??(_F)"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "å?°é??å??ä½?å??(_T)"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "æ??ä¸?ä¸?æ?è??çµ¦ %s"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 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)"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:569 ../mail/em-format-html.c:653
 msgid "Unsigned"
 msgstr "æ?ªç°½å??"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:569
 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:656
+#: ../mail/em-format-html-display.c:570 ../mail/em-format-html.c:654
 msgid "Valid signature"
 msgstr "æ??æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:570
 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:657
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:655
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:571
 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:658
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:656
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç°½å??æ??æ??ï¼?ä½?æ?¯ç?¡æ³?æª¢é©?å¯?ä»¶è??"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:572
 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:659
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:657
 msgid "Signature exists, but need public key"
 msgstr "ç°½ç« å?å?¨ï¼?ä½?é??è¦?å?¬é??é??é?°"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:573
 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:665
+#: ../mail/em-format-html-display.c:580 ../mail/em-format-html.c:663
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:580
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "æ¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??ç¶²é??ç¶²è·¯å?³é??å?¯è?½æ??è¢«æª¢é?±ã??"
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:664
 msgid "Encrypted, weak"
 msgstr "å·²å? å¯?ï¼?ä¸?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:581
 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 "
@@ -12621,21 +11267,21 @@ msgstr ""
 "æ¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??äººå¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??"
 "æ?¥ï¼?ä¸¦ä¸?æ?¯ç?¡æ³?æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:665
 msgid "Encrypted"
 msgstr "å·²å? å¯?"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:582
 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:668
+#: ../mail/em-format-html-display.c:583 ../mail/em-format-html.c:666
 msgid "Encrypted, strong"
 msgstr "å·²å? å¯?ï¼?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:583
 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 "
@@ -12644,88 +11290,58 @@ msgstr ""
 "æ¤é?µä»¶å·²å? å¯?ï¼?ä½¿ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??ç¸±ä½¿ç¶?é??ä¸?æ®µæ??é??ï¼?å¤?é?¢ç??äººå¾?é?£æª¢é?±æ¤é?µä»¶"
 "ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:684 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "æª¢è¦?æ??è?(_V)"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:699
 msgid "This certificate is not viewable"
 msgstr "æ¤æ??è?ç?¡æ³?æª¢è¦?"
 
-#: ../mail/em-format-html-display.c:1410
+#: ../mail/em-format-html-display.c:991
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "å®?æ??æ?¼ %Y å¹´ %-m æ?? %-d æ?¥%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:999
 msgid "Overdue:"
 msgstr "å?°æ??æ?¥:"
 
 # (Abel) combine with previous entry
-#: ../mail/em-format-html-display.c:1421
+#: ../mail/em-format-html-display.c:1002
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1082
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "æª¢è¦?è¡?å?§(_V)"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1083
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "é?±è??(_H)"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1084
 msgid "_Fit to Width"
 msgstr "ç¬¦å??å¯¬åº¦(_F)"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1085
 msgid "Show _Original Size"
 msgstr "é¡¯ç¤ºå??å§?å¤§å°?(_O)"
 
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "å?¦å?é??å? æª?æ¡?ç?º"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "é?¸æ??ç?¨ä¾?å?²å?æ??æ??é??å? æª?æ¡?ç??è³?æ??å¤¾"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "å?²å?é?¸å??ç??(_S)..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d å??é??ä»¶(_T)"
-msgstr[1] "%d å??é??ä»¶(_T)"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "å?²å?(_A)"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "å?²å?å?¨é?¨(_A)"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "ç?¡é??ä»¶"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1586 ../mail/em-format-html-display.c:1625
 msgid "View _Unformatted"
 msgstr "æª¢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1588
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1645
 msgid "O_pen With"
 msgstr "ä»¥...é??å??(_O)"
 
-#: ../mail/em-format-html-display.c:2668
+#: ../mail/em-format-html-display.c:1722
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12738,156 +11354,156 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "ç¬¬ %d / %d é ?"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "æ£å?¨æ?·å?? `%s'"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:928
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:936
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:966
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:977
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??ç¤º"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:979
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1000
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1011
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ä¸?æ??ç??å¤?é?¨æª?æ¡?æ??ç¤º (ã??%sã??é¡?å??)"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1239
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??é?µä»¶"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1413
 msgid "Formatting Message..."
 msgstr "æ ¼å¼?å??é?µä»¶..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1566 ../mail/em-format-html.c:1630
+#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "å?¯æ?¬"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1636
+#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "å¯?ä»¶å?¯æ?¬"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1746 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1434
 msgid "Mailer"
 msgstr "å¯?ä»¶è??"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
+#: ../mail/em-format-html.c:1773
 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:1781
+#: ../mail/em-format-html.c:1778
 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:1917
+#: ../mail/em-format-html.c:1914
 #, 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:885
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:923
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
+#: ../mail/message-tag-followup.c:296
 msgid "From"
 msgstr "å¯?ä»¶è??"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "æ?°è??ç¾¤çµ?"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "é?¢è²?"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??å? æª?æ¡?"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?è§£æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??ç°½å??æ ¼å¼?"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "æª¢é©?ç°½å??ç?¼ç??é?¯èª¤"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "æª¢é©?ç°½å??ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
@@ -12907,77 +11523,82 @@ msgstr "æ¯?é?±ä¸?æ¬¡"
 msgid "Once per month"
 msgstr "æ¯?æ??ä¸?æ¬¡"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:331
 msgid "Add Custom Junk Header"
 msgstr "å? å?¥è?ªè¨?å??å?¾é?µä»¶æª?é "
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:335
 msgid "Header Name:"
 msgstr "æ¨?é å??ç¨±:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Value Contains:"
 msgstr "æ¨?é æ?¸å?¼å??å?«:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:437 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "é ?é¦?"
+
+#: ../mail/em-mailer-prefs.c:441
 msgid "Contains Value"
 msgstr "å??å?«æ?¸å?¼"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:464
 msgid "Color"
 msgstr "é¡?è?²"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:467
 msgid "Tag"
 msgstr "æ¨?ç±¤"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1062 ../mail/em-mailer-prefs.c:1116
 #, 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
+#: ../mail/em-mailer-prefs.c:1070 ../mail/em-mailer-prefs.c:1125
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?ä½¿ç?¨ã??è«?æª¢æ?¥æ?¯å?¦æ??å®?è£?è©²å¥?ä»¶ã??"
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1091
 msgid "No Junk plugin available"
 msgstr "æ²?æ??å?¯ç?¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
 
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "å¾?è¾¦"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "ç¨?å¾?"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "ç§»è½?"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?°è³?æ??å¤¾ `%s'ï¼?%s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ç?¡æ³?è¤?è£½è£½è³?æ??å¤¾ `%s' è?³ `%s'ï¼?%s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12988,31 +11609,31 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "ç?¡æ³?å»ºç«? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "ç?¡æ³?è¤?è£½ POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?¬å?°é?µä»¶å?²å?å?? `%s':%s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13023,86 +11644,103 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "ç?¡æ³?å?¨ `%s' å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾:%s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 "ç?¡æ³?å¾?ä»¥å??ç?? Evolution è®?å??è¨å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å?å?¨æ??æ??æ¯?ã??"
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "å?¦å?æ?°æª?..."
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "untitled_image.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "è¨ç?ºè??æ?¯(_B)"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
 #. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "å? å?¥å?°é??è¨?é??(_A)"
 
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "å?¨ %s å?§é??å??..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "æ¤å?²å?å??ä¸?æ?¯æ?´è¨?é?±ï¼?æ??è??æ?ªå??ç?¨å®?å??ã??"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "å·²è¨?é?±"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:643
 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:858
 msgid "Please select a server."
 msgstr "è«?é?¸æ??ä¸?å??ä¼ºæ??å?¨ã??"
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "å°?æ?ªé?¸æ??ä¼ºæ??å?¨"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯(_D)"
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "é?µä»¶"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "å?²å?é?µä»¶â?¦"
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "æ?°å¢?å?°å??"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??å¤¾(_F)"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "æ??å°?è³?æ??å¤¾ä¾?æº?"
 
@@ -13318,81 +11956,81 @@ msgid "Enable or disable magic space bar"
 msgstr "å??ç?¨æ??å??ç?¨é?è¡?ç©ºç?½é?µ"
 
 #: ../mail/evolution-mail.schemas.in.h:49
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "å??ç?¨æ??å??ç?¨æ¨?è¨?å¤?å??é?µä»¶æ??ç??æ??ç¤ºã??"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable or disable type ahead search feature"
 msgstr "å??ç?¨æ??å??ç?¨é?¨æ??å?³æ?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders"
 msgstr "å??ç?¨æ??å°?è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders on startup."
 msgstr "å??ç?¨ç¨?å¼?é??å§?æ??æ??å°?è³?æ??å¤¾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 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 ""
-"å??ç?¨å?´é??æ¬?æ??å°?å??è?½ä½¿æ?¨è?½è¼¸å?¥æ??å?é??å§?äº?å??å¼?æ??å°?ã??å®?ç??ä½?ç?¨æ?¯è®?æ?¨å?ªé ?å?¨å?´é??æ¬?ä¸"
-"è¼¸å?¥è³?æ??å¤¾å??ç¨±å°±å?¯ä»¥è¼?é¬?ç??æ?¾å?°è©²è³?æ??å¤¾ï¼?è??ç?±é?¸å??ç??å??ä½?æ?´å?¯ä»¥è?ªå??è·³è?³è©²è³?æ??å¤¾"
-"ç??ä½?ç½®ã??"
+"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:54
 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:55
 msgid "Enable to render message text part of limited size."
 msgstr "å??ç?¨ä»¥é¡¯ç¤ºé??å?¶å¤§å°?ç??é?µä»¶æ??å?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 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:57 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook/GMail å½¢å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 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 ""
-"å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½è¾¨å?¥ç?± "
-"Evolution å¯?å?ºç??æ?¬å?°å??æª?æ¡?å??ç¨±ã??å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?æ£ç¢º"
-"ç?? RFC 2047 æ¨?æº?ã??"
+"å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½æ£ç¢ºé¡¯ç¤ºç?± "
+"Evolution å¯?å?ºç?? UTF-8 å?å??æª?æ¡?å??ç¨±ï¼?å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?"
+"æ£ç¢ºç?? RFC 2047 æ¨?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??å¤¾é ?è¦½ä¸¦ç§»é?¤é?¸å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "å¦?æ??ä½¿ç?¨è??å??è©¦ä¸?æ¬¡é??å?? 10 æ??æ?´å¤?ç??é?µä»¶ï¼?è©¢å??ä½¿ç?¨è??æ?¯å?¦ç¢ºå®?è¦?é??éº¼å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 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:64
 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 "
@@ -13402,13 +12040,13 @@ msgstr ""
 "MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??åº«ä¹? Bonobo å??ä»¶æª¢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§"
 "å®¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 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:66
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13420,16 +12058,12 @@ msgstr ""
 "è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µ"
 "ä»¶ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?å¯¬åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "é??æ??å??ç?¨/å??ç?¨æ¨?è¨?å¤?å??é?µä»¶æ??ç??æ??ç¤ºã??"
-
 #: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
@@ -13664,90 +12298,154 @@ msgid "Server synchronization interval"
 msgstr "ä¼ºæ??å?¨å??æ¥é??é??"
 
 #: ../mail/evolution-mail.schemas.in.h:121
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å?¯æ?¬ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"From\" field when sending a mail message"
+msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?"
+
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show Animations"
 msgstr "é¡¯ç¤ºå??ç?«"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Show animated images as animations."
 msgstr "æ?æ?¾å??ç?«å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:129
 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:130
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸é¡¯ç¤ºå?ªé?¤ç??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show photo of the sender"
 msgstr "é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:132
+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:133
+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:134
+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:135
+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:138
+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:139
+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:140
 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:141
 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:142
 msgid "Spell check inline"
 msgstr "è¡?å?§æ?¼å?æª¢æ?¥"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Spell checking color"
 msgstr "æ?¼å?æª¢æ?¥é¡?è?²"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Spell checking languages"
 msgstr "æ?¼å?æª¢æ?¥èª?è¨?"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Subscribe dialog default height"
 msgstr "è¨?é?±å°?è©±ç??é ?è¨é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Subscribe dialog default width"
 msgstr "è¨?é?±å°?è©±ç??é ?è¨å¯¬åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Terminal font"
 msgstr "çµ?ç«¯æ©?å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Text message part limit"
 msgstr "æ??å?é?µä»¶é??å?¶"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?è¨å¤?æ??ç¨?å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 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:151
 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:152
 msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?ç«¯æ©?å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??å¯¬åº¦å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 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:155
 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."
@@ -13755,7 +12453,7 @@ msgstr ""
 "é??è£¡æ±ºå®?äº?é?µä»¶å?§æ??å?¨ Evolution ä¸å?¯æ??ç??ç??æ??å¤§å®¹é??ã??é ?è¨ç??å¤§å°?æ?¯ 4MB / 4096 "
 "KBï¼?ä»¥ KB ä¾?æ??å®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 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 "
@@ -13764,7 +12462,7 @@ msgstr ""
 "é??æ?¯é ?è¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??è£¡å??å?ºç??é ?"
 "è¨å¤?æ??ç¨?å¼?ï¼?ä¸¦ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -13772,7 +12470,7 @@ msgstr ""
 "é??å??é?µå?¼å?ªè?½è®?å??ä¸?æ¬¡ï¼?ä¸¦æ??å?¨è®?å??å¾?è¨ç?ºã??falseã??ã??é??æ¨£æ??å??æ¶?å?¨æ¸?å?®ä¸å°?è©²é?µä»¶ç??"
 "é?¸å??ä¸¦ç§»é?¤å°?è©²è³?æ??å¤¾ç??é ?è¦½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 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;"
@@ -13782,7 +12480,7 @@ msgstr ""
 "æ¤é??é?°æ??è©²å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªè¨?æª?é ï¼?ä»¥å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?"
 "æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é æ??é¡¯ç¤ºå?¨é?µä»¶æª¢è¦?ï¼?å??è¨å®?æ?? enabledã??"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 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 "
@@ -13791,24 +12489,24 @@ msgstr ""
 "é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸æ?¥"
 "è©¢é?»å?é?µä»¶ä½?å??ä»¥ç?¨æ?¼å??å?¾é?µä»¶é??æ¿¾æ??ã??æ??é?¤å·²ç?¥é?£çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 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:161
 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:162
 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:163
 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 "
@@ -13817,130 +12515,90 @@ msgstr ""
 "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?ä¾?æ¯?å??é?µä»¶ç¾¤çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??ä¾?ç?§é?µä»¶ç??æ?¥æ??ã??"
 "Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Thread the message list."
 msgstr "ä¸²æ?¥é?µä»¶æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Thread the message-list"
 msgstr "ä¸²æ?¥é?µä»¶æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Thread the message-list based on Subject"
 msgstr "ä»¥ä¸»æ?¨ç?ºå?ºç¤?ä¸²æ?¥é?µä»¶æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Timeout for marking message as seen"
 msgstr "å°?é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Timeout for marking message as seen."
 msgstr "å°?é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ç??æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "UID string of the default account."
 msgstr "é ?è¨å¸³è??ç?? UID å?ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ä½¿ç?¨è¡?å?§æ?¼å?æª¢æ?¥æ??å°?æ?¼é?¯å?ç??åº?ç·?é¡?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Use SpamAssassin daemon and client"
 msgstr "ä½¿ç?¨ SpamAsssassin ä¼ºæ??ç¨?å¼?å??å®¢æ?¶ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ä½¿ç?¨ SpamAsssassin ä¼ºæ??ç¨?å¼?å??å®¢æ?¶ç«¯ (spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Use custom fonts"
 msgstr "ä½¿ç?¨è?ªè¨?å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Use custom fonts for displaying mail."
 msgstr "ä½¿ç?¨è?ªè¨?å?å??ä¾?é¡¯ç¤ºé?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use side-by-side or wide layout"
 msgstr "ä½¿ç?¨ç·?è²¼æ??å¯¬é??ç½®"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Variable width font"
 msgstr "è®?å??å¯¬åº¦å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "æª¢è¦?/å¯?ä»¶å?¯æ?¬å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "æª¢è¦?/å¯?ä»¶å?¯æ?¬å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "æª¢è¦?/å?¯æ?¬å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "æª¢è¦?/å?¯æ?¬å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "æª¢è¦?/å¯?ä»¶è??å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "æª¢è¦?/å¯?ä»¶è??å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "æª¢è¦?/å¼µè²¼å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "æª¢è¦?/å¼µè²¼å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "æª¢è¦?/å??è¦?å??è?½è¡¨é ?ç?®å·²é?¸å??"
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "æª¢è¦?/å??è¦?å??è?½è¡¨é ?ç?®å·²é?¸å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 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:180
 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:181
 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:182
 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:183
 msgid "Width of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼å¯¬åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Width of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??å¯¬åº¦ã??"
 
@@ -13957,12 +12615,12 @@ msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:310
 msgid "Destination folder:"
 msgstr "ç?®ç??å?°è³?æ??å¤¾:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??å¤¾ä¾?è¼¸å?¥"
 
@@ -13980,8 +12638,8 @@ msgstr "æ£å?¨å?¯å?¥ä¿¡ç®±"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:455
+#: ../plugins/pst-import/pst-importer.c:561 ../shell/e-shell-importer.c:536
 #, c-format
 msgid "Importing `%s'"
 msgstr "æ£å?¨å?¯å?¥ â??%sâ??"
@@ -14008,108 +12666,108 @@ 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 é?µä»¶å??è¡¨"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "æ?°å¢?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d å°?å·²å?ªé?¤"
 msgstr[1] "%d å°?å·²å?ªé?¤"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 msgstr[1] "%d å°?å??å?¾"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å??è??ç¨¿"
 msgstr[1] "%d å??è??ç¨¿"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å?³é??"
 msgstr[1] "%d å°?å·²å?³é??"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå?³é??"
 msgstr[1] "%d å°?æ?ªå?³é??"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d å°?æ?ªè®?ï¼?"
 msgstr[1] "%d å°?æ?ªè®?ï¼?"
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å?± %d å°?"
 msgstr[1] "å?± %d å°?"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:949
 msgid "New Mail Message"
 msgstr "æ?°å¢?é?µä»¶"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:950
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "é?µä»¶è¨?æ?¯(_M)"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:951
 msgid "Compose a new mail message"
 msgstr "ç·¨è¼¯æ?°ç??é?µä»¶è¨?æ?¯"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:957
 msgid "New Mail Folder"
 msgstr "æ?°é?µä»¶è³?æ??å¤¾"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:958
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?µä»¶è³?æ??å¤¾(_F)"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:959
 msgid "Create a new mail folder"
 msgstr "å»ºç«?æ?°é?µä»¶è³?æ??å¤¾"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1106
 msgid "Failed upgrading Mail settings or folders."
 msgstr "å??ç´?é?µä»¶æ??è³?æ??å¤¾å¤±æ??ã??"
 
@@ -14275,59 +12933,81 @@ msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??æ°¸é? è?ªæ??å? å¯?(_M)"
 msgid "Always request rea_d receipt"
 msgstr "æ°¸é? è¦?æ±?è®?ä¿¡å??æ¢?(_D)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"é??ä»¶\n"
+"è¡?å?§\n"
+"å¼?æ??"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"é??ä»¶\n"
+"è¡?å?§ (Outlook é¢¨æ ¼)\n"
+"å¼?æ??\n"
+"ä¸?è¦?å¼?ç?¨"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå??æ??å?¥è¡¨æ??ç¬¦è??(_E)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "å?å??é??(_H):"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:56
 msgid "Ch_eck for Supported Types "
 msgstr " æª¢æ?¥å?¯æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "ä»¥è?ªè¨?æ¨?é æª¢æ?¥å??å?¾é?µä»¶(_S)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "æª¢æ?¥å?§é??é?µä»¶æ?¯å?¦ç?ºå??å?¾é?µä»¶(_M)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "ç?¶æ??è¼¸å?¥æ??æª¢æ?¥æ?¼å?(_T)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "æª¢æ?¥å?§é??ç??å??å?¾é?µä»¶è¨?æ?¯"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "æ¸?é?¤(_A)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "æ¸?é?¤(_R)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "æ?¼é?¯å?ç??é¡?è?²(_M):"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "å?ªé?¤è³?æ??å¤¾æ??ç¢ºèª?(_W)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14343,182 +13023,180 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "é ?è¨å?¼(_F)"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "é ?è¨å?å??ç·¨ç¢¼(_N):"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "é?¢é??æ??å?ªé?¤å??å?¾é?µä»¶(_X)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ä½?ç°½ç«  [é ?è¨å?¼] (_U)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "ä¸?æ??ç??é?µä»¶å?§æ??ç??æ??å?å¤§å°?ä¸?é??(_Z)"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "è?¥å¯?ä»¶è??å?¨æ??ç??é??è¨?é??ä¸å°±ä¸?è¦?å°?é?µä»¶æ¨?è¨?ç?ºå??å?¾é?µä»¶(_K)"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "ä¸?ä½¿ç?¨å¼?æ??"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "è??ç¨¿å?£(_F):"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "é?»å?é?µä»¶å¸³è??"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "é?»å?é?µä»¶ä½?å??(_A):"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "é?¢é??æ??æ¸?ç©ºå??æ?¶ç?è³?æ??å¤¾(_X)"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "å??ç?¨é?è¡?ç©ºç?½é?µ(_P)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "å??ç?¨æ??å°?è³?æ??å¤¾(_R)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "å? å¯?æ??è?(_P):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¤?é??ç??é?µä»¶ (é ?è¨å?¼)(_E)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "å?ºå®?å¯¬åº¦(_X):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "å?ºå®?å¯¬åº¦å?å??(_E):"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "å?å??å?§å®¹"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "å°?é?µä»¶æ ¼å¼?å??ç?º _HTML"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML é?µä»¶"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ä»£ç??ä¼ºæ??å?¨:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "æª?é "
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "å¼·èª¿å¼?æ??ç?º(_Q)"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "è¡?å?§"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "è¡?å?§ï¼?Outlook é¢¨æ ¼ï¼?"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr ""
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æ¨?ç±¤"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "èª?è¨?è¡¨"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "é?µä»¶æª?é è¡¨"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "ä¿¡ç®±ä½?ç½®"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "é?µä»¶ç·¨è¼¯å?¨"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "æ²?æ??ä»£ç??ä¼ºæ??å?¨çµ¦(_P):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "æ³¨æ??ï¼?å?¨æ¨?ç±¤å??ç¨±ä¸ç??åº?ç·?æ?¯ç?¨ä¾?æ¨?è¨?é?¸å?®ä¸ç??æ?·å¾?é?µã??"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 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.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°ç¬¦å??ç??è?ªè¨?å??å?¾é?µä»¶æ¨?é é??å??é?¸é ?å°±æ??è¢«å¿½ç?¥ã??"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "å??é«?(_G):"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG é??é?° ID:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "å¯?ç¢¼(_W):"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
 "è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??\n"
 "é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:120
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14526,7 +13204,7 @@ msgstr ""
 "è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??æ?¨ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²è·¯æ??å??ä¾?"
 "æ??å??ã??"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 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 "
@@ -14535,58 +13213,46 @@ msgstr ""
 "è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??æ?¨å¸?æ??å?¨é??å?º"
 "ç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:122
 msgid "Please select among the following options"
 msgstr "è«?å?¨ä¸?å??é?¸é ?ä¸é?¸æ??"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "é?£æ?¥å? :"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ç?¶å?³é??ç??é?µä»¶å?ªæ??æ??å®?å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??æ??é¡¯ç¤ºæ??ç¤º(_O)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "å¼?ç?¨"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "è¨?ä½?å¯?ç¢¼(_M)"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "å??è¦?å?°å??(_P):"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "è¨?ä½?å¯?ç¢¼(_P)"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "S_OCKS ä¸»æ©?:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "å?ªæ??å°?æ?¬å?°ç«¯é??è¨?é??ä¸ç??å¯?ä»¶è??ç?¸ç??(_E)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "é?¸å??(_E)..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "å?³é??é?µä»¶å??æ¢?(_E):"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "æ¨?æº?å?å??(_T):"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "é?¸æ??è??ç¨¿è³?æ??å¤¾"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "é?¸æ?? HTML å?ºå®?å¯¬åº¦å?å??"
@@ -14603,71 +13269,71 @@ msgstr "é?¸æ?? HTML å?¯è®?å¯¬åº¦å?å??"
 msgid "Select HTML variable width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼å??å?°ç?? HTML å?¯è®?å¯¬åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "é?¸æ??å¯?é??è³?æ??å¤¾"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "å?³é??é?µä»¶"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "å?³é??é?µä»¶è³?æ??å¤¾(_M):"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "ä¼ºæ??å?¨è¦?æ±?é©?è?(_V)"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "ä¼ºæ??å?¨é¡?å??(_T):"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "ç°½å??æ??è?(_N):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "ç°½å??æª?(_U):"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "ç°½å??"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "ç°½ç« è¡¨"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "æ?¼å?æª¢æ?¥"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "å??è¦?æ??å¾?åº?é?¨é??å§?è¼¸å?¥(_T)"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "é¡?å??(_Y):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 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.glade.h:151
+#, 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. "
 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. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "é??å??å?½ä»¤ç¨¿ç??è¼¸å?ºæ??ç?¨ä¾?ä½?ç?ºæ?¨ç??\n"
 "ç°½å??æª?ã??æ?¨æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?º\n"
 "é¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14675,26 +13341,26 @@ msgstr ""
 "è¼¸å?¥æ?³ç?¨ä¾?ä»£è¡¨é??å??å¸³è??ç??å??ç¨±ã??\n"
 "ä¾?å¦?ï¼?ã??å·¥ä½?ã??æ??ã??å??äººã??"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_E):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 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:615
-#: ../plugins/google-account-setup/google-contacts-source.c:316
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:629
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_N):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "å?¯è®?å¯¬åº¦(_A):"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14702,129 +13368,129 @@ msgid ""
 msgstr ""
 "æ¡è¿?ä½¿ç?¨ Evolution é?µä»¶çµ?æ??å?©ç??ã??\n"
 "\n"
-"æ??ä¸?ä¸?ã??ä¸?ä¸?é ?ã??é??å§?ã?? "
+"æ??ä¸?ä¸?ã??å¾?å??ã??é??å§?ã?? "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "å? å?¥ç°½å??æª?(_A)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "ä¸?å®?è?ªç¶²è·¯ä¸?è¼?å??ç??(_A)"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "è?ªå??ä»£ç??ä¼ºæ??å?¨çµ?æ??ç¶²å??(_A):"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "é ?è¨å??å?¾é?µä»¶å¤?æ??ç¨?å¼?(_D):"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "ç?´æ?¥é?£ç·?å?°ç¶²é??ç¶²è·¯(_D)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?ç°½ç½²æ??è°é??è«? (ç?¸å®¹æ?¼ _Outlook)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "è½?å¯?æ?¹å¼?(_F):"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "å??ä¿¡æ??ä¿?ç??å??å§?é?µä»¶ç??ç°½å??(_K)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "è¼?å?¥ç?±é?£çµ¡äººå¯?å?ºé?µä»¶ä¸ç??å??ç??(_L)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "å?ªå?¨æ?¬å?°é??è¨?é??æ?¥è©¢(_L)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "è¨ç?ºæ??ç??é ?è¨å¸³è??(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??(_M):"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²é?±è®?æ?¼(_M)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ä¸?å®?ä¸?è?ªç¶²è·¯ä¸?è¼?å??ç??(_N)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "è·¯å¾?(_P):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 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.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ç?¶å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶æ??é¡¯ç¤ºæ??ç¤º(_P)"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "å??è¦?æ?¹å¼?(_R):"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "å?½ä»¤ç¨¿(_S):"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??ä¼ºæ??å?¨(_S):"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 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.glade.h:186
 msgid "_Show image animations"
 msgstr "é¡¯ç¤ºå??ç?«å??ç??(_S)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨é?µä»¶é ?è¦½é¡¯ç¤ºå¯?ä»¶è??ç?¸ç??(_S)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ç¸®ç? _To / Cc / Bcc æª?é ç?º"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "ä½¿ç?¨ç³»çµ±é ?è¨å?¼(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "ä½¿ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å?å??(_U)"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "å?°å??"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "è?²å½©"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "æ??è¿°"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "ç§?å¾?"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
@@ -14854,50 +13520,34 @@ msgid "All local folders"
 msgstr "æ??æ??æ?¬å?°ç«¯è³?æ??å¤¾"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "å??å??å¤§å°?å¯«(_S)"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "å°?æ?¾(_I):"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "å?¨é?µä»¶å?§å°?æ?¾"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "è¦?è·?é?¨ç??æ¨?å¹?"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "è³?æ??å¤¾è¨?é?±"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "æ??æ¬?å??ç´?"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "æ?ªé?¸å??"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "ä¼ºæ??å?¨(_E):"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "ä¿?å?¨æ?§è³?è¨?"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "æ??å®?ç??è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14905,19 +13555,19 @@ msgstr ""
 "æ?¨é?¸æ??è¦?è·?é?¨ç??é?µä»¶å·²å?¨ä¸?é?¢å??å?ºã??\n"
 "è«?å¾?ã??æ¨?å¹?ã??é?¸å?®ä¸é?¸æ??è·?é?¨ç??å??ä½?ã??"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "æ?¥å??æ??æ¬?(_A)"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "å?°æ??æ?¼(_D):"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "æ¨?å¹?(_F):"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
@@ -14926,21 +13576,21 @@ msgstr "é?¸å??æ¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "é??æ¿¾é?¸æ??ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "æ?¥æ?¶é?µä»¶"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, 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:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14949,123 +13599,123 @@ msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
 "æ?¹é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??ã??"
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??ï¼?%s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "æ£å?¨å?³é??é?µä»¶"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, 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:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "å?²å?é?µä»¶å?°è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "å°?é?µä»¶ç§»å?° %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "å°?é?µä»¶è¤?è£½å?° %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "é??å??è³?æ??å¤¾ %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "å??å¾?è³?æ??å¤¾ %s ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "é??å??è²¯è?? %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "ç§»é?¤è³?æ??å¤¾ %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "è²¯è??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?ç©ºå??å?²å?å¸³è?? '%s'"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å?å¸³è?? '%s'"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "å?ªé?¤è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?ç©º '%s' ç??å??æ?¶ç?"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "å??å??é?µä»¶ %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "å?²å? %d å°?é?µä»¶"
 msgstr[1] "å?²å? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15074,11 +13724,11 @@ msgstr ""
 "å?²å?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "å?²å?é??ä»¶"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15087,27 +13737,27 @@ msgstr ""
 "ä¸?è?½å»ºç«?è¼¸å?ºæª?æ¡?ï¼?%sï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ç?¡æ³?å¯«å?¥è³?æ??ï¼?%s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "ä¸æ?·è?? %s ç??é?£ç·?"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "é??æ?°é?£ç·?å?° %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æº?å??å¸³è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "æª¢æ?¥æ??å??"
 
@@ -15131,31 +13781,31 @@ msgstr "æ?´æ?°ä¸..."
 msgid "Waiting..."
 msgstr "æ£å?¨ç?å¾?..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:813
 #, c-format
 msgid "Checking for new mail"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "è¼¸å?¥å¯?èª?"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?ç¢¼"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "è¼¸å?¥å¯?ç¢¼"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "ä½¿ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
@@ -15200,21 +13850,21 @@ msgstr "è³?æ??å¤¾ç?¡æ??:`%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "è¨å®?æ??å°?è³?æ??å¤¾ï¼? %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?° '%s:%s' ç??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "ç·¨è¼¯æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??å¤¾"
 
@@ -15800,86 +14450,86 @@ msgstr "æ¸?é?¤(_E)"
 msgid "_Open Messages"
 msgstr "é??å??é?µä»¶(_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "æ?ªé?±è®?"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "å·²é?±è®?"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "è½?å¯?"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
+#: ../widgets/table/e-cell-date.c:71
 msgid "Today %l:%M %p"
 msgstr "ä»?å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1670 ../widgets/table/e-cell-date.c:81
 msgid "Yesterday %l:%M %p"
 msgstr "æ?¨å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1682 ../widgets/table/e-cell-date.c:93
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1690 ../widgets/table/e-cell-date.c:101
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p %l:%M"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:103
 msgid "%b %d %Y"
 msgstr "%Y/%m/%d"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3981 ../mail/message-list.c:4454
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4293
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 "æ²?æ??é?µä»¶ç¬¦å??æ?¨ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4295
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -15909,6 +14559,7 @@ 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 "å¤§å°?"
 
@@ -15916,39 +14567,39 @@ msgstr "å¤§å°?"
 msgid "Subject - Trimmed"
 msgstr "ä¸»æ?¨ - å·²æ?ªç?"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "å??å§?ä½?ç½®"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "è«?å?¿è½?å¯?"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "è·?é?¨"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "çµ¦æ?¨ç??è³?è¨?"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "è½?å¯?"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "ä¸?é??è¦?å??æ??"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "å??è¦?"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "å?¨é?¨å??è¦?"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "æª¢é?±"
 
@@ -15973,20 +14624,24 @@ msgid "Subject contains"
 msgstr "ä¸»æ?¨å??å?«"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "ä¸»æ?¨æ??æ?¶ä»¶è??å??å?«"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "ä¸»æ?¨æ??å¯?ä»¶è??å??å?«"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "æ?¬å?°ç«¯é??è¨?é??"
+msgid "Add local address books to Evolution."
+msgstr "å°?æ?¬å?°é??è¨?é??å? å?¥ Evolutionã??"
 
 #: ../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 ""
@@ -16000,8 +14655,8 @@ msgid ""
 "body."
 msgstr "è®?é??å? æª?æ¡?æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®ã??"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "é??é?µå?"
 
@@ -16011,10 +14666,8 @@ 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 "å?¨é?µä»¶ä¸å°?æ?¾é??é?µå?ä»¥æ??é??å?¶ä¸ç??é??å? æª?æ¡?ä¸¦ä¸?å?¯å?¨é??å? æª?æ¡?é?ºå¤±æ??æ??å?ºè¦å??"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ç?¶æ?¨å¿?è¨?å°?é??ä»¶å? å?¥é?µä»¶æ??æ??é??æ?¨ã??"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16027,22 +14680,23 @@ msgstr ""
 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/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"ç?¨ä¾?é¡¯ç¤ºé?µä»¶ä¸é?³æ??é??ä»¶ç??æ ¼å¼?å¤?æ??ç¨?å¼?ï¼?å®?å?¯ä»¥è®?æ?¨å?¨ Evolution ä¸ç?´æ?¥æ?æ?¾å®?å??ã??"
+msgid "Audio Inline"
+msgstr "è¡?å?§é?³æ??"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "é?µä»¶é?³è¨?å¤?æ??ç¨?å¼?"
+msgid "Play audio attachments directly from Evolution."
+msgstr "å¾? Evolution ç?´æ?¥æ?æ?¾é?³æ??é??ä»¶ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "é?¸æ?? Evolution å??ä»½æª?æ¡?ç??å??ç¨±"
 
@@ -16063,136 +14717,142 @@ msgid "Restore from backup"
 msgstr "å¾?å??ä»½é??å??"
 
 #: ../plugins/backup-restore/backup-restore.c:289
+#, 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."
 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:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "å¾?å??ä»½æª?æ¡?é??å?? Evol_ution"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution æª?æ¡?åº«ï¼?"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "é?¸æ??è¦?é??å??ç??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "å??ä»½ Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "å??å? Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "æª¢æ?¥ Evolution å??ä»½"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "ä½¿ç?¨å??å½¢ä½¿ç?¨è??ä»?é?¢"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "æ£å?¨é??é?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "å??ä»½ Evolution ç??å¸³è??è??è¨å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æ£å?¨å??ä»½ Evolution è³?æ?? (é?µä»¶ã??é?£çµ¡äººã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "å??ä»½å®?æ??"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../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:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "å??ä»½ç?®å??ç?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "å¾?å??ä»½è§£é??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "æ£å?¨è®?å?? Evolution ç??è¨å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "ç§»é?¤æ?«å?ç??å??ä»½æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "æ£å?¨ç¢ºèª?æ?¬å?°ç«¯ä¾?æº?"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ£å??ä»½è?³è³?æ??å¤¾ %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../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:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolution å??ä»½"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "å??ä»½ Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??ä»½æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../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:2
+msgid "Backup and Restore"
+msgstr "å??ä»½è??å??å?"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "å??ä»½è??å??å?å¤?æ??ç¨?å¼?ã??"
+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?"
@@ -16253,73 +14913,80 @@ msgstr "é??å??è¨å®?å?¼(_E)..."
 msgid "_Backup Settings..."
 msgstr "å??ä»½è¨å®?å?¼(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../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"
-msgstr "å?¨å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??ä¸å»ºç«?é ?ç?®(_A)"
+#: ../plugins/bbdb/bbdb.c:646
+msgid "Create _address book entries when sending mails"
+msgstr "å?¨å?³é??é?µä»¶æ??è?ªå??å»ºç«?é??è¨?é??é ?ç?®(_A)"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "é?¸æ??çµ¦è?ªå??å? å?¥é?£çµ¡äººç?¨ç??é??è¨?é??"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "å?³æ??è¨?æ?¯é?£çµ¡äºº"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "å®?æ??å¾? Pidgin ç??å¥½å??æ¸?å?®å??æ¥é?£çµ¡äººè³?è¨?å??å??ç??"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "é?¸æ??çµ¦ Pidgin å¥½å??å??å?®ç?¨ç??é??è¨?é??"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 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 ""
+#| "Automatically fills your address book with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
 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 ""
 "å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??ä¸å¡«å?¥å§?å??è??é?»å?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸å¡«å?¥ IM "
 "é?£çµ¡äººè³?è¨?ã??"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
-
 #. 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:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "å?¨ç?¢ç?? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter å?ç¨?åº?æ²?æ??å??æ??ï¼?ä¸æ¢å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ç?å¾? Bogofilter å?ç¨?åº?ä¸æ?·ï¼?çµ?çµ?å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "å°?ç®¡è?³ Bogofilter å¤±æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%dã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º _Unicode"
 
@@ -16334,73 +15001,80 @@ msgid ""
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º Unicode UTF-8 ä»¥çµ±ä¸?ä¾?è?ªä¸?å??å?é??ç?? spam/ham ç?¹å¾µã??"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter é?¸é ?"
+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."
+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 "ç¶²å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-source.c:622
+#: ../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:632
-#: ../plugins/google-account-setup/google-contacts-source.c:358
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:646
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "é?±"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV è¡?äº?æ??ä¾?æº?"
+msgid "Add CalDAV support to Evolution."
+msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV ä¾?æº?"
+msgid "CalDAV Support"
+msgstr "CalDAV æ?¯æ?´"
 
 #: ../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
 msgid "Weather: Fog"
@@ -16442,37 +15116,33 @@ msgstr "å¤©æ°£ï¼?é?·æ?´"
 msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "å?®ä½?(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å?¬å??ç?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 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 ""
-"ç?¨ä¾?å±?ç¤ºå½?å?ºå¼?é?¸å?®å¤?æ??ç¨?å¼?å??è?½ç??æ¸¬è©¦ç?¨å¤?æ??ç¨?å¼?ï¼?å®?å?¯ä»¥è®?æ?¨è¤?è£½æ?±è¥¿å?°å?ªè²¼ç°¿"
-"è£¡ã??"
+msgid "Copy Tool"
+msgstr "è¤?è£½å·¥å?·"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "è¤?è£½å·¥å?·"
+msgid "Copy things to the clipboard."
+msgstr "å°?å?§å®¹è¤?è£½å?°å?ªè²¼ç°¿ã??"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16484,11 +15154,11 @@ 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."
+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
@@ -16496,23 +15166,23 @@ 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
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "æ¨?ç¤ºç?ºé ?è¨é??è¨?é??(_D)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "æ¨?ç¤ºç?ºé ?è¨è¡?äº?æ??(_D)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å·¥ä½?æ¸?å?®(_D)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å??å¿?é??æ¸?å?®(_D)"
 
@@ -16521,32 +15191,30 @@ 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 "æ??ä¾?æ¨?è¨?é ?è¨è¡?äº?æ??æ??é??è¨?é??ç??å??è?½ã??"
+msgid "Mark your preferred address book and calendar as default."
+msgstr "å°?æ?¨å??å¥½ç??é??è¨?é??å??è¡?äº?æ??æ¨?è¨?ç?ºé ?è¨ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "å®?å?¨æ?§:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
-msgstr "é??å¯?ä»¶"
+msgstr "æ?ªæ¸é¡?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "å·²ä¿?è·"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "å¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "æ¥µæ©?å¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "è?ªè¨?æ¨?é (_C)"
 
@@ -16555,7 +15223,7 @@ msgid "Key"
 msgstr "è¨å®?é?µ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:396
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "æ?¸å?¼"
 
@@ -16574,7 +15242,7 @@ 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 "Add custom headers to outgoing mail messages."
 msgstr "å?¨å¤?å¯?é?µä»¶ä¸å? å?¥è?ªè¨?æ¨?é ã??"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
@@ -16632,11 +15300,11 @@ msgid ""
 "password authentication."
 msgstr "æ¤é?¸é ?å°?æ??é?£æ?¥å?°ä½¿ç?¨æ¨?æº?ç´?æ??å?å¯?ç¢¼é©?è?ç?? Exchange ä¼ºæ??å?¨ã??"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16644,90 +15312,97 @@ msgstr ""
 "ä»¥ä¸?æ??å®?ç??è¨?æ?¯å°?æ??è?ªå??å?³é??çµ¦\n"
 "æ¯?ä¸?ä½?å?¨æ?¨é?¢é??è¾¦å?¬å®¤æ??å?³é??é?µä»¶çµ¦æ?¨ç??äººã??"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "æ??ç?®å??ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "æ??ç?®å??å?¨è¾¦å?¬å®¤"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "æ?¹è®? Exchange å¸³è??ç??å¯?ç¢¼"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "è®?æ?´å¯?ç¢¼"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "ç®¡ç?? Exchange å¸³è??ç??æ??æ¬?è¨å®?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "å§?æ´¾è¨å®?å?©ç??"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "é??é ?"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "æª¢è¦?æ??æ?? Exchange è³?æ??å¤¾ç??å¤§å°?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "è³?æ??å¤¾å¤§å°?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange è¨å®?å?¼"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 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:774
+msgid "Mailbox name is _different than user name"
+msgstr "ä¿¡ç®±å??ç¨±è??ä½¿ç?¨è??å??ç¨±ä¸?å??(_D)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "ä¿¡ä»¶å?£(_M):"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "é©?è?é¡?å??(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
 msgid "Ch_eck for Supported Types"
 msgstr "æª¢æ?¥æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "å¤§å°?:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -16766,38 +15441,35 @@ msgstr "æ?°å¯?ç¢¼ï¼?"
 msgid "Your current password has expired. Please change your password now."
 msgstr "ç?®å??ç??å¯?ç¢¼å·²é??æ??ã??è«?ç«?å?³è®?æ?´å¯?ç¢¼ã??"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "æ?¨ç??å¯?ç¢¼å°?å?¨ %d å¤©å¾?å?°æ??"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "è?ªè¨?"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "ç·¨è¼¯è?? (è®?å??ã??å»ºç«?ã??ç·¨è¼¯)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "å??è??è?? (è®?å??ï¼?å»ºç«?)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "æª¢é?±è?? (å??é??è®?å??)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "ä»£ç??äººæ¬?é??"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s ç??æ¬?é??"
@@ -16805,7 +15477,7 @@ 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
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16815,84 +15487,96 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "æ?¨å·²ç¶?å¾?å?°æ??ç??è³?æ??å¤¾ç??æ¬?é??æ??ï¼?"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "æ?¨ä¹?è¢«å??è¨±æ?¥ç??æ??ç??ç§?äººé ?ç?®ã??"
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "ç?¶è??æ?¨ä¸¦æ?ªå¾?å?°å??è¨±è§?ç??æ??ç??ç§?äººé ?ç?®ã??"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "æ?¨å·²ç¶?è¢«æ??æ´¾ç?º %s ç??ä»£ç??äºº"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "å§?è¨?çµ¦"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "è¦?ç§»é?¤ä»£ç??äºº %s å??ï¼?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "ç?¡æ³?å?å?? Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Active Directory ä¸æ?¾ä¸?å?°è?ªå·±"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Active Directory ä¸æ?¾ä¸?å?°ä»£ç??äºº %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "ç?¡æ³?ç§»é?¤ä»£ç??äºº %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "ç?¡æ³?æ?´æ?°ä»£ç??äººç??æ¸?å?®ã??"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "ç?¡æ³?æ?°å¢?ä»£ç??äºº %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "è®?å??ä»£ç??äººæ¸?å?®é?¯èª¤ã??"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "è¡?äº?æ??(_A):"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "é?£çµ¡äºº(_N):"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "ä»£ç??äºº"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"æ²?æ??\n"
+"æª¢é?±è?? (å??é??è®?å??)\n"
+"å??è??è?? (è®?å??ï¼?å»ºç«?)\n"
+"ç·¨è¼¯è?? (è®?å??ã??å»ºç«?ã??ç·¨è¼¯)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "æ¬?é??æ??äº?"
 
@@ -16919,6 +15603,7 @@ msgstr "æ¬?é??æ??è¦?(_S)"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "å·¥ä½?(_T):"
 
@@ -16936,11 +15621,11 @@ msgid "Folder Size"
 msgstr "è³?æ??å¤¾å¤§å°?"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "ä½¿ç?¨è??"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??è³?æ??å¤¾"
@@ -16949,20 +15634,20 @@ msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??è³?æ??å¤¾"
 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
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "ç¢ºå®?è¦?å??æ¶?è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "å??æ¶?è¨?é?±ã??%sã??"
@@ -17026,18 +15711,18 @@ msgstr "æ?¨ç??å¯?ç¢¼å°?å?¨ 7 å¤©å?§å?°æ??..."
 msgid "_Change Password"
 msgstr "è®?æ?´å¯?ç¢¼(_D)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(æ¬?é??è¢«æ??çµ?ã??)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "æ?°å¢?ä½¿ç?¨è??ï¼?"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "å? å?¥ä½¿ç?¨è??"
 
@@ -17155,11 +15840,11 @@ msgstr "æ??æ??åº¦(_S):"
 msgid "_User"
 msgstr "ä½¿ç?¨è??(_U)"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "é?¸æ??ä½¿ç?¨è??"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "é??è¨?é??..."
 
@@ -17172,10 +15857,8 @@ 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 å¸³è??æ??å®?æ??ä½?è??å??è?½é??å??ç??å¤?æ??ç¨?å¼?ã??"
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "ä½¿ç?¨ Evolution-Exchange å»¶ä¼¸å¥?ä»¶ã??"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17318,7 +16001,7 @@ msgid "Folder offline"
 msgstr "è³?æ??å¤¾é?¢ç·?"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "ä¸?è?¬é?¯èª¤"
 
@@ -17435,7 +16118,9 @@ 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:521
+#: ../plugins/google-account-setup/google-source.c:516
+#: ../plugins/mail-to-task/mail-to-task.c:343
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
@@ -17514,64 +16199,77 @@ msgid "Check folder permissions"
 msgstr "æª¢æ?¥è³?æ??å¤¾æ¬?é??"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "å?¨é?µä»¶ç·¨è¼¯å?¨ä¸æ??ä¸?æ??é?µæ??è?ªå??å?·è¡?ç·¨è¼¯å?¨"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "ç?¶ç·¨è¼¯æ?°é?µä»¶æ??è?ªå??å?·è¡?"
+
+#: ../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
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr "ä½¿ç?¨å¤?é?¨ç·¨è¼¯å?¨å??ç?ºé?µä»¶ç·¨è¼¯å?¨ç??å¤?æ??ç¨?å¼?ã??æ?¨å?ªè?½å¯?å?ºç´?æ??å?é?µä»¶ã??"
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 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
+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 "Evoluton ç?¡æ³?å»ºç«?ç?¨ä¾?å?²å?æ?¨é?µä»¶ç??æ?«å?æª?æ¡?ã??è«?ç¨?å¾?å??è©¦ã??"
 
-#: ../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:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "ç?¨ä¾?å??å??ç·¨è¼¯å?¨ç??æ??ä»¤: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Emacs ä½¿ç?¨ã??xemacsã??\n"
-"VI ä½¿ç?¨ã??gvimã??"
+"VI ä½¿ç?¨ã??gvim -fã??"
+
+#: ../plugins/external-editor/external-editor.c:307
+#: ../plugins/external-editor/external-editor.c:309
+msgid "Compose in External Editor"
+msgstr "å?¨å¤?é?¨ç·¨è¼¯å?¨ä¸æ?°å¯«"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -17587,36 +16285,46 @@ msgstr "é?¢è²?(_F)"
 
 #: ../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."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
-"å?¨å¤?å¯?ç??é?µä»¶ä¸é??å? å¤§é è²¼æ¨?é ã??ç¬¬ä¸?æ¬¡ä½¿ç?¨æ??é??è¦?å??è¨å®?ä¸?å¼µ 48*48 ç?? png ç?¸ç??ã??"
-"å®?æ??ä»¥ base 64 ç·¨ç¢¼ä¸¦å?²å?æ?¼ ~/.evolution/faces é??æ??ç?¨å?¨æ?ªä¾?æ??å¯?å?ºç??é?µä»¶ä¸ã??"
+"å?¨å¤?å¯?ç??é?µä»¶ä¸é??å? å¤§é è²¼ç?§ç??ã??\n"
+"\n"
+"ç¬¬ä¸?æ¬¡ä½¿ç?¨æ??é??è¦?å??è¨å®?ä¸?å¼µ 48x48 ç?? PNG å??ç??ã??å®?æ??ä»¥ Base-64 ç·¨ç¢¼ä¸¦å?²å?æ?¼ ~/."
+"evolution/faces ã??é??æ??ç?¨å?¨æ?ªä¾?æ??å¯?å?ºç??é?µä»¶ä¸ã??"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾ ã??%sã??"
 
 #: ../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/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr "è¦?å??æ¶?è¨?é?± IMAP è³?æ??å¤¾ï¼?å?¯å?¨è³?æ??å¤¾æ¨¹ä¸å°?å®?æ??æ»?é¼ å?³é?µã??"
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "å??æ¶?è¨?é?±(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:79
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:413
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "è¼¸å?¥ä½¿ç?¨è?? %s ç??å¯?ç¢¼ä»¥å?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:516
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17625,45 +16333,40 @@ msgstr ""
 "ä¸?è?½å¾? Google ä¼ºæ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:690
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:725
 msgid "Retrieve _list"
 msgstr "å??å??æ¸?å?®(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:306
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>ä¼ºæ??å?¨</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "ç?¨ä¾?è¨å®? Google æ?¥æ??è??é?£çµ¡äººç??å¤?æ??ç¨?å¼?ã??"
+msgid "Add Google Calendars to Evolution."
+msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
 
 #: ../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-account-setup/camel-gw-listener.c:450
 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 è¡?äº?æ??è??é?£çµ¡äººä¾?æº?ç??å¤?æ??ç¨?å¼?ã??"
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "å? å?¥ Evolution å°? Novell GroupWise ç??æ?¯æ?´ã??"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "GroupWare å¸³è??è¨å®?"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17688,11 +16391,11 @@ msgstr ""
 "æ??ã??ç¹¼çº?ã??ä»¥å®?è£?å??äº«è³?æ??å¤¾\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "å®?è£?å??äº«è³?æ??å¤¾"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "å??äº«è³?æ??å¤¾å®?è£?"
 
@@ -17730,21 +16433,21 @@ msgstr "å??ç?¨(_E)"
 msgid "_Junk List"
 msgstr "å??å?¾é?µä»¶æ¸?å?®(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "é?µä»¶å??æ¶?"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
 msgstr "å??å??é?µä»¶å?¯è?½æ??å°?è©²é?µä»¶è?ªæ?¸ä»¶è??ç?? mailbox ç§»é?¤ã??æ?¨ç¢ºå®?è¦?é??éº¼å??ï¼?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "æ?¶å??é?µä»¶"
 
@@ -17753,88 +16456,80 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "å°? å?³é?? é?¸é ?å? å?¥ GroupWise è¨?æ?¯"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
+#, fuzzy
+#| msgid "A plugin for the features in GroupWise accounts."
+msgid "Fine-tune your GroupWise accounts."
 msgstr "æ??ä¾? GroupWise å¸³è??å??è?½ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 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
 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
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "å·²ç¶?æ??å??ç¨±ç?º &quot;{0}&quot; ç??å¸³è??å?å?¨ã??è«?æª¢æ?¥æ?¨ç??è³?æ??å¤¾çµ?æ§?ã??"
+
+#: ../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 ""
+"ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥æ?¨ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "ä¸?è?½è®?ä½¿ç?¨è?? &quot;{0}&quot; å?å??ä»£ç??ä¼ºæ??å?¨"
 
-#: ../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
 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
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "å·²ç¶?æ??å??ç¨±ç?º &quot;{0}&quot; ç??å¸³è??å?å?¨ã??è«?æª¢æ?¥æ?¨ç??è³?æ??å¤¾çµ?æ§?ã??"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "å¸³è??å·²å?å?¨"
-
-#: ../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."
-msgstr ""
-"ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥æ?¨ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-msgid "This is a recurring meeting"
-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
-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
-msgid "Would you like to decline it?"
-msgstr "æ?¨æ?³è¦?æ??çµ?å®?å??ï¼?"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "æ?¨ä¸?è?½è??æ??å®?ç??ä½¿ç?¨è?? &quot;{0}&quot; å??äº«é??å??è³?æ??å¤¾"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+#: ../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/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "æ?«æ??å¥?ç?¨"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+msgid "Rese_nd Meeting..."
+msgstr "é??å¯?æ??è°(_N)..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>ä½¿ç?¨è??ï¼?</b>"
@@ -17848,7 +16543,7 @@ msgid "Con_tacts..."
 msgstr "é?£çµ¡äºº(_T)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "é?µä»¶"
 
@@ -17931,10 +16626,10 @@ msgstr "<b>å¸³è??å??ç¨±</b>"
 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/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sè«?è¼¸å?¥ %s æ??é??ç??å¯?ç¢¼(ä½¿ç?¨è?? %s)"
@@ -17947,12 +16642,12 @@ 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
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ä»£ç??ä¼ºæ??å?¨é ?ç±¤å?ªæ??å?¨å¸³è??ä¸?ç·?æ??æ??æ??å?ºç?¾ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ä»£ç??ä¼ºæ??å?¨é ?ç±¤å?ªæ??å?¨å??ç?¨æ¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 
@@ -17960,95 +16655,95 @@ msgstr "ä»£ç??ä¼ºæ??å?¨é ?ç±¤å?ªæ??å?¨å??ç?¨æ¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 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:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "ä½¿ç?¨è??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "è¼¸å?¥ä½¿ç?¨è??ä¸¦è¨å®?æ¬?é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "æ?°å¢?å??äº«è³?æ??å¤¾(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "å??äº«"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "è?ªè¨?é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "æ?°å¢?"
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "ä¿®æ?¹"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "ä¸»æ?¨:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "å¯?ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "å»ºç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "å·²å?ªé?¤:"
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "è¿½è¹¤é?µä»¶ç??æ??..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "ç?¨ä¾?è¨å®? hula è¡?äº?æ??ä¾?æº?ç??å¤?æ??ç¨?å¼?ã??"
+msgid "Add Hula support to Evolution."
+msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
 
 #: ../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/imap-features/imap-headers.c:320
 msgid "Custom Headers"
@@ -18100,52 +16795,18 @@ msgstr ""
 "è?¥æ²?æ??é??ä¿¡è«?å£?é??æ¿¾å?¨å??å?¯ä½¿ç?¨æ¤é ?"
 
 #: ../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 ""
 
 #: ../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 "ç?¡æ³?è¼?å?¥ç¡¬é«?æ?½è±¡å±¤"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18153,7 +16814,7 @@ msgstr ""
 "ã??haldã??æ??å??æ?¯å¿?è¦?ç??ä½?ç?®å??ä¸¦æ?ªå?·è¡?ã??è«?å??ç?¨è©²æ??å??å¾?å??å??å?°æ?¬ç¨?å¼?ï¼?æ??è??é?£çµ¡æ?¨ç??"
 "ç³»çµ±ç®¡ç??è??ã??"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "æ??å°? iPod å¤±æ??"
 
@@ -18171,201 +16832,204 @@ 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:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr "å°?æ?¨ç??è³?æ??è?? Apple iPod å??æ¥å??ã??"
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod å??æ¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "è¼?å?¥è¡?äº?æ??ã??%sã??å¤±æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, 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:663
 #, 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:753
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??ä¸æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+msgid "Opening the calendar. Please wait.."
+msgstr "æ£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, 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:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºä¸?ç¢ºå®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??ä¸¦è¨ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è°å?¬é??äººå·²ç§»é?¤ä»£ç??äºº %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 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:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "æ??è°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "å·¥ä½?è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 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:1425
 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:1428
 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
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 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:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 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:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 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:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 "æ¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?è©²å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?ä»¶ã??å·¥ä½?æ??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 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:2335
 msgid "This meeting recurs"
 msgstr "é??å??æ??è°ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 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:2574
 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:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 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
+#: ../widgets/misc/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "ä»?å¤©"
 
@@ -18730,113 +17394,109 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "é??å??è¡?äº?æ??(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../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
-msgid "_Decline"
-msgstr "æ??çµ?(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "æ??çµ?(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "æ?¥å??(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "å?¨é?¨æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "å?¨é?¨æ?«è¨?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "æ?«è¨?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "å?¨é?¨æ?¥å??(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "å?³é??è³?è¨?(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "æ?´æ?°å?ºå¸ç??æ??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "é??å§?æ??é??:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "çµ?æ??æ??é??:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "è¨»è§£:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "å?³é??æ?´æ?°çµ¦å?°æ??è??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "å¥?ç?¨è?³æ??æ??å¯¦é«?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "é¡¯ç¤ºæ??é??ç?ºç©ºé??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1160
 #, fuzzy
 #| msgid "Attachment Reminder"
 msgid "_Inherit reminder"
-msgstr "é??å? æª?æ¡?æ??é??ç¨?å¼?"
-
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "å·¥ä½?(_T):"
+msgstr "é¡¯ç¤ºæ??é??(_R)"
 
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "å??å¿?é??:"
+msgid "_Memos:"
+msgstr "å??å¿?é??(_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "é¡¯ç¤ºé?µä»¶ä¸ç??æ??å?/è¡?äº?æ??é?¨å??ã??"
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "é¡¯ç¤ºé?µä»¶ä¸ç??ã??text/calendarã?? MIME é?¨å??ã??"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18862,13 +17522,13 @@ 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-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "è¦?å??ç?¨å¸³è??ï¼?å?¯å?¨è³?æ??å¤¾æ¨¹ä¸å°?å®?æ??æ»?é¼ å?³é?µã??"
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "ç?¼å?ºå?¶è?²æ??æ?æ?¾è?²é?³æª?æ¡?ã??"
@@ -18935,20 +17595,20 @@ msgstr "å??ç¤ºæ?¯å?¦è¦?é??ç??ã??"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:256
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
 
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Evolution ç??æ?°é?µä»¶é??ç?¥"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:389
 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
+#: ../plugins/mail-notification/mail-notification.c:468
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18963,109 +17623,140 @@ msgstr[1] ""
 "æ?¨å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? \n"
 "ä½?æ?¼ %sã??"
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:473
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "æ?¨å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 msgstr[1] "æ?¨å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:490
+#: ../plugins/mail-notification/mail-notification.c:495
 msgid "New email"
 msgstr "æ?°é?µä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:555
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??ä¸é¡¯ç¤ºå??ç¤º(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:558
 msgid "B_link icon in notification area"
 msgstr "è®?é??ç?¥å??å??ç¤ºé??ç??(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:560
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??ç¤ºä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:741
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "_Beep"
 msgstr "å?¶è?²(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:759
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Play _sound file"
 msgstr "æ?æ?¾è?²é?³æª?æ¡?(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:770
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Specify _filename:"
 msgstr "æ??å®?æª?æ¡?å??ç¨±(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:772
+#: ../plugins/mail-notification/mail-notification.c:761
 msgid "Pl_ay"
 msgstr "æ?æ?¾(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:818
 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/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "é?µä»¶é??ç?¥"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "å?¯ä»¥å¾?é?µä»¶è¨?æ?¯ç??å?§å®¹å»ºç«?æ??è°ç??å¤?æ??ç¨?å¼?ã??"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "è½?æ??ç?ºæ??è°(_V)"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "å¯?ä¿¡å?°æ??è°"
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "ç?¶æ?°é?µä»¶å?°é??æ??é??ç?¥æ?¨ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:343
 #, 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:350
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ¤ä¸?è?½å?¨é??è£¡å»ºç«?äº?ä»¶ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:353
 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:356
 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/mail-to-task.c:455
+#, c-format
+msgid "Could not create object. %s"
+msgstr "ç?¡æ³?å»ºç«?ç?©ä»¶ã??%s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:555
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "ä¸?è?½å??å¾?ä¾?æº?æ¸?å?®ã??%s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "è½?æ??ç?ºå·¥ä½?(_V)"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+msgid "Convert to a Mem_o"
+msgstr "è½?æ??ç?ºå??å¿?é??(_O)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "å¯?ä¿¡å?°å·¥ä½?"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Convert to a _Meeting"
+msgstr "è½?æ??ç?ºæ??è°(_M)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+msgid "Convert to a _Task"
+msgstr "è½?æ??ç?ºå·¥ä½?(_T)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+msgid "Convert to an _Event"
+msgstr "è½?æ??ç?ºäº?ä»¶(_E)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+msgid "Mail-to-Task"
+msgstr "é?µä»¶è½?å·¥ä½?"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Convert the selected message to a new event"
+msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??äº?ä»¶"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new meeting"
+msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??æ??è°"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+msgid "Convert the selected message to a new memo"
+msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??å??å¿?é??"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
 msgid "Convert the selected message to a new task"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?æ??ç?ºæ?°ç??å·¥ä½?"
 
@@ -19091,9 +17782,8 @@ msgid "Mailing _List"
 msgstr "é??ä¿¡è«?å£?(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "æ??ä¾?ä¸?è?¬é??ä¿¡è«?å£?æ??ä»¤ç??å??ä½? ï¼?è¨?é?±ã??å??æ¶?è¨?é?±â?¦ï¼?ã??"
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "å?·è¡?ä¸?è?¬é??ä¿¡è«?å£?æ??ä»¤ç??å??ä½? ï¼?è¨?é?±ã??å??æ¶?è¨?é?±ç?ç?â?¦ï¼?ã??"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19260,20 +17950,20 @@ 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 "ç?¨ä¾?å°?è³?æ??å¤¾ä¸?ç??æ??æ??é?µä»¶æ¨?è¨?ç?ºå·²è®?"
+msgid "Mark all messages in 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 è¼?å?¥å?¨"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "æ?¯æ?´ä»¥ Mono ç·¨å¯«ç??å¤?æ??ç¨?å¼?ã??"
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "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
@@ -19310,26 +18000,19 @@ msgstr "æ¦?è¦½"
 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"
-
 #. 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/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:189
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
@@ -19351,8 +18034,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 "Evolution ä¸ç??è¨å®?çµ?å??è³?æ??äº?ä»¶ï¼?å?ªä¾?é??ç?¼è??ä½¿ç?¨ï¼?ã??"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19367,44 +18050,74 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??äººè³?æ??å¤¾ (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:335
 msgid "_Journal entries"
 msgstr "æ?¥èª?é ?ç?®(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "å??è¨±å°?è¡?äº?æ??ç?¼ä½?ç?ºç¶²é ?"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 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.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "å°?è¡?äº?æ??ç?¼ä½?ç?ºç¶²é ?ã??"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "ç?¼ä½?è¡?äº?æ??è³?è¨?(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+msgid "Could not open %s:"
+msgstr "ç?¡æ³?é??å?? %sï¼?"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "ç?¡æ³?é??å?? %sï¼?æ?ªç?¥ç??é?¯èª¤"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "ç?¼ä½?å?° %s æ??ç?¼ç??é?¯èª¤ï¼?"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "ç?¼ä½?å?° %s å·²æ??å??çµ?æ??"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "æ??è¼? %s å¤±æ??ï¼?"
+
+#: ../plugins/publish-calendar/publish-calendar.c:620
 msgid "Are you sure you want to remove this location?"
 msgstr "ç¢ºå®?è¦?ç§»é?¤é??å??ä½?ç½®ï¼?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:784
+msgid "Could not create publish thread."
+msgstr "ç?¡æ³?å»ºç«?ç?¼ä½?å?·è¡?ç·?ã??"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">ä½?ç½®</span>"
@@ -19461,27 +18174,41 @@ msgstr ""
 msgid "Service _type:"
 msgstr "æ??å??é¡?å??(_T):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "Time _duration:"
+msgstr "æ??é??é?±æ??(_D):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "æª?æ¡?(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "å¯?ç¢¼(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "ç?¼ä½?ç?º(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "è¨?ä½?å¯?ç¢¼(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"æ?¥\n"
+"é?±\n"
+"æ??"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19489,11 +18216,17 @@ msgstr ""
 "iCal\n"
 "ç©ºé??/å¿?ç¢?"
 
-#: ../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:481
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "ç·¨è¼¯ä½?ç½®"
 
@@ -19521,175 +18254,135 @@ msgstr "å?¯ä»¥è¼?å?¥å?¶ä»?ä»¥ Python å¯«ç??å??è?½ç??å¤?æ??ç¨?å¼?ã??"
 msgid "Python Loader"
 msgstr "Python è¼?å?¥å?¨"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (å?§å»º)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "æ?¾ä¸?å?° SpamAssassinï¼?ä»£ç¢¼ï¼?%d"
 
-#: ../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
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "å»ºç«?å°?ç®¡å¤±æ??ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "fork ä¹?å¾?ç?¼ç??é?¯èª¤ï¼?%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 "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 "ç?å¾? 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 "å°?ç®¡è?³ SpamAssassin å¤±æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin ç?¡æ³?ä½¿ç?¨ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "é??æ??è®? SpamAssasin æ?´å?¯é? ï¼?ä½?é??åº¦è®?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 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 é??æ¿¾å??å?¾é?µä»¶ã??é??å??å¤?æ??ç¨?å¼?é??è¦?å®?è£? SpamAssassinã??"
+msgid "Filter junk messages using SpamAssassin."
+msgstr "ä½¿ç?¨ SpamAssassin é??æ¿¾å??å?¾é?µä»¶ã??"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin é?¸é ?"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin å??å?¾é?µä»¶é??æ¿¾å?¨"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
-
-#: ../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 "SpamAssassin é?¸é ?"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "æ??è¿°æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "å??é¡?æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 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:363
 msgid "Contact List"
 msgstr "é?£çµ¡äººæ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "é??å§?"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "çµ?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "ï¼?å·²å®?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "ç¶²å??"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "å?°æ??è??æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "å·²ä¿®æ?¹"
 
-#: ../plugins/save-calendar/csv-format.c:532
+#: ../plugins/save-calendar/csv-format.c:523
 msgid "Advanced options for the CSV format"
 msgstr "CSV æ ¼å¼?ç??é?²é??é?¸é ?"
 
-#: ../plugins/save-calendar/csv-format.c:539
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "Prepend a header"
 msgstr "é ?è¨ç??æª?é "
 
-#: ../plugins/save-calendar/csv-format.c:548
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Value delimiter:"
 msgstr "æ?¸å?¼å®?ç??ç¬¦:"
 
-#: ../plugins/save-calendar/csv-format.c:554
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Record delimiter:"
 msgstr "è¨?é??å®?ç??ç¬¦:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:551
 msgid "Encapsulate values with:"
 msgstr "ä»¥æ¤å°?è£?æ?¸å?¼:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "é??è??é??é??ç??æ?¸å?¼æ ¼å¼? (.csv)"
 
@@ -19698,8 +18391,8 @@ 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 "å°?é?¸å®?ç??è¡?äº?æ??æ??å·¥ä½?å?²å?è?³ç£?ç¢?ã??"
+msgid "Save a calendar or task list to disk."
+msgstr "å°?è¡?äº?æ??æ??å·¥ä½?å?²å?è?³ç£?ç¢?ã??"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -19714,21 +18407,21 @@ msgstr "å?²å?è?³ç£?ç¢?(_S)"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF æ ¼å¼? (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:158
 msgid "Select destination file"
 msgstr "é?¸å??ç?®ç??æª?æ¡?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "é?¸æ??ä¸?å??ä¾?æº?"
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "å¿«é??é?¸å??è¦?æª¢è¦?ç??å?®ä¸?è¡?äº?æ??æ??å·¥ä½?æ¸?å?®ã??"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "é?¸æ??è¦?æª¢è¦?ç??å?®ä¸?è¡?äº?æ??æ??å·¥ä½?ä¾?æº?ã??"
+msgid "Select One Source"
+msgstr "é?¸æ??ä¸?å??ä¾?æº?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -19750,15 +18443,15 @@ msgstr "æ??å¼?æ?¨å®?æ??å??å§?å¸³è??è¨å®?ã??"
 msgid "Setup Assistant"
 msgstr "è¨å®?å?©ç??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolution è¨å®?å?©ç??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "æ¡è¿?ä½¿ç?¨"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 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"
@@ -19770,35 +18463,35 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??æ??é??ç¹¼çº?ã?? "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "å?¯å?¥æª?æ¡?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 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:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "ä¾?è?ª %sï¼?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:529
 #, c-format
 msgid "Importing data."
 msgstr "å?¯å?¥è³?æ??ã??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:543
 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"
@@ -19819,15 +18512,15 @@ msgid ""
 "message body."
 msgstr "ä½¿ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå?/æ?¸å?¼çµ?æ¸?å?®ã??"
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "å?²å?ç?ºç¯?æ?¬(_T)"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "å?²å?ç?ºç¯?æ?¬"
 
@@ -19836,31 +18529,62 @@ 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
+msgid "Inline vCards"
+msgstr "è¡?å?§ vCard"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "ç?´æ?¥å?¨é?µä»¶ä¸é¡¯ç¤º vCardã??"
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "é¡¯ç¤ºå®?æ?´ç?? vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "é¡¯ç¤ºç²¾ç°¡ç?? vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+msgid "There is one other contact."
+msgstr "é??æ??é?£çµ¡äººã??"
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "é??æ?? %d å??å?¶ä»?é?£çµ¡äººã??"
+msgstr[1] "é??æ?? %d å??å?¶ä»?é?£çµ¡äººã??"
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+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:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "ç¶²å??:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??ä½¿ç?¨ Apache < 2.2.8)"
 
@@ -19945,43 +18669,61 @@ msgstr ""
 "gnome-keyring æ??ã??~/.gnome2_private/Evolutionã??ç??å¯?ç¢¼æª?æ¡?å??å¾?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "Initial attachment view"
+msgstr "å??å§?é??ä»¶æª¢è¦?"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Initial file chooser folder"
+msgstr "æª?æ¡?é?¸æ??å°?è©±ç??ç??å??å§?è³?æ??å¤¾"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser å°?è©±ç??ç??å??å§?è³?æ??å¤¾ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr "é??ä»¶å·¥å?·å??å??ä»¶ç??å??å§?æª¢è¦?ã??ã??0ã??æ?¯å??ç¤ºï¼?ã??1ã??æ?¯æ¸?å?®æª¢è¦?ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "ä¸?æ¬¡å??ç´?ç??çµ?æ??ç??æ?¬"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 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:21
 msgid "Non-proxy hosts"
 msgstr "ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ç??ä¸»æ©?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨æ??é?²è¡?èª?è?ç??å¯?ç¢¼ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "SOCKS ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "SOCKS ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19992,42 +18734,42 @@ msgstr ""
 "å?¼ã??ã??ã??ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ã??ã??ã??ä½¿ç?¨æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??å??ã??ä½¿ç?¨å?¨ autoconfig "
 "url ä¸æ??ä¾?ç??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "é¡¯ç¤ºå?´é??æ¬?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 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:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "ç??æ??å??è¨ç?ºé¡¯ç¤º"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 "Evolution ç??çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 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:35
 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:36
 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:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20035,19 +18777,19 @@ msgstr ""
 "ä¸?æ¬¡å??ç´?ç?? Evolution çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?"
 "ã??2.6.0ã??) ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "ç?¨å?¨å®?å?¨å¼? HTTP ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "socks ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20055,7 +18797,7 @@ msgstr ""
 "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/http_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?"
 "å? ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20063,7 +18805,7 @@ msgstr ""
 "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/secure_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??"
 "è¨?å? ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20072,7 +18814,7 @@ msgstr ""
 "å? ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "text", "icons", "both", "toolbar", "toolbar"
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20082,7 +18824,7 @@ msgstr ""
 "ã??toolbarã??(å·¥å?·å??)ã??å¦?æ??è¨ç?ºã??toolbarã??(å·¥å?·å??)ï¼?æ??é??ç??é¢¨æ ¼æ??ä¾? GNOME å·¥å?·å??"
 "è¨å®?å?¼æ±ºå®?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20093,57 +18835,57 @@ msgstr ""
 "æ©?å??ç¨±ã??ç¶²å??ï¼?é??é ä½¿ç?¨è?¬ç?¨å?å??å¦? *.foo.comï¼?ã??IP ä½?å??ï¼?IPv4 å?? IPv6 ç??å?¯ï¼?æ??"
 "å¸¶æ??å?ç¶²è·¯é?®ç½©ç??ä½?å??ï¼?å??æ?¯ 192.168.0.0/24ï¼?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "å·¥å?·å??å?¯ä»¥ç??å?°"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "æ??ä¾?ä»£ç??ä¼ºæ??å?¨çµ?æ??ç??ç¶²å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨æ??ç?¨ä¾?é©?è?ç??ä½¿ç?¨è??å??ç¨±ã??"
 
 # zh_HK: msgstr "Evolution æ?¯å?¦ä»¥é?¢ç·?æ¨¡å¼?å??å??å??ä»£ç·?ä¸?æ¨¡å¼?ã??"
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 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:51
 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:52
 msgid "Whether the sidebar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å?´é??æ¬?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "æ?¯å?¦é¡¯ç¤ºç??æ??å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å·¥å?·å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "æ?¯å?¦ç??ç?¥ Evulution é??ç?¼ç??æ?¬ç??è¦å??å°?è©±ç??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "è¦?çª?æ??é??é¢¨æ ¼"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
@@ -20159,21 +18901,21 @@ msgstr "ä½?ç?¨ä¸ç??é?£ç·?"
 msgid "Click OK to close these connections and go offline"
 msgstr "æ??ã??ç¢ºå®?ã??é??é??é??äº?é?£ç·?ä»¥é?¢ç·?"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "é?¸å??è¦?å?¯å?¥ Evolution ç??æª?æ¡?ï¼?ä¸¦ä¸?å?¨æ¸?å?®å?§é?¸å??æª?æ¡?é¡?å??ã??"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "é?¸æ??æ¤è¼¸å?¥ç??ç?®ç??å?°"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20185,58 +18927,62 @@ msgstr ""
 "è¼¸å?¥ç??è¨å®?å?¼ã??å¦?æ??æ?¨æ?³\n"
 "å??è©¦ä¸?æ¬¡ï¼?è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??æ??é??ã??\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "æª?æ¡?å??ç¨±(_I):"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "å¾?è??ç¨?å¼?è¼¸å?¥è³?æ??å??è¨å®?å?¼(_O)"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "å?¯å?¥å?®ä¸?æª?æ¡?(_S)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:724
+msgid "_Import"
+msgstr "å?¯å?¥(_I)"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "Evolution å??å¥½è¨å®?"
 
 #. 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
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "ç³»çµ±ä¼¼ä¹?æ²?æ??å®?è£? GNOME Pilot å·¥å?·ã??"
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
-msgid "Error executing %s."
-msgstr "å?·è¡? %s ç?¼ç??é?¯èª¤ã??"
+msgid "Error executing %s. (%s)"
+msgstr "å?·è¡? %s ç?¼ç??é?¯èª¤ã??(%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "æ?ªå®?è£?è¨è¨?é?¯èª¤é?¨ä»½ã??"
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "ç?¡æ³?å?·è¡? Bug buddyã??"
 
 #. 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-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
@@ -20247,87 +18993,87 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "Evolution ç¶²ç«?"
 
 # zh_HK: msgstr "ç·?ä¸?å·¥ä½?(_W)"
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "ç·?ä¸?å·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "é?¢ç·?å·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "é?¢ç·?å·¥ä½?"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution æ£å?¨é?¢ç·?ç??ç¨?åº?ä¸ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 
-#: ../shell/e-shell-window.c:787
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ??è?³ %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "ä¸?æ??ç??ç³»çµ±é?¯èª¤ã??"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "ç¢ºå®?"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "ç?¡æ??ç??å¼?æ?¸"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "ä¸?è?½æ?¼ OAF è¨»å??"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "æ?¾ä¸?å?°çµ?æ??è³?æ??åº«"
 
-#: ../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-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "æ?°å¢?"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "æ?°æ¸¬è©¦"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "æ¸¬è©¦(_T)"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "å»ºç«?æ?°ç??æ¸¬è©¦é ?ç?®"
 
@@ -20370,7 +19116,7 @@ msgstr ""
 "å?¯å?¥å?° Evolutionã??"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20405,7 +19151,7 @@ msgstr ""
 "æ??å??å¸?æ??æ?¨äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??æ?¨æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20413,44 +19159,44 @@ msgstr ""
 "è¬?è¬?\n"
 "Evolution å°?çµ?æ?¬ä¸?\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??ä»¶"
 
 # zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "å¼·å?¶é??é??æ??æ?? Evoultion å??ä»¶"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??ä»¶ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??é?£çµ¡äººå??å·¥ä½?ç??é ?è¦½çª?æ ¼ã??"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20601,7 +19347,7 @@ msgstr ""
 "\n"
 "ç·¨è¼¯ä¿¡ä»»è¨å®?å?¼ï¼?"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20610,7 +19356,7 @@ msgstr ""
 "å? ç?ºæ?¨ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¿¡ä»»æ¤æ??è?ç??æ??æ??"
 "æ?§ã??"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20619,51 +19365,51 @@ msgstr ""
 "å? ç?ºæ?¨ä¸?ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¸?ä¿¡ä»»æ¤æ??è?ç??æ??"
 "æ??æ?§ã??"
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "é?¸å??è¦?å?¯å?¥ç??æ??è?..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:145
 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:398
+#: ../smime/gui/certificate-manager.c:625
 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:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "æ??è?å??ç¨±"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 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:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "åº?è??"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "å?°æ??"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "æ??æ??ç??é?»å?é?µä»¶æ??è?æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "é?»å?é?µä»¶å?°å??"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "æ??æ??ç?? CA æ??è?æª?æ¡?"
 
@@ -20765,7 +19511,7 @@ msgstr ""
 "ä¿¡ä»»æ¤æ??è?ç®¡ç??ä¸å¿?ä¹?å??ï¼?å¦?æ??å?¯ä»¥ç??è©±ï¼?æ?¨æ??è©²å??æª¢æ?¥å®?ç??æ??è?ä»¥å??å®?ç??æ?¿ç?å??ç¨?"
 "åº?ã??"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "æ??è?"
 
@@ -20841,11 +19587,11 @@ msgstr "çµ?ç¹?å?®ä½? (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 æ??ç´?"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../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.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL ä¼ºæ??å?¨æ??è?"
 
@@ -20891,7 +19637,7 @@ msgid "_Edit CA Trust"
 msgstr "ç·¨è¼¯æ??è?ç®¡ç??ä¸å¿? (_CA) ä¿¡ä»»åº¦"
 
 #. 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 "æ??è?å·²ç¶?å?å?¨"
 
@@ -20900,161 +19646,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 "PKCS #1 MD2 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "æ??è?é??é?°ä½¿ç?¨"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "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 "æ??è?ç°½ç« å?¼"
 
@@ -21204,7 +19950,7 @@ msgstr "å°?é?¸å??ç??é?£çµ¡äººå?²å?ç?º VCard"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "å°?é?¸å®?è³?æ??å¤¾ä¸ç??é?£çµ¡äººå?²å?ç?º VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2721
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "å?¨é?¨é?¸å??"
 
@@ -21338,7 +20084,7 @@ msgid "Month"
 msgstr "æ??"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
@@ -21347,8 +20093,8 @@ msgstr "ä¸?ä¸?å??"
 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
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
@@ -21659,7 +20405,7 @@ msgstr "ç?¸é??é?µä»¶æ¸?å?®"
 msgid "_Group By Threads"
 msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "é?µä»¶(_M)"
@@ -21914,201 +20660,185 @@ 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)"
 
 # zh_HK: msgstr "é ?è¦½é??è¦?æ??å?°ç??é?µä»¶"
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "é ?è¦½é??è¦?æ??å?°ç??é?µä»¶"
 
 # zh_HK: msgstr "æ??å?°é?µä»¶"
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "æ??å?°é?µä»¶"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ??æ??å?æª?æ¡?"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "é?¸å??æ??æ??æ??å?(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "é?¸æ??é?µä»¶ä¸ç??æ??æ??æ??å?"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "è¨å®?æ?¨ç?®å??å?°è¡¨æ©?ç??ç??é?¢è¨å®?"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "é??ä»¶(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "æ¼?å?æ¨¡å¼?(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "æ¸?é?¤æ¨?å¹?(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "å?ªé?¤é?µä»¶(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "æ¨?å¹?å·²å®?æ??(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "ç§»è?³(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "é?µä»¶ä¾?æº?(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "æ£å¸¸å¤§å°?(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "å·²é?±è®?(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "å?²å?é?µä»¶(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "æ?ªé?±è®?(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "ç¸®æ?¾(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
@@ -22473,11 +21203,11 @@ msgid "With _Status"
 msgstr "è¨å®?ç??æ??(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c: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:421
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:423
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:425
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:764
 msgid "UTC"
 msgstr "UTC"
 
@@ -22506,19 +21236,19 @@ msgstr ""
 "ä½¿ç?¨æ»?é¼ å·¦é?µæ??è¿?å?°å??ç??å??å??ï¼?ç?¶å¾?é?¸å??æ??å??ã??\n"
 "ä½¿ç?¨æ»?é¼ å?³é?µæ??é? ã??"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../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-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "å®?ç¾© %s ç??æª¢è¦?"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "å®?ç¾©æª¢è¦?"
 
@@ -22528,17 +21258,16 @@ 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:281
 msgid "Save Current View"
 msgstr "å?²å?ç?®å??æª¢è¦?"
 
@@ -22551,17 +21280,17 @@ 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
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "è?ªè¨?æª¢è¦?"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "å?²å?è?ªè¨?æª¢è¦?"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "å®?ç¾©æª¢è¦?..."
 
@@ -22569,32 +21298,32 @@ msgstr "å®?ç¾©æª¢è¦?..."
 msgid "C_urrent View"
 msgstr "ç?®å??æª¢è¦?(_U)"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "é?¸æ??æª¢è¦?ï¼?%s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "ç?®å??ç??æª¢è¦?æ?¹å¼?æ?¯è?ªè¨?ç??æª¢è¦?"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "å?²å?è?ªè¨?æª¢è¦?..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "å?²å?ç?®å??ç??è?ªè¨?æª¢è¦?"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "å»ºç«?æ??ç·¨è¼¯æª¢è¦?(_C)"
 
-#: ../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:103
 msgid "Define New View"
 msgstr "å®?ç¾©æ?°ç??æª¢è¦?"
 
@@ -22610,64 +21339,166 @@ msgstr "æª¢è¦?ç??é¡?å??"
 msgid "Type of view:"
 msgstr "æª¢è¦?ç??é¡?å??:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "é??å? æª?æ¡?å??"
+#: ../widgets/misc/e-attachment.c:940
+msgid "Attached message"
+msgstr "é??å? ç??é?µä»¶"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2261
+#: ../widgets/misc/e-attachment-store.c:636
+msgid "attachment.dat"
+msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2567
+msgid "A load operation is already in progress"
+msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?ä¸"
+
+#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2575
+msgid "A save operation is already in progress"
+msgstr "å?²å?æ??ä½?å·²å?¨é?²è¡?ä¸"
+
+#: ../widgets/misc/e-attachment.c:1871
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "ä¸?è?½é??å? æª?æ¡? %sï¼? %s"
+msgid "Could not load '%s'"
+msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:1874
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "ä¸?è?½é??å? æª?æ¡? %sï¼?ä¸?æ?¯ä¸?å??å??æ³?ç??æª?æ¡?"
+msgid "Could not load the attachment"
+msgstr "ç?¡æ³?è¼?å?¥é??ä»¶"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2138
+#, c-format
+msgid "Could not open '%s'"
+msgstr "ç?¡æ³?é??å??ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:2141
+#, c-format
+msgid "Could not open the attachment"
+msgstr "ç?¡æ³?é??å??é??ä»¶"
+
+#: ../widgets/misc/e-attachment.c:2583
+msgid "Attachment contents not loaded"
+msgstr "ç?¡æ³?è¼?å?¥é??ä»¶å?§å®¹"
+
+#: ../widgets/misc/e-attachment.c:2660
+#, c-format
+msgid "Could not save '%s'"
+msgstr "ç?¡æ³?å?²å?ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:2663
+#, c-format
+msgid "Could not save the attachment"
+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-handler-image.c:95
+msgid "Could not set as background"
+msgstr "ç?¡æ³?è¨ç?ºè??æ?¯"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "ç?¡æ³?é??å?ºé??ä»¶ã??"
+msgstr[1] "ç?¡æ³?é??å?ºé??ä»¶ã??"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "å?³é??è?³(_S)..."
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME é¡?å??:"
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr "å?³é??é?¸å??ç??é??ä»¶å?°å?¥è??"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶"
+#: ../widgets/misc/e-attachment-icon-view.c:473
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "è¼?å?¥ä¸"
+
+#: ../widgets/misc/e-attachment-icon-view.c:485
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "å?²å?ä¸"
+
+#: ../widgets/misc/e-attachment-paned.c:81
+msgid "Hide _Attachment Bar"
+msgstr "é?±è??é??å? æª?æ¡?å??(_A)"
+
+#: ../widgets/misc/e-attachment-paned.c:83
+#: ../widgets/misc/e-attachment-paned.c:620
+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] "å?²å?é??ä»¶"
+msgstr[1] "å?²å?é??ä»¶"
+
+#: ../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 "å? å?¥é??ä»¶(_A)..."
+
+#: ../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 ä¸é??å??é??å??é??ä»¶"
 
 #. 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 å¹´ %-m æ??"
 
-#: ../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:3641
-#: ../widgets/text/e-text.c:3642
+#: ../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:3648
-#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3656
-#: ../widgets/text/e-text.c:3657
+#: ../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:3663
-#: ../widgets/text/e-text.c:3664
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "å¡«å?¥ç¶²é»?"
 
@@ -22691,26 +21522,25 @@ 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:1004
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../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:1005
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../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
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "ç?¾å?¨"
 
@@ -22719,7 +21549,7 @@ msgstr "ç?¾å?¨"
 msgid "The time must be in the format: %s"
 msgstr "æ??é??å¿?é ?ç?ºæ¤æ ¼å¼?ï¼?%s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å?"
 
@@ -22818,144 +21648,90 @@ msgstr "å?¶å®?..."
 msgid "Ch_aracter Encoding"
 msgstr "å?å??ç·¨ç¢¼(_A)"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?è¼¸å?¥æ?¥æ??ç??æ??å?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "æ??æ¤æ??é??ä»¥é¡¯ç¤ºè¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "ç?¾å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "ä»?å¤©(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1613
 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
-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 "æ¨?ç±¤å??ä»¶"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "å?¯æ?¼ä¸?è?¬å±?é??å?¨æ¨?ç±¤ä¸é¡¯ç¤ºç??å??ä»¶"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "å±?é??å?¨å¤§å°?"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "å±?é??å?¨ç®è??ç??å¤§å°?"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "æ??ç¤ºå?¨é??è·?"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "å±?é??å?¨ç®é å?¨å??ç??é??è·?"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "å?²å?æ??å°?çµ?æ??"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "æ??å°?(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "æ??å°?"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "å?²å?æ??å°?çµ?æ??(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "ç·¨è¼¯å?²å?ç??æ??å°?çµ?æ??(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "é?²é??æ??å°?(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "æ??æ??ç??å¸³è??"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "ç?®å??ç??å¸³è??"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "ç?®å??ç??è³?æ??å¤¾"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "ç?®å??ç??é?µä»¶"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:166
 msgid "Choose Image"
 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."
@@ -22971,102 +21747,100 @@ msgstr "ä¸?ç·?"
 msgid "The button state is online"
 msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../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
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "ç©ºç?½é?µä»¶"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "å??æµ?æ¨¡å¼?"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 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
+#: ../widgets/misc/e-search-bar.c:339 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:339 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "æ??é??è£¡ä»¥æ?¹è®?æ??å°?é¡?å??"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "ç«?å?³æ??å°?(_F)"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "æ¸?é?¤(_C)"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "é ?ç?® ID"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3563
-#: ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 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
+#: ../widgets/misc/e-search-bar.c:1011
 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
+#: ../widgets/misc/e-search-bar.c:1030
 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
+#: ../widgets/misc/e-search-bar.c:1046
 msgid " i_n "
 msgstr " i_n "
 
-#: ../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:519
 msgid "When de_leted:"
 msgstr "å?ªé?¤æ??(_L):"
 
@@ -23090,19 +21864,19 @@ msgstr "<b>ç??æ??è¿½è¹¤</b>"
 msgid "A_uto-delete sent item"
 msgstr "è?ªå??å?ªé?¤é ?ç?®(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "å»ºç«?æ?°ç??å?³é??é ?ç?®è?³è¿½è¹¤è³?è¨?(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "å·²é??é??è??å·²é??å??(_V)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "ä¸?è?¬é?¸é ?(_R)"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23110,7 +21884,7 @@ msgstr ""
 "ç?¡\n"
 "è®?ä¿¡å??æ¢?"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23126,15 +21900,15 @@ msgstr ""
 "æ¥µæ©?å¯?\n"
 "å?ªæ??æ?¨è?½ç??"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "è¦?æ±?å??è¦?(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "ç??æ??è¿½è¹¤(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23146,30 +21920,34 @@ msgstr ""
 "æ¨?æº?\n"
 "ä½?"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "ç?¶æ?¥å??æ??(_P):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "ç?¶å®?æ??æ??(_M):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "ç?¶æ??çµ?æ??(_N):"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "æ?¼å?§(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "ä¹?å¾?(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "å?¨é?¨è³?è¨?(_A)"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr "æ¸é¡?(_C):"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23196,43 +21974,27 @@ 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
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. 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
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% å®?æ??)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../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/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "å±¬æ?¼é??äº?å??é¡?ç??é ?ç?®(_C):"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "å?¯ç?¨ç??å??é¡?(_A):"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "å??é¡?"
-
-#: ../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
+#: ../widgets/table/e-cell-date.c:63
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
@@ -23248,23 +22010,23 @@ msgstr "è??ç?¦ç??æ¬?"
 msgid "Unselected Column"
 msgstr "æ?ªé?¸æ??ç??æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "å?ªé?¤ç·?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "åº?ç·?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "ç²?é«?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "è?²å½©æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "è??æ?¯è?²å½©æ¬?"
 
@@ -23288,12 +22050,12 @@ msgstr "æ?ªæ??åº?"
 msgid "No grouping"
 msgstr "æ?ªçµ?æ??ç¾¤çµ?"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "é¡¯ç¤ºæ¬?ä½?"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "å?¯ç?¨ç??æ¬?ä½?"
 
@@ -23302,7 +22064,7 @@ 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-header-item.c:1579
 msgid "Ascending"
 msgstr "é??å¢?"
 
@@ -23315,7 +22077,7 @@ 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-header-item.c:1579
 msgid "Descending"
 msgstr "é??æ¸?"
 
@@ -23375,21 +22137,7 @@ msgstr "ä¾?åº?é¡¯ç¤ºé??äº?æ¬?ä½?(_S):"
 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 "DnD ç¢¼"
-
-#: ../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 "å? å?¥ä¸?æ¬?..."
 
@@ -23405,310 +22153,1254 @@ msgstr ""
 "æ?³å?¨æ?¨ç??è¡¨æ ¼ä¸å? å?¥æ¬?ä½?ï¼?å?ªè¦?å°?å®?\n"
 "æ??æ?³è?³æ?¨å¸?æ??å®?å?ºç?¾ç??ä½?ç½®å?³å?¯ã??"
 
-#: ../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 å??é ?ç?®)"
 msgstr[1] "%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 å??é ?ç?®)"
 msgstr[1] "%s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../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:3028 ../widgets/table/e-table-item.c:3029
+#: ../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:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../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:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../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:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../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:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../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:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../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:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../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:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../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:3056 ../widgets/table/e-table-item.c:3057
+#: ../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:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../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:3021 ../widgets/table/e-table-item.c:3022
+#: ../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:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../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:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../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:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../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:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../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:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../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:1449
 msgid "Customize Current View"
 msgstr "è?ªè¨?ç?®å??ç??æª¢è¦?"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "é??å¢?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "é??æ¸?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "ä¸?æ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "ä¾?æ¤æ¬?ä½?å??ç¾¤çµ?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "ä¾?æ?¹å¡?ç?ºç¾¤çµ?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "ç§»é?¤æ¤æ¬?(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "å? å?¥ä¸?æ¬?(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "æ??å??(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "æ??é?©å¡«æ»¿(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??æ¬?(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "è?ªè¨?ç?®å??ç??æª¢è¦?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 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:3338 ../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:3345
+#: ../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-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:2733
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "å±?é??å?¨å¤§å°?"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "å±?é??å?¨ç®è??ç??å¤§å°?"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "è¼¸å?¥æ³?"
 
-#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "äº?ä»¶è??ç??å?¨"
 
-#: ../widgets/text/e-text.c:3570 ../widgets/text/e-text.c:3571
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "ç²?é«?"
 
-#: ../widgets/text/e-text.c:3577 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "å?ªé?¤ç·?"
 
-#: ../widgets/text/e-text.c:3584 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "é?¨é»?"
 
-#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "å·¦å?³å°?é½?"
 
-#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "å?ªè¼¯å¯¬åº¦"
 
-#: ../widgets/text/e-text.c:3606 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "å?ªè¼¯é«?åº¦"
 
-#: ../widgets/text/e-text.c:3613 ../widgets/text/e-text.c:3614
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "å?ªè¼¯"
 
-#: ../widgets/text/e-text.c:3620 ../widgets/text/e-text.c:3621
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "å¡«æ»¿å?ªè¼¯æ?¹å¡?"
 
-#: ../widgets/text/e-text.c:3627 ../widgets/text/e-text.c:3628
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X ä½?ç§»"
 
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y ä½?ç§»"
 
-#: ../widgets/text/e-text.c:3670 ../widgets/text/e-text.c:3671
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "æ??å?å¯¬åº¦"
 
-#: ../widgets/text/e-text.c:3677 ../widgets/text/e-text.c:3678
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "æ??å?é«?åº¦"
 
-#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "ä½¿ç?¨ç??ç?¥è??"
 
-#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "æ©¢å??"
 
-#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "æ??è¡?"
 
-#: ../widgets/text/e-text.c:3713 ../widgets/text/e-text.c:3714
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "ä¸æ?·å?å??"
 
-#: ../widgets/text/e-text.c:3720 ../widgets/text/e-text.c:3721
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "æ??å¤§è¡?æ?¸"
 
-#: ../widgets/text/e-text.c:3742 ../widgets/text/e-text.c:3743
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "ç¹ªè£½æ¡?ç·?"
 
-#: ../widgets/text/e-text.c:3749 ../widgets/text/e-text.c:3750
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "å??è¨±æ?°è¡?"
 
-#: ../widgets/text/e-text.c:3756 ../widgets/text/e-text.c:3757
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "ç¹ªè£½è??æ?¯"
 
-#: ../widgets/text/e-text.c:3763 ../widgets/text/e-text.c:3764
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "ç¹ªè£½æ??é??"
 
-#: ../widgets/text/e-text.c:3770 ../widgets/text/e-text.c:3771
+#: ../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:3778 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "IM å¿«é¡¯è¦?çª?"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
 
-#~ msgid ""
-#~ "We were unable to open this address book.  This either means you have "
-#~ "entered an incorrect URI, or the LDAP server is unreachable."
-#~ msgstr ""
-#~ "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??è¡¨ç¤ºæ?¨è¼¸å?¥é?¯èª¤ç?? URIï¼?æ??ç?¡æ³?é?£ç·? LDAP ä¼ºæ??å?¨ã??"
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "å??æ??é??å? æª?æ¡?å??"
+
+#~ msgid "activate"
+#~ msgstr "ä½¿ä½?ç?¨"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>é¡?å??:</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "æ?°å¢?é??è¨?é??"
+
+#~ msgid "Anonymously"
+#~ msgstr "å?¿å??"
+
+#~ msgid "Basic"
+#~ msgstr "å?ºæ?¬"
+
+#~ msgid "Distinguished name"
+#~ msgstr "å?¯è¾¨è?å??ç¨±"
+
+#~ msgid "Email address"
+#~ msgstr "é?»å?é?µä»¶å?°å??"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?"
+
+#~ msgid "Search filter"
+#~ msgstr "æ??å°?é??æ¿¾å?¨"
+
+#~ msgid "Sub"
+#~ msgstr "å?ç?®é??"
+
+#~ msgid "Using email address"
+#~ msgstr "ä½¿ç?¨é?»å?é?µä»¶ä½?å??"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "æ¯?æ¬¡å?¯è?½ç??æ??å??"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "æ?°å¢?é??è¨?é??(_A)"
+
+#~ 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 "æ?¼å³¶"
+
+#~ 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 "Mayotte"
+#~ 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 "Seychelles"
+#~ 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 Instant Messenger"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo Messenger"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu Messenger"
+
+#~ 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 "Dr."
+#~ msgstr "Dr."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "Jr."
+
+#~ msgid "Miss"
+#~ msgstr "Miss"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Sr."
+#~ msgstr "Sr."
+
+#~ msgid "Add IM Account"
+#~ msgstr "æ?°å¢? IM å¸³è??"
+
+#~ msgid "_Account name:"
+#~ msgstr "å¸³è??å??ç¨±(_A):"
+
+#~ msgid "_IM Service:"
+#~ msgstr "_IM æ??å??:"
+
+#~ 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 "Format"
+#~ msgstr "æ ¼å¼?"
+
+#~ msgid "Header/Footer"
+#~ msgstr "é ?é¦?/é ?å°¾"
+
+#~ msgid "Headings"
+#~ msgstr "æª?é "
+
+#~ msgid "Headings for each letter"
+#~ msgstr "æ¯?å°?ä¿¡ç??æª?é "
+
+#~ msgid "Height:"
+#~ msgstr "é«?åº¦:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "ä¸?å??ç·?æ?¥è??å?¦ä¸?å??"
+
+#~ msgid "Include:"
+#~ msgstr "å??å?«:"
+
+#~ msgid "Landscape"
+#~ msgstr "æ©«å??"
+
+#~ msgid "Left:"
+#~ msgstr "å·¦:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "å?æ¯?æ¨?ç±¤æ?¼æ??é??"
+
+#~ msgid "Margins"
+#~ msgstr "é??ç??"
+
+#~ msgid "Number of columns:"
+#~ msgstr "æ¬?æ?¸:"
+
+#~ msgid "Options"
+#~ msgstr "é?¸é ?"
+
+#~ msgid "Orientation"
+#~ msgstr "ç´?å¼µæ?¹å??"
+
+#~ msgid "Page"
+#~ msgstr "é ?"
+
+#~ msgid "Page Setup:"
+#~ msgstr "é ?é?¢è¨å®?:"
+
+#~ msgid "Paper"
+#~ msgstr "ç´?å¼µ"
+
+#~ msgid "Paper source:"
+#~ msgstr "ç´?å¼µä¾?æº?:"
+
+#~ msgid "Portrait"
+#~ msgstr "ç?´å??"
+
+#~ msgid "Preview:"
+#~ msgstr "é ?è¦½:"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]