Updated Traditional Chinese translation.

2005-11-27 Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> * zh_TW.po: Updated Traditional Chinese translation. svn path=/trunk/; revision=30688
author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> 2005-11-27 06:52:15 +0800
committer: Chao-Hsiung Liao <chliao@src.gnome.org> 2005-11-27 06:52:15 +0800
commit: d1fc1e7bce39241c0d21ba87116089b643b1784c (patch)
tree: 9a6a0d74574858b293b8c7503ba81c262fadf643 /po/zh_TW.po
parent: 59d486de79a5940919071fa7ca7bbbae96cb87cc (diff)
download: gsoc2013-evolution-d1fc1e7bce39241c0d21ba87116089b643b1784c.tar.gz
gsoc2013-evolution-d1fc1e7bce39241c0d21ba87116089b643b1784c.tar.zst
gsoc2013-evolution-d1fc1e7bce39241c0d21ba87116089b643b1784c.zip
1 files changed, 1738 insertions, 2623 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7dc890b8c5..d8731d29d3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,14 +4,14 @@
 # Chao-Hsiung Liao <pesder.liao@msa.hinet.net>, 2003.
 # Craig Jeffares <cjeffares@novell.com>,2004.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.4.0\n"
+"Project-Id-Version: evolution 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-21 18:48+0800\n"
-"PO-Revision-Date: 2005-10-20 14:37+0800\n"
+"POT-Creation-Date: 2005-11-27 06:43+0800\n"
+"PO-Revision-Date: 2005-11-26 20:19+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# Novell Translation
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:169
@@ -28,7 +27,6 @@ msgid "evolution addressbook"
 msgstr "Evolution 通訊錄"
 
 # ui/evolution-addressbook.xml.h:7
-# Novell Translation
 #: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:225
 msgid "New Contact"
@@ -40,7 +38,6 @@ msgstr "新連絡人"
 msgid "New Contact List"
 msgstr "新增連絡人清單"
 
-# Novell Translation
 #: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
 msgid "current addressbook folder has %d card"
@@ -49,13 +46,11 @@ msgstr[0] "目前的通訊錄資料夾有 %d 張名片"
 msgstr[1] "目前的通訊錄資料夾有 %d 張名片"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:968
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "開啟"
 
 # ui/evolution-addressbook.xml.h:17
-# Novell Translation
 #: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
 msgstr "連絡人清單: "
@@ -66,7 +61,6 @@ msgid "Contact: "
 msgstr "連絡人: "
 
 # ui/evolution.xml.h:17
-# Novell Translation
 #: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
 msgstr "Evolution 迷你名片"
@@ -170,7 +164,6 @@ msgid "calendar view for one or more days"
 msgstr "用於一或多日的行事曆檢視"
 
 # calendar/gui/print.c:1093
-# Novell Translation
 #: ../a11y/calendar/ea-gnome-calendar.c:187
 #: ../calendar/gui/calendar-component.c:660
 msgid "%A %d %b %Y"
@@ -205,7 +198,6 @@ msgstr "%a %d %b %Y"
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-# Novell Translation
 #: ../a11y/calendar/ea-gnome-calendar.c:216
 #: ../a11y/calendar/ea-gnome-calendar.c:222
 #: ../a11y/calendar/ea-gnome-calendar.c:228
@@ -365,7 +357,6 @@ msgid "Combo Button"
 msgstr "組合按鈕"
 
 # mail/mail-config.glade.h:21
-# Novell Translation
 #: ../a11y/widgets/ea-combo-button.c:50
 msgid "Activate Default"
 msgstr "使用預設值"
@@ -380,12 +371,10 @@ msgid ""
 "with the same address anyway?"
 msgstr "此連絡人的電子郵件地址已經存在。您無論如何都要加入同樣位址的新名片嗎？"
 
-# Novell Translation
 #: ../addressbook/addressbook.error.xml.h:2
 msgid "Address '{0}' already exists."
 msgstr "通訊錄「{0}」已存在"
 
-# Novell Translation
 #: ../addressbook/addressbook.error.xml.h:3
 msgid "Cannot move contact."
 msgstr "無法移動連絡人。"
@@ -395,7 +384,6 @@ msgstr "無法移動連絡人。"
 msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
 
-# Novell Translation
 #: ../addressbook/addressbook.error.xml.h:5
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
@@ -406,69 +394,74 @@ msgstr ""
 "區分大小寫；您可能啟動了大寫鎖定鍵。"
 
 # camel/camel-movemail.c:306
-# Novell Translation
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
 msgstr "無法取得 LDAP 伺服器的綱要資訊。"
 
 # camel/camel-provider.c:140
-# Novell Translation
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not remove addressbook."
 msgstr "無法移除通訊錄。"
 
-# Novell Translation
 #: ../addressbook/addressbook.error.xml.h:8
+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."
+msgstr ""
+"目前您只能存取 Evolution 中的 GroupWise 系統通訊錄。請使用一次其他的 "
+"GroupWise 郵件客戶端，以取得您的 GroupWise 常用連絡人及 Groupwise 個人連絡人"
+"資料夾。"
+
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
 msgstr "刪除通訊錄「{0}」？"
 
 # composer/e-msg-composer.c:805
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Error loading addressbook."
 msgstr "載入通訊錄發生錯誤。"
 
 # shell/e-shell-importer.c:404
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Error saving {0} to {1}: {2}"
 msgstr "將 {0} 儲存至 {1} 發生錯誤： {2}"
 
 # camel/providers/imap/camel-imap-store.c:531
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
 msgstr "無法驗證 LDAP 伺服器。"
 
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "GroupWise Address book creation:"
+msgstr "GroupWise 通訊錄的建立"
+
 # camel/providers/imap/camel-imap-command.c:487
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 伺服器未回應有效的綱要資訊。"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
 msgstr "伺服器版本"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 #: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr "某些功能可能無法在您目前的伺服器版本上正常運作"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution 通訊錄已經意外結束。"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:18
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "你所選擇的圖片太大。您是否要改變大小後才儲存它？"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -478,60 +471,50 @@ msgstr ""
 "管理員，瞭解支援的搜尋基礎。"
 
 # addressbook/conduit/address-conduit.c:201
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "This address book will be removed permanently."
 msgstr "此通訊錄將被永遠移除。"
 
 # addressbook/conduit/address-conduit.c:201
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "This addressbook could not be opened."
 msgstr "無法開啟此通訊錄。"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "此通訊錄伺服器沒有任何建議的搜尋基礎。"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr "此通訊錄伺服器無法連線，或伺服器名稱可能拼錯，或您的網路連線已經停止。"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此伺服器不支援 LDAPv3 綱要資訊。"
 
 # addressbook/gui/widgets/e-minicard-control.c:282
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "Unable to open addressbook"
 msgstr "無法開啟通訊錄"
 
 # executive-summary/component/e-summary.c:940
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "Unable to perform search."
 msgstr "無法執行搜尋。"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to save {0}."
 msgstr "無法儲存 {0}。"
 
 # calendar/gui/dialogs/save-comp.c:51
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Would you like to save your changes?"
 msgstr "要儲存所做的變更？"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -539,7 +522,7 @@ msgstr ""
 "您正在嘗試從某一個通訊錄，將連絡人移至另一個通訊錄，但是它無法從來源移除。您"
 "想要儲存一個副本來代替嗎？"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 #: ../calendar/calendar.error.xml.h:61
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
@@ -549,38 +532,34 @@ msgstr ""
 "您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
 "解決方案是將該伺服器升級至支援的版太"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "您已經修改此連絡人。要儲存這些變更？"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用 {0} 的連絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:495
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "新增(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "_Discard"
 msgstr "放棄(_D)"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
-# Novell Translation
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "{1}"
 msgstr "{1}"
 
@@ -590,7 +569,6 @@ msgid "Default Sync Address:"
 msgstr "預設的同步地址:"
 
 # camel/camel-provider.c:140
-# Novell Translation
 #: ../addressbook/conduit/address-conduit.c:1183
 #: ../addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
@@ -604,7 +582,6 @@ msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
 # mail/mail-config.glade.h:76
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "自動完成"
@@ -613,13 +590,11 @@ msgstr "自動完成"
 msgid "C_ontacts"
 msgstr "連絡人(_O)"
 
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "憑證"
 
 # ui/evolution-mail.xml.h:19
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "在此設定自動完成"
@@ -627,58 +602,49 @@ msgstr "在此設定自動完成"
 # ui/evolution-addressbook.xml.h:17
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1186
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "連絡人"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr "Evolution 通訊錄"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Evolution 通訊錄地址快顯視窗"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolution 通訊錄地址檢視器"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolution 通訊錄名片檢視器"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr "Evolution 通訊錄配件"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Evolution S/Mime 憑證管理控制"
 
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Evolution 資料夾設定組態控制"
 
-# Novell Translation
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
 msgstr "在此管理您的 S/MIME 憑證"
 
-# Novell Translation
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
@@ -710,7 +676,6 @@ msgid "Personal"
 msgstr "個人"
 
 # addressbook/gui/component/addressbook-config.c:148
-# Novell Translation
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:155
 #: ../addressbook/gui/component/addressbook-migrate.c:520
@@ -736,10 +701,8 @@ msgid "Create a new contact list"
 msgstr "建立新的連絡人清單"
 
 # importers/pine-importer.c:661
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "新通訊錄"
 
@@ -748,34 +711,31 @@ msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
 # ui/evolution-tasks.xml.h:2
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-component.c:385
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "升級通訊錄設定或資料夾失敗。"
 
 # addressbook/gui/component/addressbook-config.c:177
-#: ../addressbook/gui/component/addressbook-config.c:313
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "基本"
 
-#: ../addressbook/gui/component/addressbook-config.c:508
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "類型(_T):"
 
-# Novell Translation
-#: ../addressbook/gui/component/addressbook-config.c:607
+#: ../addressbook/gui/component/addressbook-config.c:634
 msgid "Copy book content locally for offline operation"
 msgstr "複製通訊錄內容至本地用於離線作業"
 
-#: ../addressbook/gui/component/addressbook-config.c:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
@@ -786,57 +746,53 @@ msgid "General"
 msgstr "一般"
 
 # importers/pine-importer.c:661
-#: ../addressbook/gui/component/addressbook-config.c:903
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "目錄服務"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-# Novell Translation
-#: ../addressbook/gui/component/addressbook-config.c:907
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "伺服器資訊"
 
 # mail/mail-config.glade.h:10
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "驗證"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "詳細資料"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: ../addressbook/gui/component/addressbook-config.c:913
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "搜尋中"
 
 # mail/mail-ops.c:898
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "下載中"
 
 # addressbook/gui/component/addressbook-config.glade.h:2
-# Novell Translation
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1200
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-migrate.c:72
 #: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr "正在移轉..."
 
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-migrate.c:124
 #: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
 #, c-format
@@ -844,18 +800,15 @@ msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
 
 # addressbook/gui/component/addressbook-config.c:148
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-migrate.c:648
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # mail/mail-config.glade.h:76
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-migrate.c:763
 msgid "Autocompletion Settings"
 msgstr "自動完成設定"
 
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-migrate.c:1134
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
@@ -867,7 +820,6 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -878,7 +830,6 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -889,7 +840,6 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-# Novell Translation
 #: ../addressbook/gui/component/addressbook-migrate.c:1167
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -900,37 +850,35 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的 Pilot Sync 資料時，請耐心等候..."
 
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "刪除"
+# importers/pine-importer.c:661
+#: ../addressbook/gui/component/addressbook-view.c:769
+msgid "_New Address Book"
+msgstr "新增通訊錄(_N)"
+
+#. FIXME: need to disable for undeletable folders
+#: ../addressbook/gui/component/addressbook-view.c:770
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1575 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "刪除(_D)"
 
 # ui/evolution-event-editor.xml.h:70
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: ../addressbook/gui/component/addressbook-view.c:766
-#: ../calendar/gui/memos-component.c:451
-msgid "Properties..."
-msgstr "屬性..."
+#: ../addressbook/gui/component/addressbook-view.c:772
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
+msgid "_Properties..."
+msgstr "屬性(_P)..."
 
-# Novell Translation
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1197
 msgid "Contact Source Selector"
 msgstr "連絡人來源選擇器"
 
@@ -939,35 +887,30 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿名方式存取 LDAP 伺服器"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
 # camel/camel-smime-context.c:194
-# Novell Translation
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
 
 # mail/mail-config.glade.h:76
-# Novell Translation
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "Autocomplete length"
 msgstr "自動完成長度"
 
-# Novell Translation
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "完成 uris 清單的 EFolderList xml"
 
-# Novell Translation
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "完成 uris 清單的 EFolderList xml"
 
-# Novell Translation
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
@@ -975,31 +918,27 @@ msgid ""
 msgstr "垂直窗格的位置，在名片、清單檢視與預覽窗格之間，以像素計。"
 
 # calendar/gui/event-editor-dialog.glade.h:15
-# Novell Translation
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
 msgstr "顯示預覽窗格"
 
-# Novell Translation
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "在 Evolution 嘗試自動完成之前，必須輸入的字元數目。"
 
-# Novell Translation
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 
-# Novell Translation
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 
 # calendar/gui/e-calendar-table.c:156
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "垂直窗格位置"
 
@@ -1009,151 +948,136 @@ msgid "Whether to show the preview pane."
 msgstr "是否顯示預覽窗格。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "389"
 msgstr "389"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "636"
 msgstr "636"
 
 # mail/mail-config.glade.h:10
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>驗證</b>"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Display</b>"
 msgstr "<b>顯示</b>"
 
 # addressbook/backend/ebook/e-card.c:3442
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>下載中</b>"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Searching</b>"
 msgstr "<b>搜尋中</b>"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Server Information</b>"
 msgstr "<b>伺服器資訊</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Type:</b>"
 msgstr "<b>類型:</b>"
 
 # importers/pine-importer.c:661
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "Add Address Book"
 msgstr "新增通訊錄"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 #: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "永遠"
 
 # camel/camel-sasl-anonymous.c:33
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "匿名"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "基本"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "可辨識名稱"
 
 # mail/mail-config.glade.h:29
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "電子郵件地址"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution 會使用此電子郵件地址，在伺服器驗證您的身份。"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "尋找可能的搜尋基礎"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "登入(_G):"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "永不"
 
 # addressbook/gui/component/addressbook-config.c:179
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "One"
 msgstr "一層"
 
+# mail/mail-account-gui.c:682
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "Search Filter"
+msgstr "搜尋過濾器"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "搜尋起點(_B):"
 
-# Novell Translation
+# mail/mail-account-gui.c:682
 #: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search _filter:"
+msgstr "搜尋過濾器(_F):"
+
+# mail/mail-search.c:299
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Search filter"
+msgstr "搜尋過濾器"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+"搜尋過濾器是在進行搜尋時使用的物件類型。如果此項沒有被修改，預設的搜尋目標是"
+"「person」物件類型。"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
@@ -1161,8 +1085,7 @@ msgstr ""
 "選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支"
 "援 SSL 或 TLS)。"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -1173,8 +1096,7 @@ msgstr ""
 "如，如果您和您的 LDAP 伺服器在作業時有防火牆保護，則 Evolution 就不需要使用 "
 "SSL/TLS ，因為您的連線已經安全無慮。"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 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 "
@@ -1184,16 +1106,15 @@ msgstr ""
 "安全有漏洞。 "
 
 # calendar/gui/print.c:362
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "子目錄"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "支援的搜尋起點"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 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 "
@@ -1202,8 +1123,7 @@ msgstr ""
 "搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在網"
 "路目錄樹的根部開始。"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 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 "
@@ -1213,20 +1133,19 @@ msgstr ""
 "搜尋範圍會定義您想從網路目錄樹往下延伸搜尋的深度。\"sub\" 的搜尋範圍會包括搜"
 "尋基礎底下所有的項目。「一個」的搜尋範圍只會包括基礎底下的一個層級。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "這是您的 ldap 伺服器的完整名稱。例如：「ldap.mycompany.com」。"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 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:37
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1235,16 +1154,14 @@ msgstr ""
 "這是 Evolution 將要用來驗證您的方法。注意要設定此項至「電子郵件位址」需要您"
 "的 LDAP 伺服器的匿名存取。"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
 "這是此伺服器的名稱，會顯示在您的 Evolution 資料夾清單中。它僅用於顯示用途。 "
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 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 "
@@ -1253,40 +1170,38 @@ msgstr ""
 "這是 LDAP 伺服器上的埠，Evolution 會嘗試連線到這個地方。已提供標準埠清單。請"
 "洽詢您的系統管理員，瞭解您應該指定的埠。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
 # mail/mail-config.glade.h:29
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using email address"
 msgstr "使用電子郵件位址"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 #: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "每次可能的時候"
 
 # importers/pine-importer.c:661
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Add Address Book"
 msgstr "新增通訊錄(_A)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Download limit:"
 msgstr "下載限制(_D):"
 
-# Novell Translation
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Find Possible Search Bases"
 msgstr "尋找可能的搜尋基礎(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Login method:"
 msgstr "登入方法(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
@@ -1294,24 +1209,24 @@ msgstr "登入方法(_L):"
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Search scope:"
 msgstr "搜尋範圍(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Timeout:"
 msgstr "逾時時間(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Use secure connection:"
 msgstr "使用安全連線(_U):"
 
@@ -1319,12 +1234,14 @@ msgstr "使用安全連線(_U):"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "cards"
 msgstr "名片"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/util.c:64
+#: ../calendar/gui/alarm-notify/util.c:66
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
 #: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
@@ -1333,66 +1250,81 @@ msgstr "名片"
 msgid "minutes"
 msgstr "分鐘"
 
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
 # mail/mail-config.glade.h:65
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>電子郵件</b>"
 
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>住家</b>"
 
 # mail/mail-callbacks.c:1407
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>即時訊息</b>"
 
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>工作</b>"
 
 # mail/mail-config.glade.h:65
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>其他</b>"
 
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>其他</b>"
 
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>電話</b>"
 
 # mail/mail-config.glade.h:65
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>網址</b>"
 
 # ui/evolution-calendar.xml.h:35
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 # ui/evolution-addressbook.xml.h:17
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1400,9 +1332,9 @@ msgstr "連絡人"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:526
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2373
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1416,14 +1348,12 @@ msgid "Image"
 msgstr "圖片"
 
 # ui/evolution-mail.xml.h:109
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 # mail/mail-config.glade.h:29
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "郵寄地址"
@@ -1432,27 +1362,25 @@ msgstr "郵寄地址"
 msgid "Ni_ckname:"
 msgstr "暱稱(_C):"
 
-# Novell Translation
+# shell/e-shortcuts-view.c:137
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+msgstr "Novell GroupWise"
 
 # mail/mail-config.glade.h:47
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "個人資訊"
 
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "電話"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 #: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
 #: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
 msgid "Work"
@@ -1464,56 +1392,49 @@ msgid "_Address:"
 msgstr "地址(_A):"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "助理(_A):"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "生日(_B):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../plugins/itip-formatter/itip-view.c:1661
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "分類(_C)"
 
 # addressbook/contact-editor/fulladdr.glade.h:8
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "縣/市(_C):"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "公司(_C):"
 
 # addressbook/contact-editor/fulladdr.glade.h:4
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "國家/地區(_C):"
 
 # addressbook/contact-editor/contact-editor.glade.h:24
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "部門(_D):"
@@ -1523,32 +1444,27 @@ msgid "_File under:"
 msgstr "歸檔為(_F):"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "空閒/忙碌(_F):"
 
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "首頁(_H):"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "主管(_M):"
 
 # addressbook/contact-editor/contact-editor.glade.h:12
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "備註(_N):"
 
 # addressbook/contact-editor/contact-editor.glade.h:31
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "辦公室(_O):"
@@ -1559,13 +1475,11 @@ msgid "_PO Box:"
 msgstr "郵箱(_P):"
 
 # addressbook/contact-editor/contact-editor.glade.h:32
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "職業(_P):"
 
 # addressbook/contact-editor/contact-editor.glade.h:33
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "配偶(_S):"
@@ -1580,19 +1494,16 @@ msgstr "州/省(_S):"
 msgid "_Title:"
 msgstr "職稱(_T):"
 
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "視訊交談(_V):"
 
 # addressbook/contact-editor/contact-editor.glade.h:15
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "想接收 HTML 郵件(_W)"
 
 # addressbook/contact-editor/contact-editor.glade.h:16
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "網誌(_W):"
@@ -1603,22 +1514,21 @@ msgid "_Where:"
 msgstr "通訊錄(_W):"
 
 # addressbook/contact-editor/fulladdr.glade.h:11
-# Novell Translation
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "郵遞區號(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
 #: ../addressbook/gui/widgets/eab-contact-display.c:367
 #: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "地址"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1632,984 +1542,982 @@ msgstr "地址"
 msgid "Editable"
 msgstr "可編輯的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "United States"
 msgstr "美國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Albania"
 msgstr "阿爾巴尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Algeria"
 msgstr "阿爾及利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "American Samoa"
 msgstr "美屬薩摩亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Andorra"
 msgstr "安道爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Angola"
 msgstr "安哥拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Anguilla"
 msgstr "安圭拉島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antarctica"
 msgstr "南極洲"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Antigua And Barbuda"
 msgstr "安地卡及巴布達"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Armenia"
 msgstr "亞美尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Aruba"
 msgstr "阿盧巴島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Australia"
 msgstr "澳大利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Austria"
 msgstr "奧地利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Azerbaijan"
 msgstr "亞賽拜然"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahamas"
 msgstr "巴哈馬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bahrain"
 msgstr "巴林"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bangladesh"
 msgstr "孟加拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Barbados"
 msgstr "巴貝多"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belarus"
 msgstr "白俄羅斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Belize"
 msgstr "貝里斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Benin"
 msgstr "貝南"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bermuda"
 msgstr "百慕達"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bhutan"
 msgstr "不丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bolivia"
 msgstr "玻利維亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bosnia And Herzegowina"
 msgstr "波士尼亞-赫芝格維納"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Botswana"
 msgstr "波札那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bouvet Island"
 msgstr "波維特島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "British Indian Ocean Territory"
 msgstr "英屬印度洋地區"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Brunei Darussalam"
 msgstr "汶萊"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Bulgaria"
 msgstr "保加利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burkina Faso"
 msgstr "布吉納法索"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Burundi"
 msgstr "浦隆地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cambodia"
 msgstr "柬埔寨王國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cameroon"
 msgstr "喀麥隆"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cape Verde"
 msgstr "維德角島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cayman Islands"
 msgstr "開曼群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
 msgstr "中非"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chad"
 msgstr "查德"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
 msgstr "智利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "China"
 msgstr "中國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Christmas Island"
 msgstr "聖誕島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cocos (Keeling) Islands"
 msgstr "可可斯群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Colombia"
 msgstr "哥倫比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Comoros"
 msgstr "葛摩"
 
 # mail/mail-ops.c:917
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "剛果共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Congo, The Democratic Republic Of The"
 msgstr "剛果共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cook Islands"
 msgstr "科克群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Cote d'Ivoire"
 msgstr "象牙海岸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Croatia"
 msgstr "克羅埃西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cuba"
 msgstr "古巴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Cyprus"
 msgstr "賽普勒斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Czech Republic"
 msgstr "捷克共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Denmark"
 msgstr "丹麥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Djibouti"
 msgstr "吉布地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominica"
 msgstr "多明尼克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Dominican Republic"
 msgstr "多明尼加共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr "厄瓜多"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "埃及"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "El Salvador"
 msgstr "薩爾瓦多"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
 msgstr "赤道幾內亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
 msgstr "厄利垂亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Estonia"
 msgstr "愛沙尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Ethiopia"
 msgstr "依索比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
 msgstr "福克蘭群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
 msgstr "法羅群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
 msgstr "斐濟群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "France"
 msgstr "法國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Guiana"
 msgstr "法屬圭亞那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Polynesia"
 msgstr "法屬玻里尼西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "French Southern Territories"
 msgstr "法屬南部屬地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gabon"
 msgstr "加彭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gambia"
 msgstr "甘比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
 msgstr "喬治亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Germany"
 msgstr "德國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
 msgstr "迦納"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
 msgstr "直布羅陀"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "希臘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Greenland"
 msgstr "格陵蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
 msgstr "格瑞那達"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
 msgstr "瓜德魯普島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guam"
 msgstr "關島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guatemala"
 msgstr "瓜地馬拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guernsey"
 msgstr "根息"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea"
 msgstr "幾內亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guinea-bissau"
 msgstr "幾內亞比索"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Guyana"
 msgstr "蓋亞納"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Haiti"
 msgstr "海地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Heard And McDonald Islands"
 msgstr "赫德及麥當勞群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Holy See"
 msgstr "教廷"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Honduras"
 msgstr "宏都拉斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hong Kong"
 msgstr "香港"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iceland"
 msgstr "冰島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "India"
 msgstr "印度"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Indonesia"
 msgstr "印尼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iran"
 msgstr "伊朗"
 
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Iraq"
 msgstr "伊拉克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Ireland"
 msgstr "愛爾蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Isle of Man"
 msgstr "曼島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
 msgstr "以色列"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Italy"
 msgstr "義大利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Jamaica"
 msgstr "牙買加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Japan"
 msgstr "日本"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jersey"
 msgstr "澤西"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Jordan"
 msgstr "約旦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kazakhstan"
 msgstr "哈薩克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kenya"
 msgstr "肯亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kiribati"
 msgstr "吉里巴斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Democratic People's Republic Of"
 msgstr "北韓"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Korea, Republic Of"
 msgstr "韓國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kuwait"
 msgstr "科威特"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Kyrgyzstan"
 msgstr "吉爾吉斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
 msgstr "寮國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Latvia"
 msgstr "拉脫維亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lesotho"
 msgstr "賴索托"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Liberia"
 msgstr "賴比瑞亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
 msgstr "利比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Liechtenstein"
 msgstr "列支敦斯登"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Luxembourg"
 msgstr "盧森堡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macao"
 msgstr "澳門"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Macedonia"
 msgstr "馬其頓"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Madagascar"
 msgstr "馬達加斯加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malawi"
 msgstr "馬拉威"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Malaysia"
 msgstr "馬來西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Maldives"
 msgstr "馬爾地夫"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mali"
 msgstr "馬利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Malta"
 msgstr "馬爾他"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Marshall Islands"
 msgstr "馬紹爾群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Martinique"
 msgstr "法屬馬丁尼克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritania"
 msgstr "茅利塔尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mauritius"
 msgstr "模里西斯"
 
 # calendar/gui/goto-dialog.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
 msgstr "美亞特"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Micronesia"
 msgstr "密克羅尼西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Moldova, Republic Of"
 msgstr "摩爾多瓦"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Monaco"
 msgstr "摩納哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Mongolia"
 msgstr "蒙古"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Montserrat"
 msgstr "蒙瑟拉特島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Mozambique"
 msgstr "莫三比克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Myanmar"
 msgstr "緬甸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Namibia"
 msgstr "納米比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nauru"
 msgstr "諾魯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nepal"
 msgstr "尼泊爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Netherlands Antilles"
 msgstr "荷屬安地列斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Caledonia"
 msgstr "新喀里多尼亞島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "New Zealand"
 msgstr "紐西蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Niger"
 msgstr "尼日"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
 msgstr "奈及利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Niue"
 msgstr "紐威島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Norfolk Island"
 msgstr "諾福克群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Northern Mariana Islands"
 msgstr "北馬里亞納群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Norway"
 msgstr "挪威"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Oman"
 msgstr "阿曼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palau"
 msgstr "帛琉群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr "巴勒斯坦地區"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Panama"
 msgstr "巴拿馬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Papua New Guinea"
 msgstr "巴布亞紐幾內亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Paraguay"
 msgstr "巴拉圭"
 
 # addressbook/printing/e-contact-print.glade.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "秘魯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Philippines"
 msgstr "菲律賓"
 
 # ui/evolution-calendar.xml.h:25
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
 msgstr "皮特康"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Puerto Rico"
 msgstr "波多黎各"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Qatar"
 msgstr "卡達"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
 msgstr "留尼旺"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Romania"
 msgstr "羅馬尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Russian Federation"
 msgstr "俄羅斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Rwanda"
 msgstr "盧安達"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Kitts And Nevis"
 msgstr "聖克里斯多福"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Lucia"
 msgstr "聖露西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saint Vincent And The Grenadines"
 msgstr "聖文森"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Samoa"
 msgstr "薩摩亞群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "San Marino"
 msgstr "聖馬利諾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
 msgstr "聖多美及普林西比"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Saudi Arabia"
 msgstr "沙烏地阿拉伯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Senegal"
 msgstr "塞內加爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Serbia And Montenegro"
 msgstr "塞爾維亞和黑山"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Seychelles"
 msgstr "塞席爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sierra Leone"
 msgstr "獅子山"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Slovenia"
 msgstr "斯洛凡尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Solomon Islands"
 msgstr "索羅門群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Somalia"
 msgstr "索馬利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Africa"
 msgstr "南非"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "南喬治亞及南桑威奇群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Sri Lanka"
 msgstr "斯里蘭卡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
 msgstr "聖赫勒拿島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "St. Pierre And Miquelon"
 msgstr "聖匹及密啟倫群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sudan"
 msgstr "蘇丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Suriname"
 msgstr "蘇利南"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "斯瓦巴及尖棉島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Swaziland"
 msgstr "史瓦濟蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Switzerland"
 msgstr "瑞士"
 
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Syria"
 msgstr "敘利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Taiwan"
 msgstr "臺灣"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tajikistan"
 msgstr "塔吉克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tanzania, United Republic Of"
 msgstr "坦尚尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Thailand"
 msgstr "泰國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Timor-Leste"
 msgstr "東帝汶"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Togo"
 msgstr "多哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tokelau"
 msgstr "托克勞群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tonga"
 msgstr "東加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Trinidad And Tobago"
 msgstr "千里達"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tunisia"
 msgstr "突尼西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turkmenistan"
 msgstr "土庫曼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
 msgstr "土克斯及開科斯群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Tuvalu"
 msgstr "吐瓦魯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uganda"
 msgstr "烏干達"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Ukraine"
 msgstr "烏克蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Arab Emirates"
 msgstr "阿拉伯聯合大公國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United Kingdom"
 msgstr "英國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "United States Minor Outlying Islands"
 msgstr "美屬邊疆群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uruguay"
 msgstr "烏拉圭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Uzbekistan"
 msgstr "烏茲別克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Vanuatu"
 msgstr "萬那杜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Viet Nam"
 msgstr "越南"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
 msgstr "英屬維爾京群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Virgin Islands, U.S."
 msgstr "美屬維爾京群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Wallis And Futuna Islands"
 msgstr "沃里斯與伏塔那島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Yemen"
 msgstr "葉門"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zambia"
 msgstr "尚比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
 msgid "Zimbabwe"
 msgstr "辛巴威"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
 #: ../plugins/exchange-operations/exchange-delegates.c:936
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
 #: ../plugins/plugin-manager/plugin-manager.c:44
@@ -2619,134 +2527,120 @@ msgid "Name"
 msgstr "名稱"
 
 # mail/mail-callbacks.c:1407
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 # addressbook/gui/component/addressbook-storage.c:99
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 msgid "Service"
 msgstr "服務"
 
 # addressbook/backend/ebook/e-card.c:3442
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:594
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "位置"
 
 # mail/mail-config.glade.h:80
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "使用者名稱"
 
 # addressbook/contact-editor/e-contact-editor.c:1249
 # addressbook/contact-editor/e-contact-editor.c:1311
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Home"
 msgstr "住家"
 
 # addressbook/contact-editor/e-contact-editor.c:1254
 # addressbook/contact-editor/e-contact-editor.c:1312
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Other"
 msgstr "其它"
 
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 # shell/e-shortcuts-view.c:137
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Source Book"
 msgstr "來源通訊錄"
 
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 msgid "Target Book"
 msgstr "目標通訊錄"
 
 # ui/evolution-addressbook.xml.h:7
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Is New Contact"
 msgstr "是新連絡人"
 
 # ui/evolution-message-composer.xml.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:571
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Required Fields"
 msgstr "必要欄位"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
 msgid "Changed"
 msgstr "已變更"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:536
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2368
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
 msgid "Please select an image for this contact"
 msgstr "請選取此連絡人的影像"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2682
 msgid "No image"
 msgstr "沒有影像"
 
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2961
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2756,8 +2650,7 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-# Novell Translation
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3013
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
@@ -2834,7 +2727,6 @@ msgid "Countr_y:"
 msgstr "國家(_Y):"
 
 # addressbook/backend/ebook/e-card.c:3346
-# Novell Translation
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "完整地址"
@@ -2922,7 +2814,6 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 # mail/mail-config.glade.h:6
-# Novell Translation
 #: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "新增 IM 帳號"
@@ -2946,18 +2837,16 @@ msgstr "位置(_L):"
 msgid "\n"
 msgstr "\n"
 
-# Novell Translation
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "新增電子郵件到清單"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "連絡人清單編輯器"
 
-# Novell Translation
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "從通訊錄插入電子郵件位址"
@@ -2968,7 +2857,6 @@ msgid "Members"
 msgstr "會員"
 
 # composer/e-msg-composer-attachment-bar.c:469
-# Novell Translation
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "從清單移除電子郵件地址"
@@ -2981,39 +2869,36 @@ msgstr "當傳送電子郵件至此清單時隱藏其位址(_H)"
 msgid "_List name:"
 msgstr "列出名稱(_L):"
 
-# Novell Translation
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "選取(_S)"
 
-# Novell Translation
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "輸入電子郵件地址或拖曳連絡人到以下清單(_T)："
 
 # addressbook/printing/e-contact-print.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "書本"
 
 # mail/mail-config.glade.h:45
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "是新的清單"
 
 # calendar/gui/goto-dialog.glade.h:12
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "成員(_M)"
 
 # calendar/gui/goto-dialog.glade.h:12
-# Novell Translation
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "連絡人清單成員"
 
@@ -3065,7 +2950,6 @@ msgid "Advanced Search"
 msgstr "進階搜尋"
 
 # ui/evolution-addressbook.xml.h:17
-# Novell Translation
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "沒有連絡人"
@@ -3080,7 +2964,7 @@ msgstr[1] "%d 個連絡人"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -3107,16 +2991,16 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Name begins with"
 msgstr "名稱開始於"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
 #: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "分類為"
@@ -3124,25 +3008,25 @@ msgstr "分類為"
 # addressbook/gui/component/addressbook.c:618
 # calendar/gui/gnome-cal.c:233
 #. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:174
+#: ../addressbook/gui/widgets/e-addressbook-view.c:179
 msgid "Advanced..."
 msgstr "進階..."
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
 msgid "Source"
 msgstr "來源"
 
 # mail/mail-config.glade.h:78
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../addressbook/gui/widgets/e-addressbook-view.c:245
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:377
@@ -3151,7 +3035,7 @@ msgstr "來源"
 msgid "Type"
 msgstr "類型"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
+#: ../addressbook/gui/widgets/e-addressbook-view.c:550
 msgid "Address Book"
 msgstr "通訊錄"
 
@@ -3159,60 +3043,62 @@ msgstr "通訊錄"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-# Novell Translation
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
+#: ../addressbook/gui/widgets/e-addressbook-view.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2037
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Save as VCard..."
 msgstr "儲存為 VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/dialogs/comp-editor.c:1119
-#: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1549 ../calendar/gui/e-memo-table.c:845
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:1055
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "_Open"
 msgstr "開啟(_O)"
 
 # ui/evolution-addressbook.xml.h:7
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
-msgstr "新增連絡人..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+msgid "_New Contact..."
+msgstr "新增連絡人(_N)..."
 
 # ui/evolution-addressbook.xml.h:17
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
-msgstr "新增連絡人清單..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+msgid "New Contact _List..."
+msgstr "新增連絡人清單(_L)..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "_Save as VCard..."
+msgstr "儲存成 VCard(_S)..."
 
 # ui/evolution-mail.xml.h:35
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Forward Contact"
-msgstr "轉寄連絡人"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+msgid "_Forward Contact"
+msgstr "轉寄連絡人(_F)"
 
 # ui/evolution-mail.xml.h:35
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "Forward Contacts"
-msgstr "轉寄連絡人"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+msgid "_Forward Contacts"
+msgstr "轉寄連絡人(_F)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
-msgstr "傳送郵件給連絡人"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+msgid "Send _Message to Contact"
+msgstr "傳送郵件給連絡人(_M)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "Send Message to List"
-msgstr "傳送郵件給清單"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+msgid "Send _Message to List"
+msgstr "傳送郵件給清單(_M)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send Message to Contacts"
-msgstr "傳送郵件給連絡人"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+msgid "Send _Message to Contacts"
+msgstr "傳送郵件給連絡人(_M)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 # addressbook/gui/widgets/e-addressbook-view.c:614
@@ -3221,62 +3107,55 @@ msgstr "傳送郵件給連絡人"
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "列印"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+msgid "_Print"
+msgstr "列印(_P)"
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-# Novell Translation
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Copy to Address Book..."
-msgstr "複製到通訊錄…"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+msgid "Cop_y to Address Book..."
+msgstr "複製到通訊錄(_Y)..."
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-# Novell Translation
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Move to Address Book..."
-msgstr "移動至通訊錄..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+msgid "Mo_ve to Address Book..."
+msgstr "移至通訊錄(_V)..."
 
-# ui/evolution-event-editor.xml.h:15
-# ui/evolution-task-editor-dialog.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "剪下"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:8
+msgid "Cu_t"
+msgstr "剪下(_T)"
 
-# ui/evolution-event-editor.xml.h:13
-# ui/evolution-mail.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:14
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "複製"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/dialogs/comp-editor.c:432
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1562 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "複製(_C)"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "貼上"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+msgid "P_aste"
+msgstr "貼上(_A)"
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1584
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "任何分類"
 
 # ui/evolution-calendar.xml.h:25
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1786
 msgid "Print cards"
 msgstr "列印名片"
 
@@ -3319,7 +3198,7 @@ msgstr "汽車電話"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 #: ../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
@@ -3365,7 +3244,6 @@ msgstr "歸檔為"
 
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
-# Novell Translation
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr "名"
@@ -3387,12 +3265,10 @@ msgid "Home Phone 2"
 msgstr "住家電話 2"
 
 # mail/mail-config.glade.h:25
-# Novell Translation
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr "ISDN 電話"
 
-# Novell Translation
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Journal"
 msgstr "日誌"
@@ -3472,7 +3348,6 @@ msgid "Spouse"
 msgstr "配偶"
 
 # addressbook/contact-editor/e-contact-editor.c:1260
-# Novell Translation
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
 #. (familiar from Unix device names), and TDD is "Telecommunications
@@ -3495,7 +3370,6 @@ msgid "Title"
 msgstr "頭銜"
 
 # mail/message-list.c:677
-# Novell Translation
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "單位"
@@ -3633,7 +3507,6 @@ msgstr "已選擇"
 msgid "Has Cursor"
 msgstr "有游標"
 
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:135
 #: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
@@ -3645,71 +3518,59 @@ msgid "map"
 msgstr "對映"
 
 # calendar/gui/goto-dialog.glade.h:12
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:276
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "清單成員"
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:339
 #: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "電子郵件"
 
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "位置"
 
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
 msgstr "視訊會議"
 
 # mail/mail-config.glade.h:25
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:365
 #: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "電話"
 
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "傳真"
 
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "工作"
 
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "WWW"
 msgstr "WWW"
 
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
 #: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Blog"
 msgstr "Blog"
 
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "個人"
 
 # addressbook/contact-editor/contact-editor.glade.h:27
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "職稱"
 
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "首頁"
@@ -3719,7 +3580,6 @@ msgstr "首頁"
 msgid "Success"
 msgstr "成功"
 
-# Novell Translation
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
 #: ../addressbook/gui/widgets/eab-gui-util.c:51
@@ -3736,14 +3596,12 @@ msgstr "資料庫離線"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-# Novell Translation
 #. E_BOOK_ERROR_NO_SUCH_BOOK
 #: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Address Book does not exist"
 msgstr "通訊錄不存在"
 
 # ui/evolution-addressbook.xml.h:17
-# Novell Translation
 #. E_BOOK_ERROR_NO_SELF_CONTACT
 #: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
@@ -3759,13 +3617,11 @@ msgid "Permission denied"
 msgstr "權限不足"
 
 # calendar/gui/calendar-commands.c:266
-# Novell Translation
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
 #: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "找不到連絡人"
 
-# Novell Translation
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
@@ -3789,12 +3645,11 @@ msgstr "通訊協定不支援"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2375
 msgid "Cancelled"
 msgstr "已取消"
 
 # camel/providers/local/camel-mbox-summary.c:655
-# Novell Translation
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Could not cancel"
@@ -3822,7 +3677,6 @@ msgstr "TLS 無法使用"
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-# Novell Translation
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: ../addressbook/gui/widgets/eab-gui-util.c:67
@@ -3855,7 +3709,6 @@ msgstr ""
 "線使用。請於上線模式再次讀取通訊錄以下載它的內容"
 
 # addressbook/gui/component/addressbook.c:458
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-gui-util.c:102
 #, c-format
 msgid ""
@@ -3864,16 +3717,14 @@ msgid ""
 msgstr "無法開啟這個通訊錄。  請檢查路徑 %s 是否存在而且您有權限存取它。"
 
 # addressbook/gui/component/addressbook.c:445
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示您輸入錯誤的 URI，或無法連線 LDAP 伺服器。"
 
 # addressbook/gui/component/addressbook.c:450
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3883,14 +3734,13 @@ msgstr ""
 "啟用 LDAP 的 Evolution 套件。"
 
 # addressbook/gui/component/addressbook.c:445
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:123
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示您輸入錯誤的URI，或伺服器無法連線。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:146
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3902,7 +3752,7 @@ msgstr ""
 "請使用更加明確的查詢或是提高此目錄服務的目錄\n"
 "伺服器偏好設定中的結果上限。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3914,54 +3764,51 @@ msgstr ""
 "或是提高此目錄服務的目錄伺服器偏好設定中的\n"
 "結果上限。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此目錄服務的後端程式無法解析這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全成功。"
 
 # shell/e-shell-importer.c:404
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
 # shell/e-shell-importer.c:404
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:694
 msgid "Error adding contact"
 msgstr "新增連絡人時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:197
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
 # shell/e-shell-importer.c:404
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:197
 msgid "Error modifying contact"
 msgstr "修改連絡人時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:649
 msgid "Error removing contact"
 msgstr "移除連絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
+#: ../addressbook/gui/widgets/eab-gui-util.c:291
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3973,7 +3820,7 @@ msgstr[0] ""
 "開啟 %d 個連絡人會一併開啟 %d 個新視窗。\n"
 "確定要顯示這個連絡人？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3984,37 +3831,35 @@ msgstr ""
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 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:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:369
+#: ../addressbook/gui/widgets/eab-gui-util.c:372
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "個連絡人"
 msgstr[1] "個連絡人"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:595
 msgid "list"
 msgstr "清單"
 
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Move contact to"
 msgstr "將連絡人移到"
 
 # calendar/gui/e-calendar-table.c:714
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:757
 msgid "Copy contact to"
 msgstr "複製連絡人到"
 
@@ -4022,8 +3867,7 @@ msgstr "複製連絡人到"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:760
 msgid "Move contacts to"
 msgstr "將連絡人移到"
 
@@ -4031,27 +3875,37 @@ msgstr "將連絡人移到"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:762
 msgid "Copy contacts to"
 msgstr "複製連絡人到"
 
-# Novell Translation
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
+#: ../addressbook/gui/widgets/eab-gui-util.c:765
 msgid "Select target addressbook."
 msgstr "選取目標通訊錄。"
 
 # addressbook/backend/ebook/e-card.c:3745
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
+#: ../addressbook/gui/widgets/eab-gui-util.c:988
 msgid "Multiple VCards"
 msgstr "多重 VCard"
 
 # addressbook/backend/ebook/e-card.c:3753
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:991
 #, c-format
 msgid "VCard for %s"
 msgstr "給 %s 的 VCard"
 
+# mail/mail-config.glade.h:47
+#: ../addressbook/gui/widgets/eab-gui-util.c:1032
+#: ../addressbook/gui/widgets/eab-gui-util.c:1050
+msgid "Contact information"
+msgstr "連絡人資訊"
+
+# mail/mail-config.glade.h:47
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s 的連絡人資訊"
+
 # shell/e-storage.c:178
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
@@ -4086,7 +3940,6 @@ msgid "Add address to existing contact \"%s\""
 msgstr "新增住址到既存之連絡人 「%s」"
 
 # addressbook/gui/widgets/e-minicard-control.c:282
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "正在查詢通訊錄…"
@@ -4104,7 +3957,6 @@ msgstr[0] "和 1 個其他名片。"
 msgstr[1] "和 %d 個其他名片。"
 
 # addressbook/printing/e-contact-print.glade.h:11
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-vcard-control.c:223
 #: ../addressbook/gui/widgets/eab-vcard-control.c:272
 msgid "Show Full VCard"
@@ -4114,7 +3966,6 @@ msgstr "顯示完整的 VCard"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-# Novell Translation
 #: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "顯示精簡的 VCard"
@@ -4130,36 +3981,31 @@ msgid "Card View"
 msgstr "名片檢視模式"
 
 # widgets/menus/gal-view-menus.c:202
-# Novell Translation
 #: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "GTK 網路樹檢視"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:582
+#: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:249
 #: ../calendar/importers/icalendar-importer.c:311
 #: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "正在匯入..."
 
-# Novell Translation
-#: ../addressbook/importers/evolution-ldif-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 資料互換格式 (.ldif)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
-#: ../addressbook/importers/evolution-ldif-importer.c:749
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
 
-# Novell Translation
 #: ../addressbook/importers/evolution-vcard-importer.c:529
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf、.gcrd)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../addressbook/importers/evolution-vcard-importer.c:530
 msgid "Evolution VCard Importer"
 msgstr "Evolution VCard 輸入器"
@@ -4172,15 +4018,13 @@ msgid "Print envelope"
 msgstr "列印信封"
 
 # ui/evolution-addressbook.xml.h:11
-# Novell Translation
-#: ../addressbook/printing/e-contact-print.c:1014
+#: ../addressbook/printing/e-contact-print.c:1027
 msgid "Print contacts"
 msgstr "列印連絡人"
 
 # ui/evolution-addressbook.xml.h:11
-# Novell Translation
-#: ../addressbook/printing/e-contact-print.c:1105
-#: ../addressbook/printing/e-contact-print.c:1133
+#: ../addressbook/printing/e-contact-print.c:1118
+#: ../addressbook/printing/e-contact-print.c:1146
 msgid "Print contact"
 msgstr "列印連絡人"
 
@@ -4366,7 +4210,7 @@ msgstr "網底"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:940
+#: ../plugins/exchange-operations/exchange-account-setup.c:939
 #: ../plugins/exchange-operations/exchange-calendar.c:224
 #: ../plugins/exchange-operations/exchange-contacts.c:197
 msgid "Size:"
@@ -4401,35 +4245,29 @@ msgid "_Font..."
 msgstr "字型(_F)..."
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-# Novell Translation
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
 msgstr "連絡人列印樣式編輯器測試"
 
-# Novell Translation
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
 #: ../addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-# Novell Translation
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr "這可以測試連絡人列印樣式編輯器工具"
 
 # ui/evolution-addressbook.xml.h:17
-# Novell Translation
 #: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
 msgstr "連絡人列印測試"
 
-# Novell Translation
 #: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
 msgstr "這可以測試連絡人列印代碼"
 
 # camel/camel-filter-driver.c:671
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
@@ -4437,33 +4275,27 @@ msgid "Can not open file"
 msgstr "無法開啟檔案"
 
 # camel/camel-provider.c:140
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
 msgid "Couldn't get list of addressbooks"
 msgstr "無法取得通訊錄清單"
 
 # addressbook/gui/component/addressbook.c:438
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
 msgid "failed to open book"
 msgstr "無法開啟通訊錄"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "指定輸出檔案而不是標準輸出"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
 msgstr "輸出檔案"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
 msgstr "列出本地通訊錄資料夾"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
 msgstr "將名片顯示成 vcard 或 csv 檔案"
@@ -4472,44 +4304,36 @@ msgstr "將名片顯示成 vcard 或 csv 檔案"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode"
 msgstr "在非同步模式匯出"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
 msgstr "非同步模式下，一個輸出檔案中的名片數目，預設大小是 100。"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "數目"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 –- 說明選項來查看用法。"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
 msgstr "僅支援 csv 或 vcard 格式。"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
 msgstr "在非同步模式下，輸出必須是檔案。"
 
-# Novell Translation
 #: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there is no need for the size option."
 msgstr "在一般模式下，不需要大小選項。"
@@ -4547,138 +4371,116 @@ msgid ""
 "the task to be saved without those pending attachments "
 msgstr "這裡有一些附件要下載。儲存此工作將無法一併儲存接下來的附件"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:3
 msgid ""
 "Adding a meaningful Summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr "新增有意義的摘要到您的約會，可以讓收件者知道您的約會和什麼事有關。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
 "Adding a meaningful Summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr "新增有意義的摘要到您的工作，可以讓收件者知道您的工作和什麼事有關。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
 msgstr "會刪除這些日誌項目的所有資訊而且無法復原。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr "會刪除此日誌的所有資訊而且無法復原。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "會刪除這些約會的所有資訊而且無法復原。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "會刪除這些工作的所有資訊而且無法復原。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr "會刪除此約會的所有資訊而且無法復原。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:10
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
 msgstr "會刪除此日誌項目的所有資訊而且無法復原。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "會刪除此會議的所有資訊而且無法復原。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:12
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "會刪除此工作的所有資訊而且無法復原。"
 
 # calendar/gui/dialogs/delete-comp.c:93
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "確定要刪除 '{0}'工作？"
 
 # calendar/gui/dialogs/delete-comp.c:84
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "確定要刪除標題為 '{0}' 的約會？"
 
 # calendar/gui/dialogs/delete-comp.c:102
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "確定要刪除日誌項目 '{0}'？"
 
 # calendar/gui/dialogs/delete-comp.c:84
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "確定要刪除這 {0} 約會？"
 
 # calendar/gui/dialogs/delete-comp.c:102
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "確定要刪除這 {0} 日誌項目？"
 
 # calendar/gui/dialogs/delete-comp.c:93
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "確定要刪除這 {0} 工作？"
 
 # calendar/gui/dialogs/delete-comp.c:120
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete this appointment?"
 msgstr "確定要刪除此約會？"
 
 # calendar/gui/dialogs/delete-comp.c:130
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "確定要刪除此日誌項目？"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確定要刪除此會議？"
 
 # calendar/gui/dialogs/delete-comp.c:125
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this task?"
 msgstr "確定要刪除此工作？"
 
 # mail/mail-callbacks.c:1085
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "您確定要傳送沒有摘要的約會？"
 
 # mail/mail-callbacks.c:1085
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "您確定要傳送沒有摘要的工作？"
@@ -4694,7 +4496,6 @@ msgstr "您確定要傳送沒有摘要的工作？"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:25
 msgid "Delete calendar '{0}'?"
 msgstr "刪除行事曆「{0}」？"
@@ -4710,13 +4511,11 @@ msgid "Delete task list '{0}'?"
 msgstr "刪除工作清單「{0}」？"
 
 # shell/e-shortcuts-view.c:265
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "不要傳送"
 
 # calendar/gui/dialogs/delete-comp.c:120
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下載尚在進行中。您是否要儲存此約會？"
@@ -4729,13 +4528,11 @@ msgstr "下載尚在進行中。您是否要儲存此工作？"
 msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr "電子郵件邀請會傳送給所有參與者並讓他們儘快回覆。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
@@ -4744,7 +4541,6 @@ msgstr "電子郵件邀請會傳送給所有參與者並讓他們接受此工作
 
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "載入行事曆時發生錯誤"
@@ -4759,21 +4555,18 @@ msgstr "載入備忘錄清單時發生錯誤"
 msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr "如果未傳送取消通知，其他參與者可能不知道日誌已經刪除。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "如果您未傳送取消通知，其他參與者可能不知道會議已經取消。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
@@ -4787,19 +4580,16 @@ msgid "Send"
 msgstr "傳送"
 
 # ui/evolution-message-composer.xml.h:26
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:41
 msgid "Send Notice"
 msgstr "傳送通知"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "傳送更新的資訊允許其他參與者保有最新的行事曆。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
@@ -4807,12 +4597,10 @@ msgid ""
 msgstr "傳送更新的資訊讓其他參與者保有最新的工作清單。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 行事曆已經意外結束。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 工作已經意外結束。"
@@ -4842,64 +4630,52 @@ msgid "This task list will be removed permanently."
 msgstr "這個工作清單將會被永遠移除。"
 
 # calendar/gui/dialogs/save-comp.c:51
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr "要儲存對此約會所做的變更？"
 
 # calendar/gui/dialogs/save-comp.c:51
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this task?"
 msgstr "要儲存對此工作所做的變更？"
 
 # calendar/gui/dialogs/delete-comp.c:102
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "要傳送此日誌項目的取消通知？"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "要傳送取消通知給所有的參與者？"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "要傳送會議邀請給參與者？"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send this task to participants?"
 msgstr "要傳送此工作給參與者？"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "要傳送會議更新資訊給參與者？"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated task information to participants?"
 msgstr "要傳送更新的工作資訊給參與者？"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:62
 msgid "You have changed this appointment, but not yet saved them."
 msgstr "您已經變更此約會，但尚未儲存它們。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:63
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "您已經變更此工作，但尚未儲存它們。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:64
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用您的行事曆。"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:65
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用您的工作。"
@@ -4909,30 +4685,27 @@ msgstr "重新啟動 Evolution 之前，無法使用您的工作。"
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:51
 #: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "儲存(_S)"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:68
 msgid "_Save Changes"
 msgstr "儲存變更(_S)"
 
 # ui/evolution-message-composer.xml.h:26
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:127
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:129
 msgid "_Send"
 msgstr "傳送(_S)"
 
-# Novell Translation
 #: ../calendar/calendar.error.xml.h:70
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:312
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "輸入密碼"
@@ -4944,13 +4717,12 @@ msgstr "分割多日事件:"
 # addressbook/conduit/address-conduit.c:654
 # calendar/conduits/calendar/calendar-conduit.c:731
 # calendar/conduits/todo/todo-conduit.c:545
-# Novell Translation
 #: ../calendar/conduits/calendar/calendar-conduit.c:1377
 #: ../calendar/conduits/calendar/calendar-conduit.c:1378
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/todo/todo-conduit.c:988
+#: ../calendar/conduits/todo/todo-conduit.c:989
 msgid "Could not start evolution-data-server"
 msgstr "無法啟動 Evolution 資料伺服器"
 
@@ -4976,25 +4748,32 @@ msgid "Could not write pilot's Memo application block"
 msgstr "無法寫入 pilot 備忘錄程式區塊"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:237
 msgid "Default Priority:"
 msgstr "預設優先順序:"
 
 # calendar/conduits/todo/todo-conduit.c:600
 # calendar/conduits/todo/todo-conduit.c:603
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1071
+#: ../calendar/conduits/todo/todo-conduit.c:1074
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
+# calendar/conduits/todo/todo-conduit.c:600
+# calendar/conduits/todo/todo-conduit.c:603
+#: ../calendar/conduits/todo/todo-conduit.c:1110
+#: ../calendar/conduits/todo/todo-conduit.c:1113
+msgid "Could not write pilot's ToDo application block"
+msgstr "無法讀取 pilot 待辦事項程式區塊"
+
 # ui/evolution-mail.xml.h:110
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:1968
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-# Novell Translation
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 #: ../calendar/gui/calendar-component.c:1309
 msgid "Calendars"
@@ -5005,43 +4784,36 @@ msgid "Configure your timezone, Calendar and Task List here "
 msgstr "在這裡設定您的時區、行事曆與工作清單"
 
 # ui/evolution-mail.xml.h:110
-# Novell Translation
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution 行事曆和工作"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:5
-# Novell Translation
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Evolution 行事曆組態控制"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# Novell Translation
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolution 行事曆排程訊息檢視器"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# Novell Translation
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolution 行事曆/工作編輯器"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
-# Novell Translation
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolution 的行事曆配件"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
 msgstr "Evolution 的備忘錄元件"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Evolution 的工作配件"
@@ -5053,20 +4825,19 @@ msgstr "備忘錄(_S)"
 
 # calendar/gui/goto-dialog.glade.h:12
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1091 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:334
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:528
+#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "備忘錄"
 
-# Novell Translation
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1333 ../calendar/gui/print.c:1831
+#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:472
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "工作"
@@ -5081,23 +4852,24 @@ msgid "_Tasks"
 msgstr "工作(_T)"
 
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-# Novell Translation
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 行事曆鬧鈴通知服務"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/util.c:64
+#: ../calendar/gui/alarm-notify/util.c:66
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:250
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:258
 msgid "Start time"
 msgstr "開始時刻"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:349
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:356
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
@@ -5115,13 +4887,14 @@ msgstr "約會"
 # addressbook/backend/ebook/e-card.c:3442
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1419
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1425
 #: ../calendar/gui/e-itip-control.c:1117
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../plugins/itip-formatter/itip-view.c:883
 msgid "Location:"
 msgstr "位置:"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-# Novell Translation
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
 msgstr "忽略時間(_T):"
@@ -5132,7 +4905,7 @@ msgstr "忽略時間(_T):"
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
 #: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:12
@@ -5147,61 +4920,57 @@ msgstr "延期(_S)"
 
 # calendar/gui/event-editor-dialog.glade.h:44
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-msgid "description of appointment"
-msgstr "約會的描述"
-
-# calendar/gui/event-editor-dialog.glade.h:44
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "約會的地點"
 
-# Novell Translation
-#: ../calendar/gui/alarm-notify/alarm-queue.c:969
-msgid "Dismiss"
-msgstr "離開"
+# data/evolution.keys.in.h:2
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1097
+msgid "<b>Calendars</b>"
+msgstr "<b>行事曆</b>"
 
-# Novell Translation
-#: ../calendar/gui/alarm-notify/alarm-queue.c:970
-msgid "Dismiss All"
-msgstr "全部離開"
+# calendar/gui/event-editor-dialog.glade.h:13
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1163
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1176
+msgid "_Configure Alarms"
+msgstr "設定鬧鈴(_C)"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1178 ../ui/evolution.xml.h:41
+msgid "_Quit"
+msgstr "離開(_Q)"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1052
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1284
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1401
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1061
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1063
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1293
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1295
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1071
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1303
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-# Novell Translation
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1087
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1339
 #, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"%s 的鬧鈴\n"
-"%s\n"
-"開始於 %s\n"
-"結束於 %s"
+msgid "You have %d alarms"
+msgstr "您有 %d 個鬧鈴"
 
 # widgets/misc/e-messagebox.c:159
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1190
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1214
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1502
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1194
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -5213,7 +4982,7 @@ msgstr ""
 "送出電子郵件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1220
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -5233,7 +5002,7 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1234
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1546
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -5247,12 +5016,12 @@ msgstr "不要再詢問我關於這個程式。"
 # calendar/conduits/todo/todo-conduit.c:965
 # calendar/gui/alarm-notify/notify-main.c:98
 # calendar/gui/main.c:57
-#: ../calendar/gui/alarm-notify/notify-main.c:147
+#: ../calendar/gui/alarm-notify/notify-main.c:155
 msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
 # calendar/gui/alarm-notify/notify-main.c:108
-#: ../calendar/gui/alarm-notify/notify-main.c:158
+#: ../calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not create the alarm notify service factory"
 msgstr "無法建立聲音提醒服務元件工廠"
 
@@ -5261,6 +5030,74 @@ msgstr "無法建立聲音提醒服務元件工廠"
 msgid "invalid time"
 msgstr "失效時間"
 
+# calendar/gui/event-editor.c:1563
+#. Can't be zero
+#: ../calendar/gui/alarm-notify/util.c:58
+#, c-format
+msgid "(%d seconds)"
+msgstr "(%d 秒)"
+
+# calendar/gui/event-editor.c:3132
+# calendar/gui/print.c:1097
+# calendar/gui/print.c:1099
+# calendar/gui/print.c:1100
+#: ../calendar/gui/alarm-notify/util.c:64
+#, c-format
+msgid "(%d %s %d %s)"
+msgstr "(%d %s %d %s)"
+
+#: ../calendar/gui/alarm-notify/util.c:64
+#: ../calendar/gui/dialogs/recurrence-page.c:991
+msgid "second"
+msgstr "二"
+
+#: ../calendar/gui/alarm-notify/util.c:64 ../filter/filter.glade.h:18
+#: ../mail/mail-config.glade.h:177
+msgid "seconds"
+msgstr "秒後"
+
+# calendar/gui/e-week-view-main-item.c:342
+#: ../calendar/gui/alarm-notify/util.c:66
+#, c-format
+msgid "(%d %s)"
+msgstr "(%d %s)"
+
+# calendar/gui/event-editor.c:1563
+#: ../calendar/gui/alarm-notify/util.c:77
+#, c-format
+msgid " %u second"
+msgstr " %u 秒"
+
+# calendar/gui/event-editor.c:1563
+#: ../calendar/gui/alarm-notify/util.c:77
+#, c-format
+msgid " %u seconds"
+msgstr " %u 秒"
+
+# calendar/gui/event-editor.c:1558
+#: ../calendar/gui/alarm-notify/util.c:79
+#, c-format
+msgid " %u minute"
+msgstr " %u 分"
+
+# calendar/gui/event-editor.c:1558
+#: ../calendar/gui/alarm-notify/util.c:79
+#, c-format
+msgid " %u minutes"
+msgstr " %u 分"
+
+# calendar/gui/event-editor.c:1553
+#: ../calendar/gui/alarm-notify/util.c:81
+#, c-format
+msgid "%u hour"
+msgstr "%u 小時"
+
+# calendar/gui/event-editor.c:1553
+#: ../calendar/gui/alarm-notify/util.c:81
+#, c-format
+msgid "%u hours"
+msgstr "%u 小時"
+
 # calendar/gui/event-editor-dialog.glade.h:22
 # calendar/gui/event-editor.c:1597
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
@@ -5271,19 +5108,16 @@ msgstr "鬧鈴程式"
 msgid "Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "今天到期的工作背景色彩，使用 \"#rrggbb\" 格式。"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "過期工作的背景色彩，使用 \"#rrggbb\" 格式。"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
@@ -5303,7 +5137,6 @@ msgid "Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示"
 
 # mail/mail-ops.c:1449
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Confirm expunge"
 msgstr "清空時確認"
@@ -5318,12 +5151,10 @@ msgid "Default appointment reminder"
 msgstr "預設的約會提醒"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Default reminder units"
 msgstr "預設提醒的單位"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Default reminder value"
 msgstr "預設提醒的數值"
@@ -5346,7 +5177,6 @@ msgstr "隱藏已完成的工作"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "隱藏工作單位"
@@ -5375,7 +5205,6 @@ msgstr "在「日」和「工作週」檢視中顯示間隔，以分鐘計。"
 msgid "Last alarm time"
 msgstr "上次鬧鈴時刻"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server urls for free/busy publishing."
 msgstr "用於空閒/忙碌發佈的伺服器 url 清單"
@@ -5396,27 +5225,22 @@ msgstr "Marcus Bains 線色彩─時刻列"
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "工作日結束分鐘，0 到 59。"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "工作日開始分鐘，0 到 59。"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "月檢視的水平窗格位置"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "月檢視的垂直窗格位置"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining for a default reminder."
 msgstr "決定預設提醒的單位數目。"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "決定何時隱藏工作的單位數目。"
@@ -5460,48 +5284,69 @@ msgid ""
 msgstr ""
 "垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
-# Novell Translation
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "用來做為鬧鈴而執行的程式。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "在事件/工作/會議編輯器中顯示 RSVP 欄位"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "在事件/工作/會議編輯器中顯示 角色 欄位"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "在週及月的檢視內顯示約會的結束時間"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "在事件/會議/工作編輯器中顯示 分類 欄位"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "在通知匣中顯示鬧鈴畫面"
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Show status field in the event/task/meeting editor"
+msgstr "在事件/工作/會議編輯器中顯示 狀態 欄位"
+
 # calendar/gui/event-editor-dialog.glade.h:15
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 #: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "顯示「預覽」窗格"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "顯示「預覽」窗格。"
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+msgid "Show timezone field in the event/meeting editor"
+msgstr "在事件/會議編輯器中顯示 時區 欄位"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+msgid "Show type field in the event/task/meeting editor"
+msgstr "在事件/工作/會議編輯器中顯示 類型 欄位"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "在日期導覽顯示週數"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "今天到期工作的色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "工作垂直窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5509,7 +5354,7 @@ msgstr ""
 "用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 "
 "\"America/New York\"。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
@@ -5518,118 +5363,135 @@ msgstr ""
 "要做為空閒/忙碌資料回饋之用的網址範例，%u 要以郵件位址的使用者部分來取代，而 "
 "%d 要替換為網域名稱。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "時間分隔"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "上次鬧鈴執行的時間(_T)"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "時區"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24 小時制格式"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "預設提醒單位，「分鐘」、「小時」或「日」。"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "決定何時隱藏工作的單位，「分鐘」、「小時」或「日」。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "一週開始於"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "每週的開始，從星期日 (0) 到星期六 (6)。"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "是否使用通知匣顯示鬧鈴。"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "刪除約會或工作時是否要求確認。"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "清除約會或工作時是否要求確認。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "是否壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空位中。"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在週及月的檢視內顯示約會的結束時間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是否在行事曆中繪出 Marcus Bains 線（代表目前時刻的直線）。"
 
 # calendar/gui/e-calendar-table.c:714
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是否在工作檢視中隱藏完成的工作。"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "是否設定約會的預設提醒。"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "是否在事件/工作/會議編輯器中顯示 RSVP 欄位"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "是否在事件/會議編輯器中顯示 狀態 欄位"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "是否在事件/工作/會議編輯器中顯示 角色 欄位"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "是否在事件/工作/會議編輯器中顯示 狀態 欄位"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是否使用 24 小時制時間而不是使用上午/下午。"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "是否在事件/會議編輯器中顯示 時區 欄位"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "是否在事件/工作/會議編輯器中顯示 類型 欄位"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是否在日期導覽中顯示週數。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "工作日"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "工作日結束小時"
 
 # shell/e-shell-view-menu.c:590
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "工作日結束分鐘"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "工作日開始小時"
 
-# Novell Translation
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "工作日開始分鐘"
 
@@ -5649,7 +5511,6 @@ msgid "Comment contains"
 msgstr "備註包含"
 
 # calendar/gui/gnome-cal.c:235
-# Novell Translation
 #: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "位置包含"
@@ -5658,20 +5519,35 @@ msgstr "位置包含"
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+# addressbook/gui/widgets/e-addressbook-view.c:614
+# mail/message-browser.c:199
+# ui/evolution-addressbook.xml.h:9
+# ui/evolution-calendar.xml.h:23
+# ui/evolution-mail.xml.h:65
+# ui/evolution-tasks.xml.h:4
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2512
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "列印"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-commands.c:120
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2116
+#: ../calendar/gui/gnome-cal.c:2117
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
+#: ../plugins/hula-account-setup/camel-hula-listener.c:374
+#: ../plugins/hula-account-setup/camel-hula-listener.c:403
 msgid "Calendar"
 msgstr "行事曆"
 
-# Novell Translation
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:355
 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 "
@@ -5679,12 +5555,11 @@ msgid ""
 msgstr ""
 "此作業會永久性刪除比選取時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
 
-# Novell Translation
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "清除事件早於"
 
-#: ../calendar/gui/calendar-commands.c:365
+#: ../calendar/gui/calendar-commands.c:366
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
@@ -5693,7 +5568,6 @@ msgstr "清除事件早於"
 msgid "days"
 msgstr "天"
 
-# Novell Translation
 #. Create the On the web source group
 #. Create the LDAP source group
 #. Create the Webcal source group
@@ -5705,7 +5579,6 @@ msgstr "天"
 msgid "On The Web"
 msgstr "在網站上"
 
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
 msgstr "生日和週年紀念日"
@@ -5717,63 +5590,25 @@ msgid "Weather"
 msgstr "天氣"
 
 # ui/evolution-addressbook.xml.h:7
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:535
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:429
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:853
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3050
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:102 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "複製(_C)"
-
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "刪除(_D)"
-
-# ui/evolution-event-editor.xml.h:70
-# ui/evolution-mail.xml.h:115
-# ui/evolution-task-editor-dialog.xml.h:83
-# ui/evolution.xml.h:60
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "屬性(_P)..."
-
 # calendar/gui/e-itip-control.glade.h:8
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "升級行事曆失敗。"
 
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:1157
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "無法開啟行事曆 '%s' 來建立事件和會議"
 
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:1170
 msgid "There is no calendar available for creating events and meetings"
 msgstr "沒有行事曆可用來建立事件和會議"
 
 # data/evolution.keys.in.h:2
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:1284
 msgid "Calendar Source Selector"
 msgstr "行事曆來源選擇器"
@@ -5804,14 +5639,12 @@ msgid "M_eeting"
 msgstr "會議(_M)"
 
 # ui/evolution-tasks.xml.h:2
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:1485
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:1491
 msgid "New all day appointment"
 msgstr "新的全日約會"
@@ -5821,23 +5654,21 @@ msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
 # ui/evolution-calendar.xml.h:5
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:1493
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
 # ui/evolution-addressbook.xml.h:7
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:1499
 msgid "New calendar"
 msgstr "新行事曆"
 
 #: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/dialogs/event-page.c:829
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
 # ui/evolution.xml.h:10
-# Novell Translation
 #: ../calendar/gui/calendar-component.c:1501
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
@@ -5864,18 +5695,15 @@ msgstr "月檢視"
 
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
-# Novell Translation
 #: ../calendar/gui/comp-editor-factory.c:420
 msgid "Error while opening the calendar"
 msgstr "開啟行事曆時發生錯誤"
 
-# Novell Translation
 #: ../calendar/gui/comp-editor-factory.c:426
 msgid "Method not supported when opening the calendar"
 msgstr "開啟行事曆時不支援方法"
 
 # shell/e-storage.c:475
-# Novell Translation
 #: ../calendar/gui/comp-editor-factory.c:432
 msgid "Permission denied to open the calendar"
 msgstr "拒絕許可權來開啟行事曆"
@@ -5887,7 +5715,6 @@ msgid "Unknown error"
 msgstr "不明的錯誤"
 
 # data/evolution.keys.in.h:2
-# Novell Translation
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>鬧鈴</b>"
@@ -5895,20 +5722,17 @@ msgstr "<b>鬧鈴</b>"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-# Novell Translation
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>選項</b>"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 # calendar/gui/event-editor-dialog.glade.h:21
-# Novell Translation
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>重複</b>"
 
 # calendar/gui/e-calendar-table.c:162
-# Novell Translation
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "新增鬧鈴"
@@ -5917,7 +5741,6 @@ msgstr "新增鬧鈴"
 msgid "Custom _message"
 msgstr "自訂訊息(_M)"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
 msgstr "自訂鬧鈴聲音"
@@ -5933,7 +5756,6 @@ msgstr "訊息(_S):"
 msgid "Play a sound"
 msgstr "播放音效"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
@@ -5947,7 +5769,6 @@ msgid "Run a program"
 msgstr "執行外部程式"
 
 # ui/evolution-message-composer.xml.h:26
-# Novell Translation
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr "收件者："
@@ -6007,7 +5828,8 @@ msgstr "時"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgstr "時"
@@ -6023,8 +5845,7 @@ msgstr "分"
 msgid "start of appointment"
 msgstr "約會開始"
 
-# Novell Translation
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:200
 msgid "Action/Trigger"
 msgstr "動作/觸發"
 
@@ -6034,6 +5855,8 @@ msgstr "加入(_A)"
 
 # calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "鬧鈴"
 
@@ -6063,7 +5886,7 @@ msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2483
+#: ../calendar/gui/dialogs/comp-editor.c:2582
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
 #: ../mail/em-utils.c:483 ../mail/em-utils.c:520
 #: ../widgets/misc/e-attachment-bar.c:341
@@ -6071,10 +5894,12 @@ msgid "attachment"
 msgstr "附件"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1120
-#: ../calendar/gui/dialogs/meeting-page.c:908
+#: ../calendar/gui/dialogs/comp-editor.c:1056
+#: ../calendar/gui/dialogs/event-page.c:1734
+#: ../calendar/gui/dialogs/meeting-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:1183
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3546
+#: ../composer/e-msg-composer.c:3545
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -6082,18 +5907,18 @@ msgid "_Remove"
 msgstr "移除(_R)"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1057
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3547 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "屬性(_P)"
 
 # composer/e-msg-composer-attachment-bar.c:500
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3549
+#: ../composer/e-msg-composer.c:3548
 msgid "_Add attachment..."
 msgstr "新增附件..."
 
@@ -6102,7 +5927,7 @@ msgstr "新增附件..."
 # mail/message-list.c:1081
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:969
+#: ../widgets/misc/e-attachment-bar.c:994
 msgid "Attachment Bar"
 msgstr "附加檔案列"
 
@@ -6125,14 +5950,14 @@ msgstr "附加檔案"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
+#: ../calendar/gui/dialogs/cal-attachment.c:211
+#: ../calendar/gui/dialogs/cal-attachment.c:227
+#: ../calendar/gui/dialogs/cal-attachment.c:320
+#: ../calendar/gui/dialogs/cal-attachment.c:336
+#: ../composer/e-msg-composer-attachment.c:188
+#: ../composer/e-msg-composer-attachment.c:204
+#: ../composer/e-msg-composer-attachment.c:298
+#: ../composer/e-msg-composer-attachment.c:314
 #: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
 #: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
 #, c-format
@@ -6141,17 +5966,16 @@ msgstr "不能附加檔案 %s： %s"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
+#: ../calendar/gui/dialogs/cal-attachment.c:219
+#: ../calendar/gui/dialogs/cal-attachment.c:328
+#: ../composer/e-msg-composer-attachment.c:196
+#: ../composer/e-msg-composer-attachment.c:306
 #: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "不能附加檔案 %s：不是一個合法的檔案"
 
 # composer/e-msg-composer-attachment.glade.h:2
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
 #: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
@@ -6187,16 +6011,15 @@ msgstr "MIME 類型:"
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:919
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:583
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "已啟用"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-# Novell Translation
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:740
 msgid "Are you sure you want to remove this URL?"
 msgstr "確定要移除此 URL？"
 
@@ -6204,28 +6027,27 @@ msgstr "確定要移除此 URL？"
 # composer/e-msg-composer-attachment-bar.c:468
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:743
 msgid "Remove"
 msgstr "移除"
 
 # shell/e-shortcuts-view.c:265
-# Novell Translation
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:741
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:748
 msgid "Don't Remove"
 msgstr "不要移除"
 
 # mail/mail-accounts.c:197
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:856
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:863
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "停用"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:858
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:408
 msgid "Enable"
@@ -6256,43 +6078,36 @@ msgstr "30 分"
 msgid "60 minutes"
 msgstr "60 分"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "<b>Alerts</b>"
 msgstr "<b>警告</b>"
 
 # data/evolution.keys.in.h:2
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>Default Free/Busy Server</b>"
 msgstr "<b>預設空閒/忙碌伺服器</b>"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 # calendar/gui/event-editor-dialog.glade.h:21
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<b>General</b>"
 msgstr "<b>一般</b>"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Publishing</b>"
 msgstr "<b>發佈</b>"
 
 # data/evolution.keys.in.h:2
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Task List</b>"
 msgstr "<b>工作清單</b>"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Time</b>"
 msgstr "<b>時刻</b>"
 
 # ui/evolution-calendar.xml.h:35
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<b>Work Week</b>"
 msgstr "<b>工作週</b>"
@@ -6327,7 +6142,6 @@ msgstr "天"
 
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Display"
 msgstr "顯示"
@@ -6338,13 +6152,14 @@ msgid "E_nable"
 msgstr "啟用(_E)"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-# Novell Translation
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/event-editor.c:555
+#: ../ui/evolution-event-editor.xml.h:6
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "星期五"
@@ -6359,7 +6174,7 @@ msgid "Minutes"
 msgstr "分"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "星期一"
@@ -6374,7 +6189,7 @@ msgid "S_un"
 msgstr "週日(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "星期六"
@@ -6389,7 +6204,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1052
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "星期日"
@@ -6409,12 +6224,13 @@ msgid "Template:"
 msgstr "樣板:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "星期四"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
@@ -6426,7 +6242,7 @@ msgstr "時刻格式:"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 # calendar/gui/event-editor.c:476
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "星期二"
@@ -6436,7 +6252,7 @@ msgid "W_eek starts:"
 msgstr "一週開始於(_E):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "星期三"
@@ -6521,7 +6337,6 @@ msgstr "用來選擇提醒單位的選項選單"
 msgid "option menu to choose time units"
 msgstr "用來選擇時刻單位的選項選單"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
 msgstr "複製行事曆內容至本地用於離線作業"
@@ -6542,13 +6357,11 @@ msgstr "色彩(_O):"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Tasks List"
 msgstr "工作清單"
 
 # views/mail/galview.xml.h:4
-# Novell Translation
 #: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memos List"
 msgstr "備忘錄清單"
@@ -6560,7 +6373,6 @@ msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
 
 # ui/evolution-addressbook.xml.h:7
-# Novell Translation
 #: ../calendar/gui/dialogs/calendar-setup.c:462
 msgid "New Calendar"
 msgstr "新行事曆"
@@ -6579,7 +6391,6 @@ msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
 # ui/evolution-addressbook.xml.h:7
-# Novell Translation
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "新增行事曆"
@@ -6587,7 +6398,6 @@ msgstr "新增行事曆"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "新增工作清單"
@@ -6606,7 +6416,6 @@ msgstr "加入行事曆(_A)"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "新增工作清單(_A)"
@@ -6710,40 +6519,39 @@ msgid "Due "
 msgstr "期限 "
 
 # mail/mail-tools.c:219
-# Novell Translation
-#: ../calendar/gui/dialogs/comp-editor.c:191 ../composer/e-msg-composer.c:2801
+#: ../calendar/gui/dialogs/comp-editor.c:194 ../composer/e-msg-composer.c:2800
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
 
 # composer/e-msg-composer-attachment-bar.c:501
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:196
-#: ../calendar/gui/dialogs/comp-editor.c:366 ../composer/e-msg-composer.c:2806
-#: ../composer/e-msg-composer.c:2985
+#: ../calendar/gui/dialogs/comp-editor.c:199
+#: ../calendar/gui/dialogs/comp-editor.c:369 ../composer/e-msg-composer.c:2805
+#: ../composer/e-msg-composer.c:2984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊息"
 msgstr[1] "附加 %d 個訊息"
 
-#: ../calendar/gui/dialogs/comp-editor.c:430 ../composer/e-msg-composer.c:3051
+#: ../calendar/gui/dialogs/comp-editor.c:433 ../composer/e-msg-composer.c:3050
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3053
+#: ../calendar/gui/dialogs/comp-editor.c:435 ../composer/e-msg-composer.c:3052
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
 
 # shell/e-setup.c:163
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:778
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978 ../composer/e-msg-composer.c:2444
+#: ../calendar/gui/dialogs/comp-editor.c:914 ../composer/e-msg-composer.c:2443
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6753,47 +6561,46 @@ msgstr[1] "<b>%d</b> 個附加檔案"
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:944
 msgid "Hide Attachment _Bar"
 msgstr "隱藏附加檔案列(_B)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../calendar/gui/dialogs/comp-editor.c:1011
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:1364
 msgid "Show Attachment _Bar"
 msgstr "顯示附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1388
 msgid "Attachment Button: Press space key to toggle attachment bar"
 msgstr "附件按鈕：按下空白鍵切換附加檔案列"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/gui/dialogs/comp-editor.c:1892
-#: ../calendar/gui/dialogs/comp-editor.c:1935
+#: ../calendar/gui/dialogs/comp-editor.c:1991
+#: ../calendar/gui/dialogs/comp-editor.c:2034
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../calendar/gui/dialogs/comp-editor.c:1898
-#: ../calendar/gui/dialogs/comp-editor.c:1941
+#: ../calendar/gui/dialogs/comp-editor.c:1997
+#: ../calendar/gui/dialogs/comp-editor.c:2040
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: ../calendar/gui/dialogs/comp-editor.c:1900
-#: ../calendar/gui/dialogs/comp-editor.c:1943
+#: ../calendar/gui/dialogs/comp-editor.c:1999
+#: ../calendar/gui/dialogs/comp-editor.c:2042
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
 # calendar/gui/calendar-model.c:1578
-# Novell Translation
-#: ../calendar/gui/dialogs/comp-editor.c:1904
-#: ../calendar/gui/dialogs/comp-editor.c:1947
+#: ../calendar/gui/dialogs/comp-editor.c:2003
+#: ../calendar/gui/dialogs/comp-editor.c:2046
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
@@ -6801,121 +6608,102 @@ msgstr "指派的工作 - %s"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: ../calendar/gui/dialogs/comp-editor.c:1906
-#: ../calendar/gui/dialogs/comp-editor.c:1949
+#: ../calendar/gui/dialogs/comp-editor.c:2005
+#: ../calendar/gui/dialogs/comp-editor.c:2048
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1909
-#: ../calendar/gui/dialogs/comp-editor.c:1952
+#: ../calendar/gui/dialogs/comp-editor.c:2008
+#: ../calendar/gui/dialogs/comp-editor.c:2051
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: ../calendar/gui/dialogs/comp-editor.c:1920
-#: ../calendar/gui/dialogs/comp-editor.c:1962
+#: ../calendar/gui/dialogs/comp-editor.c:2019
+#: ../calendar/gui/dialogs/comp-editor.c:2061
 msgid "No summary"
 msgstr "沒有摘要"
 
-# Novell Translation
-#: ../calendar/gui/dialogs/comp-editor.c:2575
-#: ../calendar/gui/dialogs/comp-editor.c:2608
-#: ../calendar/gui/dialogs/comp-editor.c:2632
+#: ../calendar/gui/dialogs/comp-editor.c:2675
+#: ../calendar/gui/dialogs/comp-editor.c:2708
+#: ../calendar/gui/dialogs/comp-editor.c:2732
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有新的更新，則會放棄對此項目所做的變更"
 
-# Novell Translation
-#: ../calendar/gui/dialogs/comp-editor.c:2656
+#: ../calendar/gui/dialogs/comp-editor.c:2756
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本！"
 
 # camel/providers/local/camel-mbox-summary.c:655
-# Novell Translation
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "無法開啟來源"
 
 # calendar/gui/e-itip-control.c:883
-# Novell Translation
 #: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
 msgstr "無法開啟目的地"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
 msgstr "目的地是唯讀"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除事件。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除項目。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "因為許可全被拒絕，所以無法刪除事件。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "因為許可全被拒絕，所以無法刪除工作。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "因為許可權被拒絕，所以無法刪除日誌項目。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "因為許可權被拒絕，所以無法刪除項目。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "由於 corba 錯誤，所以無法刪除事件。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "由於錯誤，所以無法刪除項目。"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:24
 # calendar/gui/event-editor-dialog.glade.h:29
-# Novell Translation
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "連絡人..."
 
-# Novell Translation
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To:"
@@ -6926,76 +6714,89 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: ../calendar/gui/dialogs/event-editor.c:141
+#: ../calendar/gui/dialogs/event-editor.c:531
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
 # calendar/gui/event-editor-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:150
-msgid "_Recurrence"
-msgstr "週期性(_R)"
-
-# ui/evolution-event-editor.xml.h:46
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Schedulin_g"
-msgstr "排程(_G)"
-
-#: ../calendar/gui/dialogs/event-editor.c:174
+#: ../calendar/gui/dialogs/event-editor.c:535
+#: ../ui/evolution-event-editor.xml.h:12
+msgid "Recurrence"
+msgstr "週期性"
+
+#: ../calendar/gui/dialogs/event-page.c:835
+#: ../calendar/gui/dialogs/task-page.c:444
+msgid "Or_ganizer"
+msgstr "召集人(_G)"
+
+#: ../calendar/gui/dialogs/event-page.c:873
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
-#: ../calendar/gui/dialogs/event-editor.c:178
-msgid "_Attendees"
-msgstr "到會者(_A)"
+#: ../calendar/gui/dialogs/event-page.c:875
+msgid "Atte_ndees"
+msgstr "到會者(_N)"
 
-# widgets/misc/e-messagebox.c:152
-# Novell Translation
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
-msgid "In_vitations"
-msgstr "邀請(_V)"
-
-# Novell Translation
-#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no start date"
 msgstr "無開始日期的事件"
 
-# Novell Translation
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1037
 msgid "Event with no end date"
 msgstr "無結束日期的事件"
 
 # calendar/gui/e-calendar-table.c:154
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
+#: ../calendar/gui/dialogs/event-page.c:1397
+#: ../calendar/gui/dialogs/meeting-page.c:464
+#: ../calendar/gui/dialogs/task-page.c:905
+msgid "The organizer selected no longer has an account."
+msgstr "選取的召集人已經沒有帳號。"
+
+#: ../calendar/gui/dialogs/event-page.c:1403
+#: ../calendar/gui/dialogs/meeting-page.c:470
+#: ../calendar/gui/dialogs/task-page.c:911
+msgid "An organizer is required."
+msgstr "需要一個召集人。"
+
+#: ../calendar/gui/dialogs/event-page.c:1418
+#: ../calendar/gui/dialogs/meeting-page.c:485
+#: ../calendar/gui/dialogs/task-page.c:926
+msgid "At least one attendee is required."
+msgstr "最少需要一個到會者。"
+
+#: ../calendar/gui/dialogs/event-page.c:1735
+#: ../calendar/gui/dialogs/meeting-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1184
+msgid "_Add "
+msgstr "新增(_A)"
+
 # shell/e-storage.c:475
-# Novell Translation
-#: ../calendar/gui/dialogs/event-page.c:1693
+#: ../calendar/gui/dialogs/event-page.c:2422
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "無法開啟行事曆 '%s'。"
 
 # calendar/gui/event-editor.c:1612
-#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/event-page.c:2662
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -7003,7 +6804,7 @@ msgstr[0] "在每個約會前 %d 天"
 msgstr[1] "在每個約會前 %d 天"
 
 # calendar/gui/event-editor-dialog.glade.h:36
-#: ../calendar/gui/dialogs/event-page.c:1902
+#: ../calendar/gui/dialogs/event-page.c:2670
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -7011,7 +6812,7 @@ msgstr[0] "約會前 %d 小時"
 msgstr[1] "約會前 %d 小時"
 
 # calendar/gui/event-editor.c:1612
-#: ../calendar/gui/dialogs/event-page.c:1910
+#: ../calendar/gui/dialogs/event-page.c:2678
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -7019,158 +6820,89 @@ msgstr[0] "約會前 %d 分鐘"
 msgstr[1] "約會前 %d 分鐘"
 
 # calendar/gui/event-editor.c:1612
-# Novell Translation
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 day before appointment"
-msgstr "約會前 1 天"
-
-# calendar/gui/event-editor.c:1612
-# Novell Translation
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 hour before appointment"
 msgstr "約會前 1 小時"
 
 # calendar/gui/event-editor.c:1612
-# Novell Translation
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "15 minutes before appointment"
 msgstr "約會前 15 分鐘"
 
-# data/evolution.keys.in.h:2
-# Novell Translation
+# calendar/gui/event-editor.c:1612
+#: ../calendar/gui/dialogs/event-page.glade.h:3
+msgid "1day before appointment"
+msgstr "約會前 1 天"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "<b>Basics</b>"
-msgstr "<b>基本</b>"
+msgid "Atte_ndees..."
+msgstr "到會者(_N)..."
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:7
-# calendar/gui/event-editor-dialog.glade.h:8
-# Novell Translation
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "<b>Date and Time</b>"
-msgstr "<b>日期和時間</b>"
+msgid "C_ustomize"
+msgstr "自訂(_U)"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
-# Novell Translation
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "<b>Send Options</b>"
-msgstr "<b>傳送選項</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr "全天事件(_L)"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr "進階傳送選項(_V)"
-
-# calendar/gui/e-calendar-table.c:162
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Ala_rm"
-msgstr "鬧鈴(_R)"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-msgid "C_ustomize..."
-msgstr "自訂(_U)..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "分類(_T)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Cale_ndar:"
 msgstr "行事曆(_N):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Classi_fication:"
-msgstr "分類(_F):"
-
-# calendar/gui/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:364
-msgid "Confidential"
-msgstr "機密"
-
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "事件描述"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Locat_ion:"
 msgstr "地點(_I):"
 
-# calendar/gui/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:363
-msgid "Private"
-msgstr "私人"
-
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
-msgid "Public"
-msgstr "公開"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-msgid "Show time as bus_y"
-msgstr "顯示時間為忙碌(_Y)"
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "Or_ganizer:"
+msgstr "會議召集人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "摘要(_M):"
 
-# Novell Translation
-#: ../calendar/gui/dialogs/event-page.glade.h:22
-msgid "This appointment has customized alarms"
-msgstr "此約會有自訂的鬧鈴"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:645
-msgid "_End time:"
-msgstr "結束時刻(_E):"
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+msgid "_Set alarm\t"
+msgstr "設定鬧鈴(_S)\t"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:618
-msgid "_Start time:"
-msgstr "開始時刻(_S):"
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr "時間(_T):"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+# calendar/gui/event-editor-dialog.glade.h:37
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "for"
+msgstr "發生"
+
+# calendar/gui/event-editor-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "until"
+msgstr "直至"
+
+#: ../calendar/gui/dialogs/meeting-page.c:306
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>代理者(_G)</b>"
 
-# Novell Translation
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:310
 msgid "<b>From:</b>"
 msgstr "<b>從:</b>"
 
@@ -7179,10 +6911,10 @@ msgstr "<b>從:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:316
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2247
+#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -7191,28 +6923,11 @@ msgstr "<b>從:</b>"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
+#: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
 msgid "None"
 msgstr "無"
 
-# Novell Translation
-#: ../calendar/gui/dialogs/meeting-page.c:463
-msgid "The organizer selected no longer has an account."
-msgstr "選取的召集人已經沒有帳號。"
-
-#: ../calendar/gui/dialogs/meeting-page.c:469
-msgid "An organizer is required."
-msgstr "需要一個召集人。"
-
-#: ../calendar/gui/dialogs/meeting-page.c:484
-msgid "At least one attendee is required."
-msgstr "最少需要一個到會者。"
-
-#: ../calendar/gui/dialogs/meeting-page.c:909
-msgid "_Add "
-msgstr "新增(_A)"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -7283,15 +6998,10 @@ msgstr "變更會議召集人(_H)"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:24
 # calendar/gui/event-editor-dialog.glade.h:29
-# Novell Translation
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "Co_ntacts..."
 msgstr "連絡人(_N)..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "會議召集人(_G):"
-
 # calendar/gui/e-itip-control.glade.h:9
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
@@ -7309,20 +7019,49 @@ msgid "Memo"
 msgstr "備忘錄"
 
 # addressbook/gui/component/addressbook.c:438
-# Novell Translation
-#: ../calendar/gui/dialogs/memo-page.c:489
+#: ../calendar/gui/dialogs/memo-page.c:490
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "無法在「%s」開啟備忘錄。"
 
 # views/mail/galview.xml.h:4
-# Novell Translation
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "<span weight=\"bold\">Basics</span>"
 msgstr "<span weight=\"bold\">基本</span>"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+msgid "Classi_fication:"
+msgstr "分類(_F):"
+
+# calendar/gui/calendar-model.c:366
+# calendar/gui/calendar-model.c:902
+# calendar/gui/e-calendar-table.c:325
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Confidential"
+msgstr "機密"
+
+# calendar/gui/calendar-model.c:363
+# calendar/gui/calendar-model.c:900
+# calendar/gui/e-calendar-table.c:324
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:365
+msgid "Private"
+msgstr "私人"
+
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
+msgid "Public"
+msgstr "公開"
+
 #: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:16
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -7331,39 +7070,33 @@ msgid "_Memo Content:"
 msgstr "備忘錄內容(_M):"
 
 # data/evolution.keys.in.h:2
-# Novell Translation
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>行事曆選項</b>"
 
 # ui/evolution-addressbook.xml.h:7
-# Novell Translation
 #: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "新增行事曆"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-# Novell Translation
 #: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "行事曆群組"
 
 # data/evolution.keys.in.h:2
-# Novell Translation
 #: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "行事曆位置"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-# Novell Translation
 #: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "行事曆名稱"
 
 # data/evolution.keys.in.h:2
-# Novell Translation
 #: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>工作清單選項</b>"
@@ -7371,7 +7104,6 @@ msgstr "<b>工作清單選項</b>"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "新增工作清單"
@@ -7379,7 +7111,6 @@ msgstr "新增工作清單"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "工作清單群組"
@@ -7387,135 +7118,117 @@ msgstr "工作清單群組"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "工作清單名稱"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "您正在修改週期性事件，您想要修改什麼?"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event, what would like to delegate?"
 msgstr "您正在委任週期性事件，您想要委派什麼？"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "您正在修改週期性工作，您想要修改什麼？"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/recur-comp.c:62
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "您正在修改週期性日誌項目，您想要修改什麼？"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "限此例項"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "此例項和先前的例項"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "此例項和以後的例項"
 
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-# Novell Translation
 #: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "所有例項"
 
 # calendar/gui/event-editor.c:871
-#: ../calendar/gui/dialogs/recurrence-page.c:497
+#: ../calendar/gui/dialogs/recurrence-page.c:498
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-# Novell Translation
-#: ../calendar/gui/dialogs/recurrence-page.c:818
+#: ../calendar/gui/dialogs/recurrence-page.c:819
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
 # calendar/gui/event-editor.c:449
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
 msgstr "於"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "first"
 msgstr "一"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
-msgid "second"
-msgstr "二"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "third"
 msgstr "三"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:993
 msgid "fourth"
 msgstr "四"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "last"
 msgstr "最後"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
-#: ../calendar/gui/dialogs/recurrence-page.c:1016
+#: ../calendar/gui/dialogs/recurrence-page.c:1017
 msgid "Other Date"
 msgstr "其它日期"
 
 # calendar/gui/event-editor.c:474
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "day"
 msgstr "天"
 
 # calendar/gui/event-editor.c:601
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../calendar/gui/dialogs/recurrence-page.c:1182
 msgid "on the"
 msgstr "在第"
 
 # calendar/gui/event-editor.c:754
-#: ../calendar/gui/dialogs/recurrence-page.c:1370
+#: ../calendar/gui/dialogs/recurrence-page.c:1371
 msgid "occurrences"
 msgstr "出現"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:7
 # calendar/gui/event-editor-dialog.glade.h:8
-# Novell Translation
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2326
 msgid "Date/Time"
 msgstr "日期/時間"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-# Novell Translation
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>例外</b>"
 
 # calendar/gui/event-editor-dialog.glade.h:15
-# Novell Translation
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
 #: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>預覽</b>"
 
 # calendar/gui/event-editor-dialog.glade.h:18
-# Novell Translation
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>週期</b>"
@@ -7529,11 +7242,6 @@ msgstr "每"
 msgid "This appointment rec_urs"
 msgstr "這個約會循環(_U)"
 
-# calendar/gui/event-editor-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "發生"
-
 # calendar/gui/event-editor-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
@@ -7544,11 +7252,6 @@ msgstr "永遠"
 msgid "month(s)"
 msgstr "月"
 
-# calendar/gui/event-editor-dialog.glade.h:45
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "直至"
-
 # calendar/gui/event-editor-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
@@ -7563,25 +7266,22 @@ msgstr "年"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:411
+#: ../calendar/gui/dialogs/task-details-page.c:431
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
 # addressbook/contact-editor/contact-editor.glade.h:16
-# Novell Translation
-#: ../calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:523
 msgid "Web Page"
 msgstr "網頁"
 
 # views/mail/galview.xml.h:4
-# Novell Translation
 #: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">雜項</span>"
 
 # views/mail/galview.xml.h:4
-# Novell Translation
 #: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">狀態</span>"
@@ -7592,7 +7292,7 @@ msgstr "<span weight=\"bold\">狀態</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:895
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
@@ -7605,7 +7305,7 @@ msgstr "已完成"
 # mail/message-list.c:689
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1018
 msgid "High"
 msgstr "高"
 
@@ -7618,7 +7318,7 @@ msgstr "高"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2369
 msgid "In Progress"
 msgstr "進行中"
 
@@ -7629,13 +7329,13 @@ msgstr "進行中"
 # mail/message-list.c:687
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:387
 #: ../mail/message-list.c:1017
 msgid "Normal"
 msgstr "正常"
@@ -7648,7 +7348,7 @@ msgstr "正常"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2366
 msgid "Not Started"
 msgstr "未開始"
 
@@ -7665,7 +7365,7 @@ msgstr "狀態(_U):"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "未指定"
 
@@ -7682,53 +7382,52 @@ msgstr "優先順序(_P):"
 msgid "_Web Page:"
 msgstr "網頁(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:137
+#: ../calendar/gui/dialogs/task-editor.c:419
 #: ../calendar/gui/tasks-component.c:1172
 msgid "_Task"
 msgstr "工作(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:146
-msgid "_Status"
-msgstr "狀態(_S)"
+# addressbook/contact-editor/contact-editor.glade.h:8
+# calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/task-editor.c:423
+msgid "Task Details"
+msgstr "工作詳細資料"
 
-# calendar/gui/calendar-model.c:1578
-#: ../calendar/gui/dialogs/task-editor.c:161
-#: ../calendar/gui/dialogs/task-editor.c:223
-#: ../calendar/gui/dialogs/task-editor.c:380
-msgid "Assig_nment"
-msgstr "指派工作(_N)"
+#: ../calendar/gui/dialogs/task-page.c:437
+msgid "_Group"
+msgstr "群組(_G)"
 
-#: ../calendar/gui/dialogs/task-page.c:529
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
 # addressbook/gui/component/addressbook.c:438
-# Novell Translation
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:1614
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "無法在 '%s' 開啟工作。"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "分類(_I)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "描述(_E):"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Or_ganiser:"
+msgstr "召集人(_G):"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Sta_rt date:"
 msgstr "開始日(_R):"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:14
-msgid "Task Description"
-msgstr "工作描述"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Time zone:"
+msgstr "時區:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:8
 msgid "_Due date:"
 msgstr "到期日(_D):"
 
@@ -7736,7 +7435,6 @@ msgstr "到期日(_D):"
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>空閒/忙碌行事曆(_A)</b>"
 
-# Novell Translation
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>發佈頻率</b>"
@@ -7746,7 +7444,6 @@ msgid "<b>Publishing _Location</b>"
 msgstr "<b>發佈位置(_L)</b>"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-# Novell Translation
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "空閒/忙碌發佈設定"
@@ -7765,7 +7462,6 @@ msgstr "密碼(_P):"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-# Novell Translation
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "_Remember password"
 msgstr "記住密碼(_R)"
@@ -7875,7 +7571,6 @@ msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
 # calendar/gui/e-calendar-table.c:163
-# Novell Translation
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
 #, c-format
@@ -7887,7 +7582,6 @@ msgid "Memo:"
 msgstr "備忘錄:"
 
 # addressbook/contact-editor/contact-editor.glade.h:16
-# Novell Translation
 #: ../calendar/gui/e-cal-component-memo-preview.c:232
 #: ../calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
@@ -7905,14 +7599,12 @@ msgid "Summary:"
 msgstr "摘要:"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:18
-# Novell Translation
 #: ../calendar/gui/e-cal-component-preview.c:193
 #: ../calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "開始日期："
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:25
-# Novell Translation
 #: ../calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "截止日期："
@@ -7923,12 +7615,11 @@ msgstr "截止日期："
 #: ../calendar/gui/e-cal-component-preview.c:222
 #: ../calendar/gui/e-itip-control.c:1131
 #: ../plugins/exchange-operations/exchange-account-setup.c:265
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../plugins/itip-formatter/itip-view.c:908
 msgid "Status:"
 msgstr "狀態:"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-# Novell Translation
 #: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "優先程度："
@@ -7953,13 +7644,13 @@ msgstr "摘要"
 
 # ui/evolution-calendar.xml.h:36
 #: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:436
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "空閒"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:393
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:437
+#: ../calendar/gui/e-calendar-table.c:439
 #: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "Busy"
 msgstr "忙碌"
@@ -8004,7 +7695,7 @@ msgstr "否"
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:665
+#: ../widgets/misc/e-attachment-bar.c:690
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "不明"
@@ -8031,14 +7722,13 @@ msgid "Select folder to save selected attachments..."
 msgstr "選擇用來儲存選定的附加檔案的資料夾..."
 
 # mail/mail-search.c:138
-# Novell Translation
 #: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
@@ -8048,7 +7738,6 @@ msgstr "另存新檔(_S)..."
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
-# Novell Translation
 #: ../calendar/gui/e-cal-popup.c:272
 msgid "_Save Selected"
 msgstr "儲存選取的(_S)"
@@ -8060,137 +7749,137 @@ msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
 # calendar/gui/e-calendar-table.c:367
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
 # calendar/gui/e-calendar-table.c:368
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
 # calendar/gui/e-calendar-table.c:369
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
 # calendar/gui/e-calendar-table.c:370
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
 # calendar/gui/e-calendar-table.c:371
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
 # calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
 # calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
 # calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
 # calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
 # calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
 # calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:518
+#: ../calendar/gui/e-calendar-table.c:525
 msgid "Task Table"
 msgstr "工作表格"
 
 # calendar/gui/e-calendar-table.c:714
-#: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:671 ../calendar/gui/e-memo-table.c:426
+#: ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:799 ../calendar/gui/e-memo-table.c:603
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "更新物件"
 
 # composer/e-msg-composer.c:774
-#: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../calendar/gui/e-memo-table.c:735
-#: ../composer/e-msg-composer.c:1342
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1132 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1341
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "開啟網頁(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../calendar/gui/e-memo-table.c:848
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1536
+#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:855
 #: ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:122 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "列印(_P)..."
 
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:1 ../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:1176
-#: ../calendar/gui/e-calendar-view.c:1533
-#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:854
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1563 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "以 iCalendar 轉寄(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
 # calendar/gui/e-calendar-table.c:713
-#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "標示選定的工作為已完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1188
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
 # calendar/gui/e-calendar-table.c:163
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "請按這裡增加新的工作"
@@ -8208,14 +7897,12 @@ msgid "Complete"
 msgstr "完成"
 
 # calendar/gui/e-calendar-table.c:152
-# Novell Translation
 #: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "完成日期"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
-# Novell Translation
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "截止日期"
@@ -8228,7 +7915,6 @@ msgid "Priority"
 msgstr "優先順序"
 
 # calendar/gui/e-calendar-table.c:154
-# Novell Translation
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "開始日期"
@@ -8241,86 +7927,84 @@ msgid "Task sort"
 msgstr "工作排序"
 
 # mail/mail-ops.c:898
-# Novell Translation
-#: ../calendar/gui/e-calendar-view.c:1252
+#: ../calendar/gui/e-calendar-view.c:1258
 msgid "Moving items"
 msgstr "移動項目"
 
 # mail/mail-ops.c:898
-# Novell Translation
-#: ../calendar/gui/e-calendar-view.c:1254
+#: ../calendar/gui/e-calendar-view.c:1260
 msgid "Copying items"
 msgstr "複製項目"
 
-#: ../calendar/gui/e-calendar-view.c:1524
+#: ../calendar/gui/e-calendar-view.c:1530
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1525
+#: ../calendar/gui/e-calendar-view.c:1531
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1532
 msgid "New _Meeting"
 msgstr "新增會議(_M)"
 
 # ui/evolution-tasks.xml.h:3
-#: ../calendar/gui/e-calendar-view.c:1527
+#: ../calendar/gui/e-calendar-view.c:1533
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1537
+#: ../calendar/gui/e-calendar-view.c:1543
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "目前檢視(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1545
 msgid "Select T_oday"
 msgstr "選擇今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1546
 msgid "_Select Date..."
 msgstr "選擇日期(_S)..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "發佈空閒/忙碌資訊(_P)"
 
-#: ../calendar/gui/e-calendar-view.c:1561
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1562
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1563
+#: ../calendar/gui/e-calendar-view.c:1569
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1564
+#: ../calendar/gui/e-calendar-view.c:1570
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1571
 msgid "_Forward as iCalendar..."
 msgstr "以 iCalendar 轉寄(_F)..."
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1572
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
@@ -8399,7 +8083,6 @@ msgid "pm"
 msgstr "下午"
 
 # calendar/gui/event-editor-dialog.glade.h:26
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "是。(複雜循環)"
@@ -8428,18 +8111,15 @@ msgstr[0] "每週於"
 msgstr[1] "每 %d 週於"
 
 # ui/evolution-message-composer.xml.h:26
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:786
 msgid " and "
 msgstr " 和 "
 
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:793
 #, c-format
 msgid "The %s day of "
 msgstr "%s 日於 "
 
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s %s of "
@@ -8467,26 +8147,22 @@ msgid_plural " a total of %d times"
 msgstr[0] "總共 %d 次"
 msgstr[1] "總共 %d 次"
 
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:837
 msgid ", ending on "
 msgstr "，結束於 "
 
 # calendar/gui/e-meeting-dialog.glade.h:23
 # mail/message-list.c:1081
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:861
 msgid "Starts"
 msgstr "開始"
 
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:874
 msgid "Ends"
 msgstr "結束"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:908
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
@@ -8508,10 +8184,10 @@ msgstr "iCalendar 錯誤"
 # shell/e-storage.c:481
 #: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
 #: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
+#: ../plugins/itip-formatter/itip-view.c:337
 #: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:405
 #: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "不明人士"
 
@@ -8544,14 +8220,12 @@ msgstr "暫時接受"
 msgid "Declined"
 msgstr "婉拒"
 
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:1228
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "會議已經取消，但是在您的行事曆中找不到"
 
-# Novell Translation
 #: ../calendar/gui/e-itip-control.c:1230
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
@@ -9026,7 +8700,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
 #: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1736
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -9073,39 +8747,43 @@ msgid ">_>"
 msgstr ">_>"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:545
-# Novell Translation
 #: ../calendar/gui/e-meeting-time-sel.c:555
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:558
-# Novell Translation
 #: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:571
-# Novell Translation
 #: ../calendar/gui/e-meeting-time-sel.c:573
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:584
-# Novell Translation
 #: ../calendar/gui/e-meeting-time-sel.c:582
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../calendar/gui/e-memo-table.c:267
+#: ../calendar/gui/e-meeting-time-sel.c:618
+msgid "_Start time:"
+msgstr "開始時刻(_S):"
+
+#: ../calendar/gui/e-meeting-time-sel.c:645
+msgid "_End time:"
+msgstr "結束時刻(_E):"
+
+#: ../calendar/gui/e-memo-table.c:274
 msgid "Memo Table"
 msgstr "備忘錄表格"
 
-#: ../calendar/gui/e-memo-table.c:863
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "刪除選定的備忘錄(_D)"
 
 # calendar/gui/e-calendar-table.c:163
-#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
@@ -9118,8 +8796,8 @@ msgid "Memo sort"
 msgstr "備忘錄排序"
 
 # mail/mail-mt.c:190
-#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
-#: ../calendar/gui/gnome-cal.c:2556
+#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
+#: ../calendar/gui/gnome-cal.c:2565
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -9129,48 +8807,45 @@ msgstr ""
 " %s"
 
 # ui/evolution-mail.xml.h:46
-# Novell Translation
-#: ../calendar/gui/e-memos.c:775
+#: ../calendar/gui/e-memos.c:776
 msgid "Loading memos"
 msgstr "正在載入備忘錄"
 
 # mail/mail-ops.c:1262
-#: ../calendar/gui/e-memos.c:860
+#: ../calendar/gui/e-memos.c:861
 #, c-format
 msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
 # calendar/gui/e-calendar-table.c:714
-#: ../calendar/gui/e-memos.c:1033 ../calendar/gui/e-tasks.c:1225
+#: ../calendar/gui/e-memos.c:1034 ../calendar/gui/e-tasks.c:1226
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
 # camel/camel-smime-context.c:194
-# Novell Translation
-#: ../calendar/gui/e-pub-utils.c:311
+#: ../calendar/gui/e-pub-utils.c:322
 #, c-format
 msgid "Enter the password for %s"
 msgstr "輸入 %s 的密碼"
 
 # ui/evolution-mail.xml.h:46
-# Novell Translation
-#: ../calendar/gui/e-tasks.c:870
+#: ../calendar/gui/e-tasks.c:871
 msgid "Loading tasks"
 msgstr "正在載入工作"
 
 # mail/mail-ops.c:1262
-#: ../calendar/gui/e-tasks.c:957
+#: ../calendar/gui/e-tasks.c:958
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
 # calendar/gui/e-calendar-table.c:152
-#: ../calendar/gui/e-tasks.c:1202
+#: ../calendar/gui/e-tasks.c:1203
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
 # mail/mail-ops.c:1449
-#: ../calendar/gui/e-tasks.c:1252
+#: ../calendar/gui/e-tasks.c:1253
 msgid "Expunging"
 msgstr "除去中"
 
@@ -9187,45 +8862,39 @@ msgstr "時區按鈕"
 msgid "%d %B"
 msgstr "%d %B"
 
-# Novell Translation
-#: ../calendar/gui/gnome-cal.c:791
+#: ../calendar/gui/gnome-cal.c:792
 msgid "Updating query"
 msgstr "正在更新查詢"
 
 # widgets/menus/gal-view-menus.c:176
-#: ../calendar/gui/gnome-cal.c:2231
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Custom View"
 msgstr "自訂檢視(_C)"
 
-# Novell Translation
-#: ../calendar/gui/gnome-cal.c:2232
+#: ../calendar/gui/gnome-cal.c:2241
 msgid "_Save Custom View"
 msgstr "儲存自訂檢視(_S)"
 
 # widgets/menus/gal-view-menus.c:202
-# Novell Translation
-#: ../calendar/gui/gnome-cal.c:2237
+#: ../calendar/gui/gnome-cal.c:2246
 msgid "_Define Views..."
 msgstr "定義檢視(_D)..."
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-# Novell Translation
-#: ../calendar/gui/gnome-cal.c:2399
+#: ../calendar/gui/gnome-cal.c:2408
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "載入 %s 的約會"
 
 # ui/evolution-mail.xml.h:46
-# Novell Translation
-#: ../calendar/gui/gnome-cal.c:2418
+#: ../calendar/gui/gnome-cal.c:2427
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "載入 %s 的工作"
 
 # mail/mail-display.c:299
-# Novell Translation
-#: ../calendar/gui/gnome-cal.c:2522
+#: ../calendar/gui/gnome-cal.c:2531
 #, c-format
 msgid "Opening %s"
 msgstr "開啟 %s"
@@ -9235,8 +8904,7 @@ msgstr "開啟 %s"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-# Novell Translation
-#: ../calendar/gui/gnome-cal.c:3440
+#: ../calendar/gui/gnome-cal.c:3449
 msgid "Purging"
 msgstr "清除"
 
@@ -9285,7 +8953,6 @@ msgid "October"
 msgstr "十月"
 
 # addressbook/gui/component/select-names/select-names.glade.h:3
-# Novell Translation
 #: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "選擇日期"
@@ -9360,6 +9027,41 @@ msgstr "iCalendar 資訊"
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
+# ui/evolution-event-editor.xml.h:13
+# ui/evolution-mail.xml.h:8
+# ui/evolution-task-editor-dialog.xml.h:14
+#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "複製"
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "刪除"
+
+# ui/evolution-event-editor.xml.h:70
+# ui/evolution-mail.xml.h:115
+# ui/evolution-task-editor-dialog.xml.h:83
+# ui/evolution.xml.h:60
+#: ../calendar/gui/memos-component.c:451
+msgid "Properties..."
+msgstr "屬性..."
+
 # calendar/gui/event-editor.c:1558
 #: ../calendar/gui/memos-component.c:524
 #, c-format
@@ -9376,23 +9078,19 @@ msgstr[0] "，%d 已選擇"
 msgstr[1] "，%d 已選擇"
 
 # ui/evolution-mail.xml.h:46
-# Novell Translation
 #: ../calendar/gui/memos-component.c:573
 msgid "Failed upgrading memos."
 msgstr "升級備忘錄失敗。"
 
-# Novell Translation
 #: ../calendar/gui/memos-component.c:869
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "無法開啟備忘錄清單「%s」來建立事件和會議"
 
-# Novell Translation
 #: ../calendar/gui/memos-component.c:882
 msgid "There is no calendar available for creating memos"
 msgstr "沒有可用的行事曆來建立備忘錄"
 
-# Novell Translation
 #: ../calendar/gui/memos-component.c:973
 msgid "Memo Source Selector"
 msgstr "備忘錄來源選擇器"
@@ -9408,7 +9106,6 @@ msgid "_Memo"
 msgstr "備忘錄(_M)"
 
 # ui/evolution-tasks.xml.h:2
-# Novell Translation
 #: ../calendar/gui/memos-component.c:1158
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
@@ -9416,7 +9113,6 @@ msgstr "建立新的備忘錄"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/memos-component.c:1164
 msgid "New memo list"
 msgstr "新備忘錄清單"
@@ -9426,7 +9122,6 @@ msgid "Memo l_ist"
 msgstr "備忘錄清單(_I)"
 
 # ui/evolution-tasks.xml.h:2
-# Novell Translation
 #: ../calendar/gui/memos-component.c:1166
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
@@ -9434,11 +9129,10 @@ msgstr "建立新備忘錄清單"
 # ui/evolution-contact-editor.xml.h:6
 # ui/evolution-event-editor.xml.h:37
 # ui/evolution-task-editor-dialog.xml.h:40
-#: ../calendar/gui/memos-control.c:334
+#: ../calendar/gui/memos-control.c:340
 msgid "Print Memos"
 msgstr "列印備忘錄"
 
-# Novell Translation
 #: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -9450,7 +9144,6 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-# Novell Translation
 #: ../calendar/gui/migration.c:155
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
@@ -9462,14 +9155,12 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-# Novell Translation
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
 
 # shell/e-storage.c:475
-# Novell Translation
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:777
 #, c-format
@@ -9477,7 +9168,6 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "無法移轉移行事曆 `%s'"
 
 # addressbook/gui/component/addressbook.c:438
-# Novell Translation
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:944
 #, c-format
@@ -9796,7 +9486,6 @@ msgstr "列印項目"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/tasks-component.c:439
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
@@ -9810,23 +9499,19 @@ msgstr[0] "%d 個工作"
 msgstr[1] "%d 個工作"
 
 # ui/evolution-mail.xml.h:46
-# Novell Translation
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "升級工作失敗。"
 
-# Novell Translation
 #: ../calendar/gui/tasks-component.c:875
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "無法開啟工作清單 '%s' 來建立事件和會議"
 
-# Novell Translation
 #: ../calendar/gui/tasks-component.c:888
 msgid "There is no calendar available for creating tasks"
 msgstr "沒有可用的行事曆來建立工作"
 
-# Novell Translation
 #: ../calendar/gui/tasks-component.c:988
 msgid "Task Source Selector"
 msgstr "工作來源選擇器"
@@ -9842,7 +9527,6 @@ msgid "Create a new task"
 msgstr "建立一個新的工作"
 
 # calendar/gui/calendar-model.c:1578
-# Novell Translation
 #: ../calendar/gui/tasks-component.c:1179
 msgid "New assigned task"
 msgstr "新指定的工作"
@@ -9852,7 +9536,6 @@ msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
 # ui/evolution-tasks.xml.h:2
-# Novell Translation
 #: ../calendar/gui/tasks-component.c:1181
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
@@ -9860,7 +9543,6 @@ msgstr "建立新指定的工作"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-# Novell Translation
 #: ../calendar/gui/tasks-component.c:1187
 msgid "New task list"
 msgstr "新工作清單"
@@ -9870,12 +9552,11 @@ msgid "Task l_ist"
 msgstr "工作清單(_I)"
 
 # ui/evolution-tasks.xml.h:2
-# Novell Translation
 #: ../calendar/gui/tasks-component.c:1189
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:435
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9890,12 +9571,12 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:438
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
 # ui/evolution-calendar.xml.h:25
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:472
 msgid "Print Tasks"
 msgstr "列印工作"
 
@@ -9906,7 +9587,6 @@ msgstr "列印工作"
 msgid "SMTWTFS"
 msgstr "日一二三四五六"
 
-# Novell Translation
 #: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "約會和會議"
@@ -9917,13 +9597,11 @@ msgid "Opening calendar"
 msgstr "開啟行事曆"
 
 # calendar/gui/e-itip-control.glade.h:4
-# Novell Translation
 #: ../calendar/importers/icalendar-importer.c:429
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# Novell Translation
 #: ../calendar/importers/icalendar-importer.c:430
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
@@ -9933,13 +9611,11 @@ msgstr "Evolution iCalendar 輸入器"
 msgid "Reminder!!"
 msgstr "提醒！！"
 
-# Novell Translation
 #: ../calendar/importers/icalendar-importer.c:539
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 檔案 (.vcf)"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# Novell Translation
 #: ../calendar/importers/icalendar-importer.c:540
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
@@ -9950,7 +9626,6 @@ msgid "Calendar Events"
 msgstr "行事曆事件"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# Novell Translation
 #: ../calendar/importers/icalendar-importer.c:739
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
@@ -11493,7 +11168,6 @@ msgid "Posting destination"
 msgstr "張貼的目的端"
 
 # composer/e-msg-composer-attachment-bar.c:501
-# Novell Translation
 #: ../composer/e-msg-composer-hdrs.c:559
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
@@ -11571,7 +11245,6 @@ msgstr "輸入郵件密件副本的收件者"
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-# Novell Translation
 #: ../composer/e-msg-composer-hdrs.c:667
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡，選取要張貼的資料夾"
@@ -11586,13 +11259,11 @@ msgstr "張貼到:"
 msgid "A_ttach"
 msgstr "附加(_T)"
 
-# Novell Translation
 #: ../composer/e-msg-composer.c:832
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽名送出的郵件：此帳號沒有設定簽名憑證"
 
-# Novell Translation
 #: ../composer/e-msg-composer.c:839
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -11600,59 +11271,57 @@ msgid ""
 msgstr "無法加密送出的郵件：沒有設定加密憑證(此帳號)"
 
 # camel/camel-sasl-login.c:127
-#: ../composer/e-msg-composer.c:1323 ../composer/e-msg-composer.c:1357
+#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "不明的原因"
 
 # camel/camel-filter-driver.c:671
-# Novell Translation
-#: ../composer/e-msg-composer.c:1395
+#: ../composer/e-msg-composer.c:1394
 msgid "Could not open file"
 msgstr "無法開啟檔案"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../composer/e-msg-composer.c:1403
+#: ../composer/e-msg-composer.c:1402
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
 # mail/mail-search.c:138
-# Novell Translation
-#: ../composer/e-msg-composer.c:1678
+#: ../composer/e-msg-composer.c:1677
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
 # composer/e-msg-composer.c:966
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1713
+#: ../composer/e-msg-composer.c:1712
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../composer/e-msg-composer.c:2127 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "自動產生的"
 
 # mail/mail-config.glade.h:74
-#: ../composer/e-msg-composer.c:2230
+#: ../composer/e-msg-composer.c:2229
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: ../composer/e-msg-composer.c:2473 ../composer/e-msg-composer.c:3674
-#: ../composer/e-msg-composer.c:3677
+#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
+#: ../composer/e-msg-composer.c:3676
 msgid "Compose a message"
 msgstr "編輯郵件"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../composer/e-msg-composer.c:3792
+#: ../composer/e-msg-composer.c:3791
 msgid "_Attachment Bar"
 msgstr "附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:4882
+#: ../composer/e-msg-composer.c:4881
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11664,31 +11333,26 @@ msgid ""
 "the mail to be sent without those pending attachments "
 msgstr "這裡有一些附件要下載。傳送此郵件將無法一併寄出接下來的附件"
 
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "所有帳號已經移除。"
 
 # calendar/gui/dialogs/delete-comp.c:87
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:3
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "確定要放棄您正在撰寫且標題為 '{0}'的郵件？"
 
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "因為「{0}」，所以您可能需要選取不同的郵件選項。"
 
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "因為「{1}」。"
 
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
@@ -11699,48 +11363,40 @@ msgstr ""
 "以讓您以後再繼續撰寫郵件。"
 
 # camel/camel-movemail.c:306
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
 msgstr "無法建立撰寫視窗。"
 
 # camel/camel-movemail.c:306
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
 msgstr "無法建立郵件。"
 
 # mail/mail-crypto.c:59
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "無法讀取簽名檔案「{0}」。"
 
 # camel/camel-movemail.c:306
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "無法擷取郵件來附加 (從 {0})。"
 
 # mail/mail-crypto.c:59
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "無法儲存至自動儲存檔案「{0}」。"
 
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
 msgstr "無法附加目錄到郵件。"
 
 # calendar/gui/dialogs/save-comp.c:51
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "要復原未完成的郵件？"
 
 # shell/e-shortcuts-view.c:265
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Don't Recover"
 msgstr "不要復原"
@@ -11750,12 +11406,10 @@ msgid "Download in progress. Do you want to send the mail?"
 msgstr "下載尚在進行中。您是否要寄出此郵件？"
 
 # shell/e-shortcuts.c:381
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:16
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "儲存至自動儲存時發生錯誤，因為「{1}」。"
 
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
@@ -11767,17 +11421,14 @@ msgstr ""
 # composer/e-msg-composer-attachment-bar.c:468
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Recover"
 msgstr "復原"
 
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "檔案 `{0}' 不是一般檔案而且無法在郵件中傳送。"
 
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
@@ -11787,7 +11438,6 @@ msgstr ""
 "它。"
 
 # composer/evolution-composer.c:355
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
@@ -11799,13 +11449,11 @@ msgstr ""
 "\n"
 "請確定您安裝的是正確的gtkhtml 和 libgtkhtml 版本。"
 
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
 msgstr "無法啟動地址選擇器控制。"
 
 # mail/mail-search.c:138
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:25
 msgid "Unfinished messages found"
 msgstr "找到未完成的郵件"
@@ -11816,19 +11464,16 @@ msgid "Warning: Modified Message"
 msgstr "警告：編輯過的郵件"
 
 # composer/e-msg-composer-attachment-bar.c:501
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "您無法將檔案 `{0}' 附加到此郵件。"
 
 # mail/mail-callbacks.c:146
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr "撰寫郵件前，您需要先設定帳號。"
 
 # mail/mail-callbacks.c:1188
-# Novell Translation
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "儲存郵件"
@@ -11843,7 +11488,6 @@ msgid "Evolution"
 msgstr "Evolution"
 
 # data/evolution.desktop.in.h:2
-# Novell Translation
 #: ../data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
 msgstr "Evolution Groupware 套件"
@@ -11858,7 +11502,6 @@ msgstr "地址卡"
 msgid "calendar information"
 msgstr "行事曆資訊"
 
-# Novell Translation
 #: ../designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
@@ -11869,17 +11512,14 @@ msgstr ""
 "\n"
 "您要變更您的狀態至「在辦公室」嗎？ "
 
-# Novell Translation
 #: ../designs/OOA/ooa.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>外出訊息：</b>"
 
-# Novell Translation
 #: ../designs/OOA/ooa.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>狀態：</b>"
 
-# Novell Translation
 #: ../designs/OOA/ooa.glade.h:6
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
@@ -11889,49 +11529,40 @@ msgstr ""
 "<small>當您不在辦公室時，以下指定的郵件將會自動傳送給\n"
 "每一位傳送郵件給您的人。</small>"
 
-# Novell Translation
 #: ../designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
 msgstr "我目前在辦公室"
 
-# Novell Translation
 #: ../designs/OOA/ooa.glade.h:9
 msgid "I am currently out of the office"
 msgstr "我目前不在辦公室"
 
-# Novell Translation
 #: ../designs/OOA/ooa.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "否，請不要變更狀態"
 
-# Novell Translation
 #: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
 msgstr "外出助理"
 
-# Novell Translation
 #: ../designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
 msgstr "是，請變更狀態"
 
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:1
 msgid "      "
 msgstr "      "
 
 # mail/mail-config.glade.h:57
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>正在接收電子郵件</b>"
 
 # mail/mail-config.glade.h:65
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>正在傳送電子郵件:</b>"
 
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
@@ -11942,37 +11573,30 @@ msgstr ""
 "<small>此頁面可以讓您選擇當您傳送的郵件已閱讀時，是否傳送讀信回條，\n"
 "以及指定當某人要求您傳送回條時，Evolution 要做什麼。</small>"
 
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "永遠送回讀信回條"
 
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "詢問我是否要傳送讀信回條"
 
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "永遠不傳送讀信回條"
 
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "讀信回條"
 
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "要求所有傳送的郵件都要索取讀信回條"
 
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "除非郵件傳送至郵寄清單，而不是給我個人"
 
-# Novell Translation
 #: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
@@ -11981,7 +11605,7 @@ msgstr "當您收到讀信回條要求的電子郵件時，Evolution 要做什�
 
 # mail/mail-callbacks.c:1144
 # mail/mail-display.c:96
-#: ../e-util/e-dialog-utils.c:270
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11991,7 +11615,7 @@ msgstr ""
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: ../e-util/e-dialog-utils.c:272 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "覆蓋檔案？"
 
@@ -12005,25 +11629,21 @@ msgstr "Evolution 錯誤"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-# Novell Translation
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
 # data/evolution.keys.in.h:2
-# Novell Translation
 #: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution 資訊"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution 查詢"
 
 # mail/mail-config.glade.h:69
-# Novell Translation
 #. setup a dummy error
 #: ../e-util/e-error.c:438
 #, c-format
@@ -12038,7 +11658,6 @@ msgstr "<span weight=\"bold\">內部錯誤，要求的不明錯誤 '%s'</span>"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-# Novell Translation
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "無法開啟檔案「{0}」。"
@@ -12050,22 +11669,19 @@ msgstr "無法開啟檔案「{0}」。"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-# Novell Translation
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file &quot;{0}&quot;."
 msgstr "無法儲存檔案「{0}」。"
 
-# Novell Translation
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "要覆寫它?"
 
-# Novell Translation
 #: ../e-util/e-system.error.xml.h:5
 msgid "File exists &quot;{0}&quot;."
 msgstr "檔案存在「{0}」。"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:126
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:128
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
@@ -12171,7 +11787,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
+#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -12184,7 +11800,7 @@ msgstr "%I:%M %p"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
+#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12198,7 +11814,6 @@ msgid "%I %p"
 msgstr "%I %p"
 
 # calendar/gui/gnome-cal.c:235
-# Novell Translation
 #: ../e-util/eggtrayicon.c:119
 msgid "The orientation of the tray."
 msgstr "系統匣的方向。"
@@ -12305,7 +11920,6 @@ msgstr "稍後"
 msgid "Test"
 msgstr "測試"
 
-# Novell Translation
 #: ../filter/filter-rule.c:791
 msgid "_Rule name:"
 msgstr "規則名稱(_R):"
@@ -12327,23 +11941,19 @@ msgstr "如果任何條件符合"
 msgid "Execute actions"
 msgstr "執行動作"
 
-# Novell Translation
 #: ../filter/filter-rule.c:881
 msgid "All related"
 msgstr "所有相關的"
 
-# Novell Translation
 #: ../filter/filter-rule.c:881
 msgid "Replies"
 msgstr "回覆"
 
-# Novell Translation
 #: ../filter/filter-rule.c:881
 msgid "Replies and parents"
 msgstr "回覆和父代"
 
 # addressbook/printing/e-contact-print.glade.h:17
-# Novell Translation
 #: ../filter/filter-rule.c:883
 msgid "Include threads"
 msgstr "包括線串"
@@ -12357,46 +11967,38 @@ msgstr "內送"
 msgid "Outgoing"
 msgstr "外寄"
 
-# Novell Translation
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "錯誤的正規表示式「{0}」。"
 
-# Novell Translation
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "無法編譯正規表示式「{1}」。"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-# Novell Translation
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgstr "檔案「{0}」不存在或者不是一般檔案。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-# Novell Translation
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
 msgstr "缺少日期。"
 
-# Novell Translation
 #: ../filter/filter.error.xml.h:5
 msgid "Missing file name."
 msgstr "缺少檔案名稱。"
 
 # calendar/gui/calendar-model.c:1578
-# Novell Translation
 #: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
 msgid "Missing name."
 msgstr "缺少名稱。"
 
-# Novell Translation
 #: ../filter/filter.error.xml.h:7
 msgid "Name &quot;{0}&quot; already used."
 msgstr "已使用名稱「{0}」。"
 
-# Novell Translation
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
 msgstr "請選擇其他名稱。"
@@ -12463,10 +12065,6 @@ msgstr "前"
 msgid "months"
 msgstr "月"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr "秒後"
-
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "目前時間"
@@ -12512,42 +12110,35 @@ msgstr "在此設定您的郵件帳號"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-# Novell Translation
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Evolution 郵件"
 
 # mail/mail-account-editor.c:173
-# Novell Translation
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolution 郵件帳號組態控制"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Evolution 郵件配件"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Evolution 郵件撰寫器"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr "Evolution 郵件撰寫器組態控制"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
-# Novell Translation
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 郵件優先設定控制"
 
-# Novell Translation
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
 #: ../mail/importers/elm-importer.c:342
 #: ../mail/importers/netscape-importer.c:1902
@@ -12571,13 +12162,11 @@ msgstr "郵件偏好設定"
 msgid "_Mail"
 msgstr "郵件(_M)"
 
-# Novell Translation
 #: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 授權合約"
 
-# Novell Translation
 #: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
@@ -12622,7 +12211,6 @@ msgid "Sending Email"
 msgstr "傳送電子郵件"
 
 # mail/mail-config.glade.h:21
-# Novell Translation
 #: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "預設值"
@@ -12634,7 +12222,6 @@ msgid "Security"
 msgstr "安全性"
 
 # mail/mail-config.glade.h:59
-# Novell Translation
 #. Most sections for this is auto-generated fromt the camel config
 #: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
 msgid "Receiving Options"
@@ -12677,44 +12264,41 @@ msgid "Mail Accounts Table"
 msgstr "郵件帳號表"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../mail/em-composer-prefs.c:309 ../mail/em-composer-prefs.c:435
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "未命名的"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: ../mail/em-composer-prefs.c:925
+#: ../mail/em-composer-prefs.c:936
 msgid "Language(s)"
 msgstr "語言"
 
 # mail/mail-config.glade.h:74
-# Novell Translation
-#: ../mail/em-composer-prefs.c:968
+#: ../mail/em-composer-prefs.c:979
 msgid "Add signature script"
 msgstr "新增簽名程序檔"
 
 # mail/mail-config.glade.h:74
-#: ../mail/em-composer-prefs.c:988
+#: ../mail/em-composer-prefs.c:999
 msgid "Signature(s)"
 msgstr "簽名檔"
 
 # mail/mail-ops.c:1154
-# Novell Translation
-#: ../mail/em-composer-utils.c:848 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:862 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../mail/em-composer-utils.c:1643
+#: ../mail/em-composer-utils.c:1657
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-# Novell Translation
 #. 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:1690
+#: ../mail/em-composer-utils.c:1704
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12739,7 +12323,7 @@ msgstr "指定色彩"
 msgid "Assign Score"
 msgstr "指定目標"
 
-#: ../mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
 msgid "Attachments"
 msgstr "附加檔案"
 
@@ -12853,14 +12437,12 @@ msgid "is not Flagged"
 msgstr "沒有標幟的"
 
 # calendar/gui/goto-dialog.glade.h:9
-# Novell Translation
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾郵件"
 
 # calendar/gui/goto-dialog.glade.h:9
-# Novell Translation
 #: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "垃圾郵件測試"
@@ -12890,13 +12472,11 @@ msgid "Message Header"
 msgstr "郵件檔頭"
 
 # views/mail/galview.xml.h:4
-# Novell Translation
 #: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "垃圾郵件"
 
 # mail/folder-browser.c:706
-# Novell Translation
 #: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "非垃圾郵件"
@@ -12906,7 +12486,6 @@ msgid "Move to Folder"
 msgstr "移至資料夾"
 
 # ui/evolution.xml.h:19
-# Novell Translation
 #: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "建立程式管道"
@@ -13001,7 +12580,6 @@ msgstr "主旨"
 msgid "Unset Status"
 msgstr "取消設定狀態"
 
-# Novell Translation
 #. and now for the action area
 #: ../mail/em-filter-rule.c:488
 msgid "<b>Then</b>"
@@ -13030,7 +12608,6 @@ msgstr[1] "未閱讀的郵件:"
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-# Novell Translation
 #: ../mail/em-folder-properties.c:278
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
@@ -13041,7 +12618,6 @@ msgid "<click here to select a folder>"
 msgstr "<按這裏選擇資料夾>"
 
 # calendar/gui/event-editor-dialog.glade.h:15
-# Novell Translation
 #: ../mail/em-folder-selector.c:261
 msgid "Create"
 msgstr "建立"
@@ -13056,13 +12632,11 @@ msgstr "資料夾名稱(_N):"
 msgid "Search Folders"
 msgstr "搜尋資料夾"
 
-# Novell Translation
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr "不符合"
 
-# Novell Translation
 #: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
 msgid "Drafts"
 msgstr "草稿"
@@ -13073,7 +12647,6 @@ msgstr "草稿"
 msgid "Inbox"
 msgstr "收件匣"
 
-# Novell Translation
 #: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
 msgid "Outbox"
 msgstr "寄件匣"
@@ -13088,14 +12661,12 @@ msgstr "已傳送"
 msgid "Loading..."
 msgstr "載入中..."
 
-# Novell Translation
 #: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-# Novell Translation
 #: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
@@ -13103,37 +12674,33 @@ msgstr "正在移動資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-# Novell Translation
 #: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
 # mail/mail-ops.c:898
-# Novell Translation
 #: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-# mail/mail-ops.c:898 
-# Novell Translation
+# mail/mail-ops.c:898
 #: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-# Novell Translation
 #: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
 
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:103
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:113
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
@@ -13144,7 +12711,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "掃描「%s」內的資料夾"
 
 #: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:46
@@ -13172,7 +12739,7 @@ msgstr "新增資料夾(_N)..."
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:123
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:125
 msgid "_Empty Trash"
 msgstr "清空垃圾桶(_E)"
 
@@ -13193,13 +12760,11 @@ msgstr "選擇資料夾"
 msgid "C_opy"
 msgstr "複製(_O)"
 
-# Novell Translation
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "重新命名「%s」資料夾為："
 
-# Novell Translation
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "重新命名資料夾"
@@ -13210,7 +12775,6 @@ msgstr "資料夾名稱不能包含斜線。"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-# Novell Translation
 #: ../mail/em-folder-utils.c:581
 #: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
@@ -13218,14 +12782,12 @@ msgid "Creating folder `%s'"
 msgstr "正在建立資料夾 `%s'"
 
 # ui/evolution.xml.h:10
-# Novell Translation
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:384
 msgid "Create folder"
 msgstr "建立資料夾"
 
-# Novell Translation
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:384
@@ -13236,16 +12798,16 @@ msgstr "指定要建立資料夾的位置："
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:121
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:125
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
 #: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
@@ -13359,7 +12921,6 @@ msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # ui/evolution.xml.h:10
-# Novell Translation
 #: ../mail/em-folder-view.c:2416
 msgid "Create _Search Folder"
 msgstr "建立搜尋資料夾(_S)"
@@ -13375,14 +12936,12 @@ msgid "_To this Address"
 msgstr "到這個位址(_T)"
 
 # calendar/gui/e-calendar-table.c:163
-# Novell Translation
 #: ../mail/em-folder-view.c:2699
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
 
 # mail/mail-search.c:319
-# Novell Translation
 #. message-search popup match count string
 #: ../mail/em-format-html-display.c:461
 #, c-format
@@ -13390,13 +12949,11 @@ msgid "Matches: %d"
 msgstr "符合：%d"
 
 # calendar/gui/calendar-model.c:1578
-# Novell Translation
 #: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "未簽名"
 
 # mail/mail-format.c:1161
-# Novell Translation
 #: ../mail/em-format-html-display.c:712
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13404,13 +12961,11 @@ msgid ""
 msgstr "此郵件未簽名。不保證此郵件已驗證。"
 
 # mail/mail-config.glade.h:74
-# Novell Translation
 #: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "有效的簽名"
 
 # mail/mail-format.c:1161
-# Novell Translation
 #: ../mail/em-format-html-display.c:713
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13418,48 +12973,40 @@ msgid ""
 msgstr "此郵件已簽名而且有效，表示它非常有可能是驗證的郵件。"
 
 # mail/mail-config.glade.h:74
-# Novell Translation
 #: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "無效的簽名"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:714
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "郵件的簽名無法檢驗，可能已在傳送時被更動了。"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:715
 msgid "Valid signature, cannot verify sender"
 msgstr "簽名有效，但無法檢驗寄件者"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:715
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "此郵件有一個有效的簽名，但是郵件的寄件者無法檢驗。"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:721 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "未加密"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:721
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr "此郵件未加密。它的內容在透過網際網路傳送可能會被檢視。"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "已加密，不嚴密"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:722
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
@@ -13470,24 +13017,20 @@ msgstr ""
 "日，並不是無法檢視此郵件的內容。"
 
 # ui/evolution-message-composer.xml.h:13
-# Novell Translation
 #: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "已加密"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:723
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "此郵件已加密。外面的人難以檢視此郵件的內容。"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:724
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
@@ -13501,13 +13044,11 @@ msgstr ""
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:840
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
 # mail/message-list.c:977
-# Novell Translation
 #: ../mail/em-format-html-display.c:1122
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完成於 %B %d, %Y, %l:%M %p"
@@ -13518,7 +13059,6 @@ msgid "Overdue:"
 msgstr "逾期:"
 
 # mail/message-list.c:977
-# Novell Translation
 #: ../mail/em-format-html-display.c:1133
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "作者 %B %d, %Y, %l:%M %p"
@@ -13551,7 +13091,6 @@ msgstr "附件按鈕"
 msgid "Select folder to save all attachments..."
 msgstr "選擇用來儲存所有的附加檔案的資料夾..."
 
-# Novell Translation
 #: ../mail/em-format-html-display.c:1820
 msgid "Save Selected..."
 msgstr "儲存選取的..."
@@ -13587,13 +13126,11 @@ msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
 # mail/mail-ops.c:1498
-# Novell Translation
 #: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "正在擷取 `%s'"
 
-# Novell Translation
 #: ../mail/em-format-html.c:600
 msgid "Valid signature but cannot verify sender"
 msgstr "簽名有效，但是無法檢驗寄件者"
@@ -13633,7 +13170,6 @@ msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
 
 # mail/mail-ops.c:898
-# Novell Translation
 #: ../mail/em-format-html.c:1171
 msgid "Formatting message"
 msgstr "格式化郵件"
@@ -13679,13 +13215,11 @@ msgstr "密件副本"
 msgid "Mailer"
 msgstr "寄件者"
 
-# Novell Translation
 #. translators: strftime format for local time equivalent in Date header display, with day
 #: ../mail/em-format-html.c:1603
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
-# Novell Translation
 #. translators: strftime format for local time equivalent in Date header display, without day
 #: ../mail/em-format-html.c:1606
 msgid "<I> (%R %Z)</I>"
@@ -13699,7 +13233,6 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Date"
 msgstr "日期"
 
-# Novell Translation
 #: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
@@ -13712,7 +13245,6 @@ msgid "%s attachment"
 msgstr "%s 附加檔案"
 
 # mail/mail-format.c:573
-# Novell Translation
 #: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "無法剖析 S/MIME 郵件:未知的錯誤"
@@ -13722,50 +13254,41 @@ msgstr "無法剖析 S/MIME 郵件:未知的錯誤"
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
-# Novell Translation
 #: ../mail/em-format.c:1278
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "多部份/已加密不支援的加密類型"
 
-# Novell Translation
 #: ../mail/em-format.c:1445
 msgid "Unsupported signature format"
 msgstr "不支援的簽名格式"
 
-# Novell Translation
 #: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Error verifying signature"
 msgstr "檢驗簽名發生錯誤"
 
-# Novell Translation
 #: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Unknown error verifying signature"
 msgstr "檢驗簽名發生不明錯誤"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-# Novell Translation
 #: ../mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "每次"
 
 # calendar/gui/event-editor.c:1545
-# Novell Translation
 #: ../mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "每天一次"
 
 # calendar/gui/event-editor.c:1550
-# Novell Translation
 #: ../mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "每週一次"
 
-# Novell Translation
 #: ../mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "每月一次"
 
-# Novell Translation
 #: ../mail/em-migrate.c:1198
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13779,28 +13302,24 @@ msgstr ""
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-# Novell Translation
 #: ../mail/em-migrate.c:1632
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "無法建立新資料夾 `%s'：%s"
 
 # mail/mail-ops.c:1728
-# Novell Translation
 #: ../mail/em-migrate.c:1658
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "無法複製製資料夾 `%s' 至 `%s'：%s"
 
 # mail/mail-ops.c:1728
-# Novell Translation
 #: ../mail/em-migrate.c:1843
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "無法掃描 `%s' 現有的信箱：%s"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-# Novell Translation
 #: ../mail/em-migrate.c:2047
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
@@ -13808,13 +13327,11 @@ msgstr "無法開啟舊的 POP 儲存在伺服器上的資料 `%s':%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-# Novell Translation
 #: ../mail/em-migrate.c:2061
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "無法建立 POP 儲存在伺服器上的資料目錄 `%s':%s"
 
-# Novell Translation
 #: ../mail/em-migrate.c:2090
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
@@ -13822,20 +13339,17 @@ msgstr "無法複製 POP 儲存在伺服器上的資料 `%s':%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-# Novell Translation
 #: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地郵件儲存區 `%s':%s"
 
 # mail/mail-ops.c:1728
-# Novell Translation
 #: ../mail/em-migrate.c:2693
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "無法在 `%s' 建立本地郵件資料夾:%s"
 
-# Novell Translation
 #: ../mail/em-migrate.c:2711
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
@@ -13848,7 +13362,7 @@ msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
@@ -13857,7 +13371,6 @@ msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
 # ui/evolution-contact-editor.xml.h:13
-# Novell Translation
 #: ../mail/em-popup.c:620
 msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
@@ -13866,18 +13379,15 @@ msgstr "傳送新郵件至(_S)…"
 msgid "_Add to Addressbook"
 msgstr "加入到目錄服務(_A)"
 
-# Novell Translation
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此儲存區不支援訂閱，或者未啟用它們。"
 
 # ui/evolution-subscribe.xml.h:8
-# Novell Translation
 #: ../mail/em-subscribe-editor.c:643
 msgid "Subscribed"
 msgstr "已訂閱"
 
-# Novell Translation
 #: ../mail/em-subscribe-editor.c:647
 msgid "Folder"
 msgstr "資料夾"
@@ -13907,19 +13417,16 @@ msgid "message"
 msgstr "郵件"
 
 # mail/mail-callbacks.c:1188
-# Novell Translation
 #: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "儲存郵件…"
 
 # addressbook/backend/ebook/e-card.c:3346
-# Novell Translation
 #: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "新增地址"
 
 # mail/mail-autofilter.c:229
-# Novell Translation
 #. Drop filename for messages from a mailbox
 #: ../mail/em-utils.c:1181
 #, c-format
@@ -13937,144 +13444,118 @@ msgid "Search Folder source"
 msgstr "搜尋資料夾來源"
 
 # mail/mail-config.glade.h:12
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "自動連結辨識"
 
 # mail/mail-config.glade.h:12
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
 msgstr "自動微笑辨識\t\t"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "撰寫視窗預設高度"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "撰寫視窗預設寬度"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "用於撰寫郵件的預設字元集"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "用於撰寫郵件的預設字元集。"
 
 # ui/evolution-mail.xml.h:75
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "用於顯示郵件的預設字元集"
 
 # ui/evolution-mail.xml.h:75
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "用於顯示郵件的預設字元集。"
 
 # ui/evolution-mail.xml.h:34
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
 # ui/evolution.xml.h:32
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "撰寫視窗的預設高度"
 
 # ui/evolution.xml.h:32
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "郵件視窗的預設高度"
 
 # ui/evolution.xml.h:32
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "訂閱對話方塊的預設高度"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
 # ui/evolution.xml.h:32
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "撰寫視窗的預設寬度"
 
 # ui/evolution.xml.h:32
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "郵件視窗的預設寬度"
 
 # ui/evolution.xml.h:32
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "訂閱對話方塊的預設寬度"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "當您輸入時在文字上顯示拼字錯誤指示。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾筒資料夾"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "啟用插入號模式，如此您可以在閱讀郵件時看到游標。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "郵件清單面板高度"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "郵件清單面板高度。"
@@ -14085,7 +13566,6 @@ msgid ""
 "they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的郵件，詢問使用者是否確定要這麼做。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
@@ -14096,29 +13576,24 @@ msgstr ""
 "mime-types 且對應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於"
 "顯示內容。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "上次清空垃圾筒的時間"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的清單"
 
 # mail/mail-config.glade.h:6
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "接收的授權清單"
 
 # mail/mail-config.glade.h:6
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "帳號清單"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
@@ -14127,12 +13602,10 @@ msgstr ""
 "Evolution 的郵件元件已知的帳號清單。清單包含與 /apps/evolution/mail/accounts "
 "相關的字串命名子目錄。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "自訂標頭以及它們是否啟用的清單"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
@@ -14141,22 +13614,18 @@ msgstr ""
 "Evolution 的郵件元件已知的標籤清單。清單包含字串，其中包含 name:color，color "
 "使用 HTML 十六進位編碼。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "mime 類型清單，檢查 bonobo 元件檢視器"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "已經接受其授權的協定清單。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "透過 http 載入 HTNL 郵件的影像"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
@@ -14166,118 +13635,96 @@ msgstr ""
 "透過 http(s) 載入 HTNL 郵件的影像。可能的值：0 – 從不從網路載入影像 1 – 如果"
 "寄件者是在通訊錄時，載入影像 2 - 永遠從網路載入影像"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "用於記錄過濾器動作的記錄檔案。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後，標示成已閱讀"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後，標示成已閱讀。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "在郵件「預覽」中標示引用"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在郵件「預覽」中標示引用。"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "郵件視窗預設高度"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "郵件視窗預設寬度"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
 msgstr "訊息顯示樣式 (一般、完整標頭、來源)"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空垃圾筒最少間隔天數"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空垃圾筒最少間隔天數。"
 
 # mail/mail-config.glade.h:40
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "新郵件通知聲音檔案"
 
 # mail/mail-config.glade.h:40
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "新郵件通知類型"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時，提示使用者。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳送沒有主旨的郵件時，提示使用者。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
 # ui/evolution-mail.xml.h:14
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
 # ui/evolution-mail.xml.h:14
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -14285,114 +13732,93 @@ msgid ""
 msgstr "當使用者嘗試傳送 HTML 郵件到不想接收 HTML 郵件的收件者時，顯示提示。"
 
 # ui/evolution-mail.xml.h:14
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "當使用者傳送不含收件者或副本收件者的郵件時，提示使用者。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "辨識文字中的連結並取代它們。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "辨識文字中的微笑並取代成影像。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "在內送的郵件執行垃圾郵件檢查"
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:200
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "預設傳送 HTML 郵件"
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:200
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "預設傳送 HTML 郵件。"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "顯示動畫"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "將動畫式影像顯示成動畫。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件清單中顯示刪除的郵件 (加上刪除號)"
 
 # ui/evolution-mail.xml.h:86
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件清單中顯示刪除的郵件"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "新郵件送到時要播放的音效檔案"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "指定使用者要使用的「新郵件通知」類型。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "行內拼字檢查"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "訂閱對話方塊預設高度"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "訂閱對話方塊預設寬度"
 
 # addressbook/gui/component/addressbook-storage.c:99
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "終端機字型"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "上次執行清單垃圾筒的時間，從紀元後算起的日數。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "用於郵件顯示的終端機字型"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "用於郵件顯示的變動寬度字型"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
@@ -14404,125 +13830,101 @@ msgstr ""
 "是 &lt;header enabled&gt; - 如果標頭會顯示在郵件檢視，則設定成 enabled。"
 
 # ui/evolution-mail.xml.h:93
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "串接郵件清單。"
 
 # ui/evolution-mail.xml.h:93
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "串接郵件清單"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件清單"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "將郵件標示成已閱讀的時限。"
 
 # mail/mail-config.glade.h:41
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "使用 Spamasssassin 伺服程式和用戶端"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "使用 Spamasssassin 伺服程式和用戶端 (spamc/spamd)"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "使用自訂字型"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "使用自訂字型來顯示郵件"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾郵件測試。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "只使用本地垃圾郵件測試 (沒有 DNS)。"
 
 # mail/mail-accounts.c:197
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "變動寬度字型"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "檢視/密件副本功能表項目已選取"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "檢視/密件副本功能表項目已選取。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "檢視/副本功能表項目已選取"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "檢視/副本功能表項目已選取。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "檢視/寄件者功能表項目已選取"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "檢視/寄件者功能表項目已選取。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "檢視/張貼功能表項目已選取"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "檢視/張貼功能表項目已選取。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "檢視/回覆功能表項目已選取"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "檢視/回覆功能表項目已選取。"
 
-# Novell Translation
 #: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
@@ -14530,13 +13932,11 @@ msgid ""
 msgstr "當郵件不包含 In-Reply-To 或 References 標頭時，是否按照主旨放回線串。"
 
 # shell/e-shell-importer.c:363
-# Novell Translation
 #: ../mail/importers/elm-importer.c:193
 msgid "Importing Elm data"
 msgstr "輸入 Elm 資料"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸入器"
@@ -14546,14 +13946,12 @@ msgid "Import mail from Elm."
 msgstr "從 Elm 匯入郵件。"
 
 # ui/evolution.xml.h:47
-# Novell Translation
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
 
 # mail/mail-account-gui.c:682
-# Novell Translation
 #: ../mail/importers/evolution-mbox-importer.c:85
 #: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
@@ -14568,7 +13966,6 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "匯入 Berkeley 郵件箱格式資料夾"
 
 # shell/e-shell-importer.c:363
-# Novell Translation
 #: ../mail/importers/evolution-outlook-importer.c:257
 #: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
 #, c-format
@@ -14589,7 +13986,6 @@ msgid "Please wait"
 msgstr "請稍候"
 
 # shell/e-shell-importer.c:363
-# Novell Translation
 #: ../mail/importers/evolution-outlook-importer.c:305
 #: ../mail/importers/mail-importer.c:144
 msgid "Importing mailbox"
@@ -14663,7 +14059,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
-# Novell Translation
 #: ../mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "輸入 Netscape 資料"
@@ -14686,13 +14081,11 @@ msgstr ""
 "您是否要將它們匯入至 Evolution？"
 
 # shell/e-shell-importer.c:363
-# Novell Translation
 #: ../mail/importers/pine-importer.c:230
 msgid "Importing Pine data"
 msgstr "輸入管道資料"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../mail/importers/pine-importer.c:434
 msgid "Evolution Pine importer"
 msgstr "Evolution 管道輸入器"
@@ -14801,7 +14194,6 @@ msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
 # mail/mail-vfolder.c:438
-# Novell Translation
 #: ../mail/mail-component.c:773
 msgid "New Mail Folder"
 msgstr "新郵件資料夾"
@@ -14811,17 +14203,14 @@ msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
 # ui/evolution.xml.h:10
-# Novell Translation
 #: ../mail/mail-component.c:775
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-# Novell Translation
 #: ../mail/mail-component.c:919
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升級郵件或資料夾失敗。"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
@@ -14832,7 +14221,6 @@ msgstr "    "
 msgid " Ch_eck for Supported Types "
 msgstr " 檢查可支援的類型(_E) "
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>此 Evolution 版本不支援 SSL</b>"
@@ -14845,141 +14233,114 @@ msgstr "<b>簽章(_I)</b>"
 msgid "<b>_Languages</b>"
 msgstr "<b>語言(_L)</b>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>此會讓過濾器更可靠，但速度變慢</small>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">帳號資訊</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">警告</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">驗證類型</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">驗證</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">撰寫郵件</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">組態</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">預設行為</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">刪除郵件</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">顯示的郵件標頭(_H)</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">過濾器選項</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:18
 #: ../plugins/itip-formatter/itip-formatter.c:1977
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">一般</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">標籤和色彩</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">載入影像</span>"
 
 # views/mail/galview.xml.h:4
-# Novell Translation
 #: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">郵件顯示</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">郵件字型</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">郵件回條</span>"
 
 # mail/mail-config.glade.h:40
-# Novell Translation
 #: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">新郵件通知</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">選擇性資訊</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">選項</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">嚴密隱私權 (PGP/GPG)</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">列印的字型</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">必要資訊</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">安全 MIME (S/MIME)</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">安全性</span>"
 
 # mail/mail-config.glade.h:69
-# Novell Translation
 #: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">己傳送的和草稿郵件</span>"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">伺服器組態</span>"
@@ -14997,12 +14358,10 @@ msgstr "加入新的簽名檔(_W)..."
 msgid "Add _Script"
 msgstr "新增命令稿(_S)"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使用此帳號時永遠在外送的郵件簽名(_W)"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "當傳送加密郵件時也加密本身(_F)"
@@ -15067,7 +14426,6 @@ msgstr "檢查內送郵件是否為垃圾郵件(_I)"
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字(_T)"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "檢查內送的垃圾郵件訊息"
@@ -15097,7 +14455,6 @@ msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
 
 # mail/mail-config.glade.h:15
-# Novell Translation
 #: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -15122,7 +14479,6 @@ msgstr "預設值(_F)"
 msgid "Default character e_ncoding:"
 msgstr "預設字元編碼(_N):"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "數位簽名外送的郵件 (預設值)(_S)"
@@ -15132,7 +14488,6 @@ msgstr "數位簽名外送的郵件 (預設值)(_S)"
 msgid "Do not quote original message"
 msgstr "不要引用原始郵件"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "完成"
@@ -15158,7 +14513,6 @@ msgstr "離開時清空垃圾桶資料夾(_X)"
 msgid "Encry_ption certificate:"
 msgstr "加密憑證(_P):"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "加密外送的郵件 (預設值)(_E)"
@@ -15183,13 +14537,11 @@ msgid "Format messages in _HTML"
 msgstr "將郵件格式化為 _HTML"
 
 # mail/mail-config.glade.h:36
-# Novell Translation
 #: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML 郵件"
 
 # addressbook/printing/e-contact-print.glade.h:11
-# Novell Translation
 #: ../mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "標頭"
@@ -15217,7 +14569,6 @@ msgstr "語言表"
 msgid "Mail Configuration"
 msgstr "郵件組態"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:97
 msgid "Mail Headers Table"
 msgstr "郵件標頭表"
@@ -15309,7 +14660,6 @@ msgid "Remember _password"
 msgstr "記住密碼(_P)"
 
 # ui/evolution-contact-editor.xml.h:3
-# Novell Translation
 #: ../mail/mail-config.glade.h:119
 msgid "S_elect..."
 msgstr "選取(_E)..."
@@ -15319,7 +14669,6 @@ msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
 # ui/evolution-contact-editor.xml.h:3
-# Novell Translation
 #: ../mail/mail-config.glade.h:121
 msgid "Se_lect..."
 msgstr "選取(_L)..."
@@ -15346,7 +14695,6 @@ msgid "Send message receipts:"
 msgstr "傳送郵件回條:"
 
 # mail/mail-config.glade.h:66
-# Novell Translation
 #: ../mail/mail-config.glade.h:129
 msgid "Sending Mail"
 msgstr "傳送郵件"
@@ -15363,7 +14711,6 @@ msgstr "伺服器要求驗證(_V)"
 msgid "Server _Type: "
 msgstr "伺服器類型(_T):"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:133
 msgid "Sig_ning certificate:"
 msgstr "簽名憑證(_N):"
@@ -15373,13 +14720,11 @@ msgid "Signat_ure:"
 msgstr "簽名檔(_U):"
 
 # mail/mail-config.glade.h:74
-# Novell Translation
 #: ../mail/mail-config.glade.h:135
 msgid "Signatures"
 msgstr "簽名"
 
 # mail/mail-config.glade.h:74
-# Novell Translation
 #: ../mail/mail-config.glade.h:136
 msgid "Signatures Table"
 msgstr "簽章表"
@@ -15388,7 +14733,6 @@ msgstr "簽章表"
 msgid "Specify _filename:"
 msgstr "指定檔案名稱(_F):"
 
-# Novell Translation
 #: ../mail/mail-config.glade.h:138
 msgid "Spell Checking"
 msgstr "拼字檢查"
@@ -15434,7 +14778,6 @@ msgid "V_ariable-width:"
 msgstr "可變寬度(_A):"
 
 # mail/mail-config.glade.h:81
-# Novell Translation
 #: ../mail/mail-config.glade.h:150
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15512,7 +14855,6 @@ msgid "_Show animated images"
 msgstr "顯示動畫影像(_S)"
 
 # mail/mail-config.glade.h:79
-# Novell Translation
 #: ../mail/mail-config.glade.h:173
 msgid "_Use Secure Connection:"
 msgstr "使用安全連線(_U):"
@@ -15529,17 +14871,14 @@ msgstr "色彩"
 msgid "description"
 msgstr "描述"
 
-# Novell Translation
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>搜尋資料夾來源</b>"
 
-# Novell Translation
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">數位簽名</span>"
 
-# Novell Translation
 #: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">加密</span>"
@@ -15573,17 +14912,14 @@ msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
 # mail/subscribe-dialog.c:873
-# Novell Translation
 #: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
 
-# Novell Translation
 #: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "授權合約"
 
-# Novell Translation
 #: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "未選取"
@@ -15593,7 +14929,6 @@ msgid "S_erver:"
 msgstr "伺服器(_E):"
 
 # mail/mail-config.glade.h:4
-# Novell Translation
 #: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "保全性資訊"
@@ -15606,7 +14941,6 @@ msgstr ""
 "您選擇要跟隨的郵件已在下面列出。\n"
 "請從「標幟」選單中選擇跟隨的動作。"
 
-# Novell Translation
 #: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "接受授權(_A)"
@@ -15625,7 +14959,6 @@ msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
 # mail/mail-config.glade.h:6
-# Novell Translation
 #: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "選取此項來接受授權合約(_T)"
@@ -15668,14 +15001,12 @@ msgid "Fetching Mail"
 msgstr "接收郵件"
 
 # camel/camel-movemail.c:274
-# Novell Translation
 #. sending mail, filtering failed
 #: ../mail/mail-ops.c:563
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器：%s"
 
-# Novell Translation
 #: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
 #, c-format
 msgid ""
@@ -15686,7 +15017,6 @@ msgstr ""
 "改附加至本地「寄件匣」。"
 
 # camel/camel-movemail.c:274
-# Novell Translation
 #: ../mail/mail-ops.c:621
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
@@ -15700,7 +15030,6 @@ msgstr "正在傳送郵件 %d / %d"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-# Novell Translation
 #: ../mail/mail-ops.c:758
 #, c-format
 msgid "Failed to send %d of %d messages"
@@ -15766,7 +15095,6 @@ msgstr "移除資料夾 %s"
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾「%s」"
 
-# Novell Translation
 #: ../mail/mail-ops.c:1519
 #, c-format
 msgid "Expunging and storing account '%s'"
@@ -15774,7 +15102,6 @@ msgstr "清空和儲存帳號 '%s'"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-# Novell Translation
 #: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Storing account '%s'"
@@ -15791,7 +15118,6 @@ msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # shell/e-shell-importer.c:371
-# Novell Translation
 #: ../mail/mail-ops.c:1659
 #, c-format
 msgid "Emptying trash in '%s'"
@@ -15966,13 +15292,11 @@ msgid "Name:"
 msgstr "名稱:"
 
 # camel/camel-session.c:479
-# Novell Translation
 #: ../mail/mail-tools.c:115
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "無法建立暫存序列目錄 `%s'：%s"
 
-# Novell Translation
 #: ../mail/mail-tools.c:143
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
@@ -15991,7 +15315,6 @@ msgstr "轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-# Novell Translation
 #: ../mail/mail-tools.c:291
 #, c-format
 msgid "Invalid folder: `%s'"
@@ -16005,14 +15328,12 @@ msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
 # mail/mail-ops.c:992
-# Novell Translation
 #: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "更新 '%s:%s' 的搜尋資料夾"
 
 # mail/mail-ops.c:992
-# Novell Translation
 #: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
@@ -16028,13 +15349,11 @@ msgstr "編輯搜尋資料夾"
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:1
 msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "已經有名稱為「{1}」的資料夾存在。請使用不同的名稱。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:2
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
@@ -16052,14 +15371,12 @@ msgid ""
 "the reciept notification to {0}?"
 msgstr "「{1}」已要求傳送讀信回條。是否傳送讀信回條給 {0} ？"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr "已經有名稱為「{0}」的簽名檔存在。請使用不同的名稱。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
@@ -16082,7 +15399,6 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "您確定要一次開啟 {0} 封郵件？"
 
 # ui/evolution-mail.xml.h:61
-# Novell Translation
 #: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
@@ -16090,7 +15406,6 @@ msgid ""
 msgstr "要永久移除所有資料夾中所有刪除的郵件？"
 
 # mail/mail-callbacks.c:1549
-# Novell Translation
 #: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
@@ -16098,82 +15413,69 @@ msgid ""
 msgstr "要永久移除資料夾「{0}」中所有刪除的郵件？"
 
 # mail/mail-callbacks.c:1085
-# Novell Translation
 #: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "要傳送 HTML 格式的郵件?"
 
 # mail/mail-callbacks.c:1085
-# Novell Translation
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "要傳送只有密件副本收件者的郵件?"
 
 # mail/mail-callbacks.c:1085
-# Novell Translation
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "要傳送沒有主旨的郵件？"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "因為「{0}」。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "因為「{2}」。"
 
 # mail/mail-config.glade.h:74
-# Novell Translation
 #: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "空白簽名檔"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-# Novell Translation
 #: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "無法新增搜尋資料夾「{0}」。"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-# Novell Translation
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」資料夾複製至「{1}」。"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-# Novell Translation
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "無法建立資料夾「{0}」。"
 
 # mail/mail-display.c:236
-# Novell Translation
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "無法建立暫時儲存目錄。"
 
 # shell/e-setup.c:215
-# Novell Translation
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "無法建立儲存目錄，因為「{1}」"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-# Novell Translation
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "無法刪除資料夾「{0}」。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-# Novell Translation
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "無法刪除系統資料夾「{0}」。"
@@ -16181,32 +15483,27 @@ msgstr "無法刪除系統資料夾「{0}」。"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-# Novell Translation
 #: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "無法編輯搜尋資料夾「{0}」，因為它不存在。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-# Novell Translation
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」資料夾移至「{1}」。"
 
 # camel/providers/local/camel-mbox-summary.c:655
-# Novell Translation
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "無法開啟來源「{1}」"
 
 # camel/providers/local/camel-mbox-summary.c:655
-# Novell Translation
 #: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "無法開啟來源「{2}」。"
 
 # camel/camel-filter-driver.c:671
-# Novell Translation
 #: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "無法開啟目標「{2}」。"
@@ -16222,24 +15519,20 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-# Novell Translation
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」重新命名成「{1}」。"
 
 # camel/providers/local/camel-local-store.c:237
-# Novell Translation
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "無法重新命名或移動系統資料夾「{0}」。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "無法儲存帳號變更。"
 
 # camel/providers/imap/camel-imap-folder.c:172
-# Novell Translation
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "無法儲存至目錄「{0}」。"
@@ -16251,18 +15544,15 @@ msgstr "無法儲存至目錄「{0}」。"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-# Novell Translation
 #: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "無法儲存至檔案「{0}」。"
 
 # mail/mail-config.glade.h:74
-# Novell Translation
 #: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "無法設定簽名程序檔「{0}」。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
@@ -16271,7 +15561,6 @@ msgstr ""
 "檢查確定您的密碼拼字正確。請注意很多密碼區分大小寫；您可能啟動了大寫鎖定鍵。"
 
 # mail/mail-crypto.c:59
-# Novell Translation
 #: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "無法儲存簽名檔案。"
@@ -16287,18 +15576,15 @@ msgstr "無法儲存簽名檔案。"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-# Novell Translation
 #: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "刪除「{0}」？"
 
 # calendar/gui/e-calendar-table.c:714
-# Novell Translation
 #: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "刪除帳號？"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:44
 msgid "Discard changed?"
 msgstr "捨棄變更？"
@@ -16308,14 +15594,12 @@ msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "您是否想讓此項操作一併於子資料夾中進行？"
 
 # calendar/gui/dialogs/save-comp.c:51
-# Novell Translation
 #: ../mail/mail.error.xml.h:46
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的變更？"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-# Novell Translation
 #: ../mail/mail.error.xml.h:47
 msgid "Don't delete"
 msgstr "不要刪除"
@@ -16326,47 +15610,39 @@ msgstr "不要刪除"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-# Novell Translation
 #: ../mail/mail.error.xml.h:48
 msgid "Enter password."
 msgstr "輸入密碼。"
 
 # mail/mail-callbacks.c:1349
-# Novell Translation
 #: ../mail/mail.error.xml.h:49
 msgid "Error loading filter definitions."
 msgstr "載入過濾器定義時發生錯誤。"
 
 # mail/mail-mt.c:193
-# Novell Translation
 #: ../mail/mail.error.xml.h:50
 msgid "Error while performing operation."
 msgstr "執行作業時，發生錯誤。"
 
 # mail/mail-mt.c:190
-# Novell Translation
 #: ../mail/mail.error.xml.h:51
 msgid "Error while {0}."
 msgstr "當 {0} 時發生錯誤。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:52
 msgid "File exists but cannot overwrite it."
 msgstr "檔案存在但無法覆寫。"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-# Novell Translation
 #: ../mail/mail.error.xml.h:53
 msgid "File exists but is not a regular file."
 msgstr "檔案存在但不是一般檔案。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:54
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果您繼續，將無法復原這些郵件。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:55
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
@@ -16381,35 +15657,29 @@ msgstr ""
 "如果繼續，該帳號的資訊以及\n"
 "它所有的代理伺服器會永遠刪除。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:58
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續，帳號資訊會永久刪除。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:59
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "如果您結束，再次啟動 Evolution 之前，不會傳送這些郵件。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:60
 msgid "Ignore"
 msgstr "忽略"
 
 # mail/mail-config.glade.h:10
-# Novell Translation
 #: ../mail/mail.error.xml.h:61
 msgid "Invalid authentication"
 msgstr "無效的驗證"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:62
 msgid "Mail filters automatically updated."
 msgstr "郵件過濾器自動更新。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:63
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
@@ -16432,12 +15702,10 @@ msgstr "標示選定的資料夾中所有郵件為已閱讀"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-# Novell Translation
 #: ../mail/mail.error.xml.h:66
 msgid "Missing folder."
 msgstr "遺漏資料夾。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:68
 msgid "No sources selected."
 msgstr "未選取來源。"
@@ -16450,8 +15718,11 @@ msgstr "一次開啟過多郵件可能會花費許多時間。"
 msgid "Please check your account settings and try again."
 msgstr "請檢查您的帳號設定並再試一次。"
 
-# Novell Translation
 #: ../mail/mail.error.xml.h:71
+msgid "Please enable the account or send using another account."
+msgstr "請啟用該帳號或使用其他帳號傳送。"
+
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -16459,8 +15730,7 @@ msgstr ""
 "請在「收件者：」欄位輸入一個有效的電子郵件地址。您可以按一下輸入方塊旁邊的"
 "「收件者：」按鈕，搜尋電子郵件地址。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -16471,58 +15741,52 @@ msgstr ""
 "{0}\n"
 "立即傳送？"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Please provide an unique name to identify this signature."
 msgstr "請輸入可供辨識這個簽名檔的獨特名稱。"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please wait."
 msgstr "請稍候。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "移轉舊郵件資料夾「{0}」發生問題。"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "Querying server"
 msgstr "查詢伺服器"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "向伺服器查詢支援的驗證演算法清單。"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "Read receipt requested."
 msgstr "要求讀信回條。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-# Novell Translation
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "確定要刪除資料夾「{0}」以及它所有的子資料夾?"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Search Folders automatically updated."
 msgstr "搜尋資料夾自動更新。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Send Receipt"
 msgstr "傳送回條"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Signature Already Exists"
 msgstr "簽名檔已經存在"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -16530,8 +15794,7 @@ msgstr ""
 "Ximian Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動"
 "或刪除。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -16546,8 +15809,7 @@ msgstr ""
 "此標頭，會列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收件"
 "者：」或「副本：」收件者。 "
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -16561,8 +15823,7 @@ msgstr ""
 "    「{1}」\n"
 "而且已更新。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -16576,8 +15837,7 @@ msgstr ""
 "    「{1}」\n"
 "而且已更新。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -16588,13 +15848,11 @@ msgstr ""
 "送郵件。\n"
 "訊息儲存在「寄件信箱」資料夾。請檢查訊息的錯誤，然後重新傳送。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "程序檔必須存在而且可以執行。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -16602,81 +15860,80 @@ msgstr ""
 "此資料夾可能已經自動新增。\n"
 "需要時，請移至搜尋資料夾編輯器，以手動方式新增它。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr "因為您沒有啟用選擇用來寄送的帳號，所以無法傳送此郵件。"
+
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr "因為您沒有指定任何收件者，所以無法傳送此郵件。"
 
 # camel/providers/smtp/camel-smtp-transport.c:356
-# Novell Translation
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺服器不支援此驗證類型而且根本不支援驗證。"
 
 # composer/e-msg-composer.c:941
-# Novell Translation
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽名已經變更，但尚未儲存。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:109
 msgid "Unable to connect to the GroupWise server."
 msgstr "無法連線至 GroupWise 伺服器。"
 
 # composer/e-msg-composer.c:877
-# Novell Translation
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 msgstr "無法開啟此帳號的草稿資料夾。使用系統草稿資料夾？"
 
 # mail/mail-ops.c:1728
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to read license file."
 msgstr "無法讀取授權檔案。"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:112
 msgid "Use _Default"
 msgstr "使用預設值(_D)"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-# Novell Translation
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:113
 msgid "Use default drafts folder?"
 msgstr "使用預設的草稿資料夾？"
 
 # mail/mail-account-editor.c:105
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:114
 msgid "You have not filled in all of the required information."
 msgstr "您沒有填入所有必須的資訊。"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
 # ui/evolution.xml.h:3
-# Novell Translation
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid "You must name this Search Folder."
 msgstr "您必須命名此搜尋資料夾。"
 
 # ui/evolution.xml.h:3
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid "You must specify a folder."
 msgstr "您必須指定一個資料夾。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -16685,30 +15942,28 @@ msgstr ""
 "您必須至少指定一個資料夾當成來源。\n"
 "個別選取資料夾，然後/或選取所有本地資料夾、所有遠端資料夾或二者皆選。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "您登入伺服器「{0}」以「{0}」身分，但失敗。"
 
-# Novell Translation
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "未傳遞主旨為「{0}」的郵件。"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "_Append"
 msgstr "添加(_A)"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid "_Discard changes"
 msgstr "放棄變更(_D)"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid "_Expunge"
 msgstr "清除(_E)"
 
 # ui/evolution-mail.xml.h:114
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
@@ -16765,7 +16020,7 @@ msgstr "？"
 # mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:197
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
@@ -16791,7 +16046,6 @@ msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # views/mail/galview.xml.h:4
-# Novell Translation
 #: ../mail/message-list.c:2052
 msgid "Message List"
 msgstr "郵件清單"
@@ -16859,7 +16113,7 @@ msgstr "給您的資訊"
 
 # mail/message-browser.c:194
 # ui/evolution-mail.xml.h:33
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "轉寄"
 
@@ -16869,13 +16123,13 @@ msgstr "不需要回應"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply"
 msgstr "回覆"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to All"
 msgstr "全部回覆"
 
@@ -16959,13 +16213,11 @@ msgid "Restore Evolution directory"
 msgstr "回存 Evolution 目錄"
 
 # data/evolution.desktop.in.h:2
-# Novell Translation
 #: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
 msgstr "檢查 Evolution 檔案庫"
 
 # shell/main.c:138
-# Novell Translation
 #: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
 msgstr "重新啟動 Evolution"
@@ -17001,7 +16253,6 @@ msgstr "回存設定值..."
 msgid "Automatic Contacts"
 msgstr "自動加入的連絡人"
 
-# Novell Translation
 #: ../plugins/bbdb/bbdb.c:419
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">自動加入的連絡人</span>"
@@ -17012,7 +16263,6 @@ msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "在回覆郵件時自動在通訊錄中建立項目(_A)"
 
-# Novell Translation
 #: ../plugins/bbdb/bbdb.c:450
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">即時傳訊的連絡人</span>"
@@ -17059,7 +16309,6 @@ msgstr "提供本地行事曆的核心功能。"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-# Novell Translation
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP 行事曆"
@@ -17106,7 +16355,6 @@ msgid "Select a location"
 msgstr "選擇一個位置"
 
 # mail/message-list.c:677
-# Novell Translation
 #: ../plugins/calendar-weather/calendar-weather.c:654
 msgid "_Units:"
 msgstr "單位(_U):"
@@ -17160,7 +16408,6 @@ msgstr "在啟動時檢查 Evolution 是否為預設的郵件客戶端程式。"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-# Novell Translation
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
 msgstr "預設郵件客戶端程式"
@@ -17171,7 +16418,6 @@ msgstr "您是否要將 Evolution 設為您的預設電子郵件客戶端程式�
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-# Novell Translation
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
 msgid "Mark as default folder"
@@ -17193,13 +16439,11 @@ msgstr "資料夾名稱(_F)："
 msgid "_User:"
 msgstr "使用者(_U)："
 
-# Novell Translation
 #. i18n: "Secure Password Authentication" is an Outlookism
 #: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "保全密碼"
 
-# Novell Translation
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
@@ -17207,12 +16451,10 @@ msgid ""
 "authentication."
 msgstr "此選項將會連線到使用保全密碼 (NTLM) 驗證的 Exchange 伺服器。"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "純文字密碼"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
@@ -17224,7 +16466,6 @@ msgstr "此選項將會連線到使用標準純文字密碼驗證的 Exchange �
 msgid "Out Of Office"
 msgstr "不在辦公室"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-account-setup.c:260
 msgid ""
 "The message specified below will be automatically sent to \n"
@@ -17233,26 +16474,22 @@ msgstr ""
 "以下指定的訊息將會自動傳送給\n"
 "每一位在您離開辦公室時傳送郵件給您的人。"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-account-setup.c:272
 #: ../plugins/exchange-operations/exchange-account-setup.c:277
 msgid "I am out of the office"
 msgstr "我目前不在辦公室"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-account-setup.c:273
 #: ../plugins/exchange-operations/exchange-account-setup.c:276
 msgid "I am in the office"
 msgstr "我目前在辦公室"
 
 # camel/camel-smime-context.c:194
-# Novell Translation
 #. Change Password
 #: ../plugins/exchange-operations/exchange-account-setup.c:324
 msgid "Change the password for Exchange account"
 msgstr "改變 Exchange 帳號的密碼"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-account-setup.c:326
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
@@ -17301,13 +16538,12 @@ msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
 # mail/mail-config.glade.h:11
-#: ../plugins/exchange-operations/exchange-account-setup.c:824
+#: ../plugins/exchange-operations/exchange-account-setup.c:823
 msgid "Authentication Type"
 msgstr "驗證類型"
 
 # mail/mail-config.glade.h:1
-# Novell Translation
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:837
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
 
@@ -17333,22 +16569,18 @@ msgstr "目前的密碼不符合您帳戶的現存密碼。請輸入正確的密
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "這兩個密碼不一樣。請重新輸入密碼。"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "確認密碼："
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "目前的密碼："
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "新密碼："
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr "您目前的密碼已過期。請立即變更您的密碼。"
@@ -17404,47 +16636,38 @@ msgstr "無法新增委託 %s"
 msgid "Error reading delegates list."
 msgstr "讀取委託清單錯誤。"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "原著者 (讀取，建立)"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "行事曆(_A)"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "Co_ntacts:"
 msgstr "連絡人(_N)"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Delegate Permissions"
 msgstr "委託許可權"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegates"
 msgstr "委託"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Editor (read, create, edit)"
 msgstr "編輯者 (讀取、建立、編輯)"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Permissions for"
 msgstr "許可權"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 msgid "Reviewer (read-only)"
 msgstr "檢閱者 (僅限讀取)"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid ""
 "These users will be able to send mail on your behalf\n"
@@ -17453,17 +16676,14 @@ msgstr ""
 "透過您給予這些使用者的許可權，它們將可以以您的身分傳送郵件，\n"
 "並存取您的資料夾。"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid "_Delegate can see private items"
 msgstr "委託可以查看私人的項目(_D)"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Inbox:"
 msgstr "收件匣(_I)："
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 msgid "_Tasks:"
 msgstr "工作(_T)："
@@ -17487,7 +16707,6 @@ msgstr "資料夾大小"
 msgid "Subscribe to Other User's"
 msgstr "訂閱其他使用者的"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchange 資料夾樹"
@@ -17514,12 +16733,10 @@ msgstr "取消訂閱「%s」"
 msgid "(Permission denied.)"
 msgstr "(許可權被拒絕。)"
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
 msgid "Add User:"
 msgstr "新增使用者："
 
-# Novell Translation
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
 msgid "Add User"
 msgstr "新增使用者"
@@ -17633,7 +16850,6 @@ msgid "Could not connect to server {0}."
 msgstr "無法連線到伺服器 {0}。"
 
 # camel/camel-movemail.c:306
-# Novell Translation
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not determine folder permissions for delegates."
 msgstr "無法決定委派的資料夾權限。"
@@ -17655,7 +16871,6 @@ msgid "Could not read folder permissions"
 msgstr "無法讀取資料夾許可權"
 
 # camel/camel-provider.c:140
-# Novell Translation
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions."
 msgstr "無法讀取資料夾權限。"
@@ -17711,17 +16926,14 @@ msgstr ""
 "  "
 
 # shell/e-storage.c:475
-# Novell Translation
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "無法更新委派："
 
-# Novell Translation
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "資料夾已存在"
 
-# Novell Translation
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "資料夾不存在"
@@ -17769,7 +16981,6 @@ msgstr "在 {1} 上沒有使用者 {0} 的郵件箱。"
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-# Novell Translation
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "查無此使用者 {0}"
@@ -17782,7 +16993,6 @@ msgstr "密碼已成功的變更。"
 msgid "Please restart Evolution"
 msgstr "請重新啟動 Evolution"
 
-# Novell Translation
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "請選取一個使用者。"
@@ -17829,7 +17039,6 @@ msgstr ""
 msgid "Try again with a different password."
 msgstr "請使用不同的密碼再試一次。"
 
-# Novell Translation
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "無法將使用者加入存取控制清單："
@@ -17936,13 +17145,11 @@ msgstr "允許在資料夾樹的快顯選單中取消訂閱郵件資料夾。"
 msgid "Unsubscribe Folders"
 msgstr "取消訂閱資料夾"
 
-# Novell Translation
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr "檢查清單"
 
 # shell/e-shortcuts-view.c:137
-# Novell Translation
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
 msgid "Groupwise Account Setup"
 msgstr "Groupware 帳號設定"
@@ -17990,6 +17197,7 @@ msgstr "將 傳送 選項加入 groupwise 訊息"
 
 # addressbook/printing/e-contact-print.glade.h:23
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "傳送選項"
@@ -17999,7 +17207,6 @@ msgid "A plugin for the features in Groupwise accounts."
 msgstr "提供 Groupwise 帳號功能的外掛程式。"
 
 # shell/e-shortcuts-view.c:137
-# Novell Translation
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "Groupwise Features"
 msgstr "Groupware 功能"
@@ -18009,13 +17216,11 @@ msgstr "Groupware 功能"
 msgid "Accept Tentatively"
 msgstr "暫時套用"
 
-# Novell Translation
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users :</b>"
 msgstr "<b>使用者：</b>"
 
 # views/mail/galview.xml.h:4
-# Novell Translation
 #: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:510
 msgid "Message"
@@ -18031,13 +17236,11 @@ msgstr "參與者將會收到下列通知。\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:24
 # calendar/gui/event-editor-dialog.glade.h:29
-# Novell Translation
 #: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "連絡人(_C)..."
 
 # camel/camel-movemail.c:306
-# Novell Translation
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Cutomize notification message"
 msgstr "自訂通知訊息(_C)"
@@ -18096,7 +17299,7 @@ msgid "Subscribe to my _notifications"
 msgstr "訂閱至我的通知(_N)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Read"
 msgstr "閱讀(_R)"
 
@@ -18108,7 +17311,6 @@ msgstr "寫入(_W)"
 msgid "Proxy"
 msgstr "代理伺服器"
 
-# Novell Translation
 #: ../plugins/groupwise-features/proxy-listing.glade.h:2
 #: ../smime/gui/smime-ui.glade.h:49
 #: ../widgets/table/e-table-config-no-group.glade.h:20
@@ -18164,13 +17366,16 @@ msgid "Sharing"
 msgstr "分享"
 
 # mail/mail-callbacks.c:1188
-# Novell Translation
 #: ../plugins/groupwise-features/status-track.c:235
 msgid "Track Message Status..."
 msgstr "追蹤郵件狀態..."
 
+# shell/e-shortcuts-view.c:137
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "Hula Account Setup"
+msgstr "Hula 帳號設定"
+
 # calendar/gui/e-itip-control.glade.h:4
-# Novell Translation
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
@@ -18209,19 +17414,16 @@ msgid "Exporting data failed."
 msgstr "匯出資料失敗。"
 
 # camel/camel-provider.c:140
-# Novell Translation
 #: ../plugins/ipod-sync/sync.c:231
 msgid "Could not open addressbook!"
 msgstr "無法開啟通訊錄！"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# Novell Translation
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
 msgstr "無法開啟 Evolution 通訊錄以匯出資料。"
 
 # calendar/gui/e-itip-control.c:883
-# Novell Translation
 #: ../plugins/ipod-sync/sync.c:291
 msgid "Could not open calendar/todo!"
 msgstr "無法開啟行事曆/工作！"
@@ -18231,13 +17433,11 @@ msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "無法開啟 Evolution 行事曆/工作清單以匯出資料。"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-# Novell Translation
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
 # shell/e-storage.c:475
-# Novell Translation
 #: ../plugins/itip-formatter/itip-formatter.c:780
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
@@ -18269,13 +17469,11 @@ msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
 # calendar/gui/dialogs/delete-comp.c:102
-# Novell Translation
 #: ../plugins/itip-formatter/itip-formatter.c:905
 msgid "Sent a cancellation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
 # calendar/gui/dialogs/delete-comp.c:102
-# Novell Translation
 #: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Could not send the cancellation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
@@ -18285,7 +17483,6 @@ msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！"
 
 # shell/e-storage.c:475
-# Novell Translation
 #: ../plugins/itip-formatter/itip-formatter.c:1017
 #, c-format
 msgid "Unable to update attendee. %s"
@@ -18332,18 +17529,12 @@ msgid ""
 "imported"
 msgstr "要處理這些全部的項目，應該將此檔案儲存後匯入其中的行事曆"
 
-# ui/evolution-mail.xml.h:110
-#: ../plugins/itip-formatter/itip-formatter.c:1968
-msgid "Meetings and Tasks"
-msgstr "會議與工作"
-
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
 msgid "_Delete message after acting"
 msgstr "完成後刪除郵件(_D)"
 
-# Novell Translation
 #: ../plugins/itip-formatter/itip-formatter.c:2001
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">搜尋衝突</span>"
@@ -18358,66 +17549,66 @@ msgid "Conflict Search Table"
 msgstr "衝突的搜尋表格"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
+#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
 msgid "Today"
 msgstr "今天"
 
 # mail/message-list.c:948
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
+#: ../plugins/itip-formatter/itip-view.c:188
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 # mail/message-list.c:948
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:192
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 # mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:202
+#: ../plugins/itip-formatter/itip-view.c:201
 msgid "Today %l:%M:%S %p"
 msgstr "今天 %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:211
 msgid "Tomorrow"
 msgstr "明天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:216
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 # e-util/e-time-utils.c:315
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 # mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %l:%M %p"
 msgstr "明天 %l:%M %p"
 
 # mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天 %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:248
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -18428,28 +17619,28 @@ msgstr "%A"
 # widgets/misc/e-dateedit.c:1497
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:253
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 # e-util/e-time-utils.c:315
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:257
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 # mail/message-list.c:969
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 # e-util/e-time-utils.c:323
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:266
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
@@ -18457,7 +17648,7 @@ msgstr "%A %l:%M:%S %p"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:276
+#: ../plugins/itip-formatter/itip-view.c:275
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
@@ -18466,7 +17657,7 @@ msgstr "%A, %B %e"
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
@@ -18474,28 +17665,28 @@ msgstr "%A, %B %e %H:%M"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:285
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 # mail/message-list.c:977
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 # mail/message-list.c:977
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 # widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
@@ -18503,7 +17694,7 @@ msgstr "%A, %B %e, %Y"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:305
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
@@ -18511,196 +17702,192 @@ msgstr "%A, %B %e, %Y %H:%M"
 # e-util/e-time-utils.c:278
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 # mail/message-list.c:977
-# Novell Translation
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 # mail/message-list.c:977
-# Novell Translation
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:343
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> 由於 %s 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:345
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:350
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 已經委派下列會議給您："
 
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:353
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 由於 %s 邀請您出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:355
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 邀請您出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 由於 %s 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望收到下列會議的最新工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 傳送了下列會議的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:373
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> 由於 %s 已經消取下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> 已經消取下列會議。"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 已經答覆了下列會議變更。"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 由於 %s 已經婉拒了下列會議變更："
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 已經婉拒了下列會議變更。"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:411
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 由於 %s 已經發佈了下列工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:413
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 已經發佈了下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> 指派 %s 加入下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:421
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 由於 %s 已經指派您一個工作："
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:423
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 已經指派您一個工作："
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:429
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> 由於 %s 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:431
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:434
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> 希望收到下列指派工作的最新資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:437
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> 傳送了下列指派工作的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:441
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> 由於 %s 已經取消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:443
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<b>%s</b> 已經取消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 已經回覆下列指派工作的變更："
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> 由於 %s 已婉拒了下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 已經婉拒下列指派的工作："
 
 # calendar/gui/event-editor-dialog.glade.h:31
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:891
 msgid "Start time:"
 msgstr "開始時間:"
 
 # calendar/gui/event-editor-dialog.glade.h:30
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:900
 msgid "End time:"
 msgstr "結束時間:"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-# Novell Translation
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:916
+#: ../plugins/itip-formatter/itip-view.c:966
 msgid "Comment:"
 msgstr "註解："
 
 # shell/e-storage.c:475
-# Novell Translation
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:980
 msgid "Send u_pdates to attendees"
 msgstr "傳送更新給到會者"
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:989
 msgid "A_pply to all instances"
 msgstr "套用至所有實體(_A)"
 
@@ -18807,7 +17994,6 @@ msgid "Contact list _owner"
 msgstr "連絡人清單擁有者(_O)"
 
 # data/evolution.desktop.in.h:2
-# Novell Translation
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
@@ -18867,12 +18053,10 @@ msgstr ""
 "在這封郵件送出後不久您應該會收到來自通信論壇的回應。"
 
 # mail/mail-config.glade.h:74
-# Novell Translation
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
 msgstr "格式錯誤的標頭"
 
-# Novell Translation
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 msgid "No e-mail action"
 msgstr "沒有郵件動作"
@@ -18881,7 +18065,6 @@ msgstr "沒有郵件動作"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-# Novell Translation
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
 msgid "Posting not allowed"
 msgstr "不允許張貼"
@@ -19019,7 +18202,6 @@ msgstr "啟用與停用外掛程式"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-# Novell Translation
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "Plugins"
 msgstr "外掛程式"
@@ -19064,7 +18246,6 @@ msgstr "注意：某些變更在重新啟動後才會生效"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-# Novell Translation
 #: ../plugins/plugin-manager/plugin-manager.c:210
 #: ../plugins/plugin-manager/plugin-manager.c:271
 msgid "Plugin"
@@ -19103,7 +18284,6 @@ msgid "Only ever show PLAIN"
 msgstr "只以純文字顯示"
 
 # mail/mail-config.glade.h:36
-# Novell Translation
 #: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr "HTML 模式"
@@ -19114,7 +18294,7 @@ msgstr "提供自郵件編輯器列印郵件的選項"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
@@ -19124,7 +18304,6 @@ msgstr "預覽列印(_V)"
 msgid "Prints the message"
 msgstr "列印此郵件"
 
-# Novell Translation
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:99
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (內建)"
@@ -19168,7 +18347,7 @@ msgid "MIME Type"
 msgstr "MIME 類型"
 
 #: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
 #: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "儲存"
@@ -19204,7 +18383,6 @@ msgid "Comment List"
 msgstr "註解清單"
 
 # calendar/gui/event-editor-dialog.glade.h:15
-# Novell Translation
 #: ../plugins/save-calendar/csv-format.c:391
 msgid "Created"
 msgstr "已建立"
@@ -19217,7 +18395,6 @@ msgstr "連絡人清單"
 msgid "Start"
 msgstr "開始"
 
-# Novell Translation
 #: ../plugins/save-calendar/csv-format.c:394
 msgid "End"
 msgstr "結束"
@@ -19264,14 +18441,12 @@ msgstr "以此封裝數值:"
 msgid "Comma separated value format (.csv)"
 msgstr "逗號隔開的數值格式 (.csv)"
 
-# Novell Translation
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "儲存選取的"
 
 # ui/evolution-calendar.xml.h:27
 # ui/evolution-message-composer.xml.h:18
-# Novell Translation
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save to _Disk"
 msgstr "儲存至磁碟(_D)"
@@ -19295,20 +18470,11 @@ msgid "RDF format (.rdf)"
 msgstr "RDF 格式 (.rdf)"
 
 # shell/e-shell-importer.c:602
-# Novell Translation
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:170
+#: ../plugins/save-calendar/save-calendar.c:180
 msgid "Select destination file"
 msgstr "選取目的檔案"
 
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-"這種檔案類型 (%s) 建議的延伸檔名並未使用於選擇的檔案名稱中。您是否要繼續？"
-
 # shell/e-shell-importer.c:601
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
@@ -19337,12 +18503,10 @@ msgstr "啟動精靈"
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助理"
 
-# Novell Translation
 #: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "歡迎使用"
 
-# Novell Translation
 #: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
@@ -19380,7 +18544,6 @@ msgstr "指示相關郵件功能是否應以主旨為準。"
 msgid "Subject Threading"
 msgstr "主旨排列"
 
-# Novell Translation
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
 msgstr "以主旨為基礎串接郵件"
@@ -19391,13 +18554,11 @@ msgid "Fall back to threading messages by sub_ject"
 msgstr "退回到依主旨的相關郵件(_J)"
 
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
-# Novell Translation
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution Shell"
 
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
-# Novell Translation
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Evolution Shell Config factory"
 msgstr "Evolution Shell 設定工廠"
@@ -19405,13 +18566,11 @@ msgstr "Evolution Shell 設定工廠"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-# Novell Translation
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution 測試"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-# Novell Translation
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Evolution 測試元件"
@@ -19421,41 +18580,34 @@ msgid "A GNOME Print description of the current printer settings"
 msgstr "目前印表機設定值的 GNOME 列印描述"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:9
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
 msgstr "組態版本"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default sidebar width"
 msgstr "預設資訊方塊列寬度"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "預設視窗高度"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window width"
 msgstr "預設視窗寬度"
 
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "啟動時預設顯示的元件相關 ID 或別名。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:9
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "上次升級的組態版本"
 
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
@@ -19467,7 +18619,6 @@ msgstr "要同步至磁碟的資料夾，其路徑清單 (供離線使用)"
 msgid "Printer settings"
 msgstr "印表機設定"
 
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告對話方塊"
@@ -19482,19 +18633,16 @@ msgid ""
 msgstr "Evolution 的組態版本，以 major/minor/configuration 層級表示"
 
 # ui/evolution.xml.h:32
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的預設高度，以像素計。"
 
 # ui/evolution.xml.h:32
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default width for the main window, in pixels."
 msgstr "主視窗的預設寬度，以像素計。"
 
 # ui/evolution.xml.h:32
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的預設寬度，以像素計。"
@@ -19514,28 +18662,23 @@ msgstr ""
 "視窗按鈕的風格。可以是「文字」、「圖示」、「兩者」、「工具列」。如果設為「工"
 "具列」，按鈕的風格會依 GNOME 工具列設定值決定。"
 
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Toolbar is visible"
 msgstr "工具列可以看到"
 
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是否以離線模式啟動取代線上模式。"
 
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "是否可以看到工具列。"
 
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否省略 Evulution 開發版本的警告對話方塊。"
 
-# Novell Translation
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the window buttons should be visible."
 msgstr "是否可以看到視窗按鈕。"
@@ -19549,13 +18692,11 @@ msgid "Window buttons are visible"
 msgstr "視窗按鈕是可視的"
 
 # shell/e-shell-offline-handler.c:554
-# Novell Translation
 #: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>作用中的連線</b>"
 
 # shell/e-shell-offline-handler.c:554
-# Novell Translation
 #: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "作用中的連線"
@@ -19589,12 +18730,10 @@ msgstr ""
 "若您不清楚檔案類型，請選擇「自動」。Evolution 會嘗試找出適當的處理方法。"
 
 # ui/evolution.xml.h:4
-# Novell Translation
 #: ../shell/e-shell-importer.c:142
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
 
-# Novell Translation
 #: ../shell/e-shell-importer.c:148
 msgid ""
 "Evolution checked for settings to import from the following\n"
@@ -19621,7 +18760,6 @@ msgstr "選擇一個檔案"
 msgid "File _type:"
 msgstr "檔案類型(_T):"
 
-# Novell Translation
 #: ../shell/e-shell-importer.c:336
 msgid "Import data and settings from _older programs"
 msgstr "從舊程式輸入資料和設定值(_O)"
@@ -19650,12 +18788,10 @@ msgstr "沒有指定資料夾名稱。"
 msgid "Folder name cannot contain the Return character."
 msgstr "資料夾名稱不能包含換行字元。"
 
-# Novell Translation
 #: ../shell/e-shell-utils.c:131
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "資料夾名稱不可以包括 \"/\"字元。"
 
-# Novell Translation
 #: ../shell/e-shell-utils.c:137
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "資料夾名稱不可以包括 \"#\"字元。"
@@ -19675,7 +18811,6 @@ msgid "Error executing %s."
 msgstr "執行 %s 發生錯誤。"
 
 # shell/e-shell-view-menu.c:185
-# Novell Translation
 #: ../shell/e-shell-window-commands.c:128
 msgid "Bug buddy is not installed."
 msgstr "未安裝設計錯誤部份。"
@@ -19700,7 +18835,6 @@ msgstr ""
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
 # shell/e-shortcuts-view.c:137
-# Novell Translation
 #: ../shell/e-shell-window-commands.c:547
 msgid "Groupware Suite"
 msgstr "Groupware 套裝軟體"
@@ -19719,23 +18853,19 @@ msgstr "離線工作(_W)"
 msgid "Work Offline"
 msgstr "離線工作"
 
-# Novell Translation
 #: ../shell/e-shell-window.c:343
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolution 目前為線上模式。按一下此按鈕，離線工作。"
 
-# Novell Translation
 #: ../shell/e-shell-window.c:351
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在離線的程序中。"
 
-# Novell Translation
 #: ../shell/e-shell-window.c:358
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution 目前離線。按一下此按鈕，線上工作。"
 
 # mail/mail-autofilter.c:70
-# Novell Translation
 #: ../shell/e-shell-window.c:735
 #, c-format
 msgid "Switch to %s"
@@ -19743,20 +18873,18 @@ msgstr "切換至 %s"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-# Novell Translation
 #: ../shell/e-shell.c:623
 msgid "Uknown system error."
 msgstr "不明的系統錯誤。"
 
 # calendar/gui/e-week-view-main-item.c:342
-# Novell Translation
 #: ../shell/e-shell.c:825 ../shell/e-shell.c:826
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "確認"
 
@@ -19783,7 +18911,6 @@ msgid "New"
 msgstr "新增"
 
 # ui/evolution-tasks.xml.h:3
-# Novell Translation
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "新測試"
@@ -19793,7 +18920,6 @@ msgid "_Test"
 msgstr "測試(_T)"
 
 # ui/evolution-tasks.xml.h:2
-# Novell Translation
 #: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
 msgstr "建立新的測試項目"
@@ -19809,32 +18935,27 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution 匯入助理"
 
 # shell/e-shell-importer.c:363
-# Novell Translation
 #: ../shell/import.glade.h:3
 msgid "Import File"
 msgstr "輸入檔案"
 
 # addressbook/backend/ebook/e-card.c:3442
-# Novell Translation
 #: ../shell/import.glade.h:4
 msgid "Import Location"
 msgstr "輸入位置"
 
 # shell/importer/intelligent.c:186
-# Novell Translation
 #: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr "輸入器類型"
 
 # mail/mail-account-gui.c:682
-# Novell Translation
 #: ../shell/import.glade.h:6
 msgid "Select Importers"
 msgstr "選取輸入器"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-# Novell Translation
 #: ../shell/import.glade.h:7
 msgid "Select a File"
 msgstr "選取檔案"
@@ -19850,7 +18971,6 @@ msgstr ""
 "這個精靈將會領導您如何將外部的檔案\n"
 "匯入到 Evolution。"
 
-# Novell Translation
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:230
 #, no-c-format
@@ -19864,7 +18984,7 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -19885,12 +19005,11 @@ msgstr ""
 "個人，以免引發任何不快。\n"
 "\n"
 "我們希望您享受工作成果，而且我們\n"
-"熱切希望您提供意見。\n"
+"熱切希望您提供意見！\n"
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-# Novell Translation
 #: ../shell/main.c:254
 msgid ""
 "Thanks\n"
@@ -19906,7 +19025,6 @@ msgstr ""
 msgid "Don't tell me again"
 msgstr "不要再顯示這個訊息"
 
-# Novell Translation
 #: ../shell/main.c:466
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
@@ -19915,12 +19033,10 @@ msgstr "啟動 Evolution 會啟動指定的元件"
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-# Novell Translation
 #: ../shell/main.c:473
 msgid "Forcibly shut down all Evolution components"
 msgstr "強制關閉所有 Evoultion 元件"
 
-# Novell Translation
 #: ../shell/main.c:477
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 重新移轉"
@@ -19947,18 +19063,15 @@ msgstr ""
 msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "您確定要遺忘所有記憶的密碼？"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
 msgstr "繼續"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "從 {0} 版刪除舊資料？"
 
 # mail/mail-config-druid.c:445
-# Novell Translation
 #: ../shell/shell.error.xml.h:4
 msgid "Evolution can not start."
 msgstr "Evolution 無法啟動。"
@@ -19970,19 +19083,16 @@ msgid ""
 msgstr ""
 "遺忘您的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示您輸入。"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
 msgstr "磁碟空間不足，無法升級。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-# Novell Translation
 #: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
 msgstr "確定要刪除舊資料？"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:9
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory is about to be be "
@@ -20002,7 +19112,6 @@ msgstr ""
 "\n"
 "刪除之後，未經手動操作，便無法降級至舊的 Evolution 版本。\n"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:15
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
@@ -20017,12 +19126,10 @@ msgstr ""
 "如果您選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果您選擇保留"
 "此資料，就可以在方便的時候，手動移除「evolution」的內容。\n"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
 msgstr "從以前的版本升級失敗：{0}"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:20
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
@@ -20035,7 +19142,6 @@ msgstr ""
 "\n"
 "您將需要在主目錄取得更多可用空間，才能繼續。"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:23
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
@@ -20046,7 +19152,6 @@ msgstr ""
 "\n"
 "如需詳細資訊，請按一下說明。"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:26
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
@@ -20065,18 +19170,15 @@ msgstr ""
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
 msgstr "保留資料(_K)"
 
 # calendar/gui/event-editor-dialog.glade.h:20
-# Novell Translation
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
 msgstr "稍後提醒我(_R)"
 
-# Novell Translation
 #: ../shell/shell.error.xml.h:34
 msgid ""
 "{1}\n"
@@ -20088,7 +19190,6 @@ msgstr ""
 "\n"
 "如果您選擇繼續，可能無法存取部份舊資料。\n"
 
-# Novell Translation
 #: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
@@ -20100,7 +19201,6 @@ msgstr ""
 "\n"
 "編輯信任設定值："
 
-# Novell Translation
 #: ../smime/gui/cert-trust-dialog.c:145
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
@@ -20110,7 +19210,6 @@ msgstr ""
 "因為您信任發出此憑證的憑證單位，所以除非在此指示，否則您將信任此憑證的有效"
 "性。"
 
-# Novell Translation
 #: ../smime/gui/cert-trust-dialog.c:149
 msgid ""
 "Because you do not trust the certificate authority that issued this "
@@ -20121,7 +19220,6 @@ msgstr ""
 "效性。"
 
 # mail/mail-account-gui.c:682
-# Novell Translation
 #: ../smime/gui/certificate-manager.c:134
 #: ../smime/gui/certificate-manager.c:142
 #: ../smime/gui/certificate-manager.c:377
@@ -20131,7 +19229,6 @@ msgstr ""
 msgid "Select a certificate to import..."
 msgstr "選取要匯入的憑證..."
 
-# Novell Translation
 #: ../smime/gui/certificate-manager.c:265
 #: ../smime/gui/certificate-manager.c:474
 #: ../smime/gui/certificate-manager.c:692
@@ -20139,44 +19236,37 @@ msgid "Certificate Name"
 msgstr "憑證名稱"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:16
-# Novell Translation
 #: ../smime/gui/certificate-manager.c:274
 #: ../smime/gui/certificate-manager.c:492
 msgid "Purposes"
 msgstr "用途"
 
-# Novell Translation
 #: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "序號"
 
-# Novell Translation
 #: ../smime/gui/certificate-manager.c:291
 msgid "Expires"
 msgstr "到期"
 
 # mail/mail-config.glade.h:29
-# Novell Translation
 #: ../smime/gui/certificate-manager.c:483
 msgid "E-Mail Address"
 msgstr "電子郵件地址"
 
-# Novell Translation
 #: ../smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "憑證檢視器:%s"
 
 # camel/camel-smime-context.c:194
-# Novell Translation
 #: ../smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "輸入 `%s' 的密碼"
 
 # camel/camel-smime-context.c:194
-# Novell Translation
 #. we're setting the password initially
 #: ../smime/gui/component.c:68
 msgid "Enter new password for certificate database"
@@ -20188,12 +19278,10 @@ msgstr "輸入憑證資料庫的新密碼"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-# Novell Translation
 #: ../smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "輸入新密碼"
 
-# Novell Translation
 #. FIXME: add serial no, validity date, uses
 #: ../smime/gui/e-cert-selector.c:119
 #, c-format
@@ -20204,7 +19292,6 @@ msgstr ""
 "發給:\n"
 "  主旨：%s\n"
 
-# Novell Translation
 #: ../smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
@@ -20215,28 +19302,23 @@ msgstr ""
 "  主旨：%s\n"
 
 # ui/evolution-calendar.xml.h:13
-# Novell Translation
 #: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "選取憑證"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<不是憑證的部份>"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
 msgstr "<b>憑證欄位</b>"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>憑證階層</b>"
 
 # mail/mail-config.glade.h:65
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>欄位值</b>"
@@ -20253,7 +19335,6 @@ msgstr "<b>發行者:</b>"
 msgid "<b>Issued To</b>"
 msgstr "<b>發給</b>"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
 msgstr "<b>此憑證已經檢驗用途:</b>"
@@ -20264,22 +19345,18 @@ msgstr "<b>效力</b>"
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "權威"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "備份"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "全部備份"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:13
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
@@ -20287,43 +19364,35 @@ msgid ""
 msgstr ""
 "信任此 CA 的任何用途前，您應該檢查它的憑證以及它的政策和程序 (如果可以的話)。"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "憑證"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr "憑證中心信任"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "憑證詳細資訊"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:17
 msgid "Certificates Table"
 msgstr "憑證表格"
 
 # calendar/gui/e-calendar-table.c:152
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "一般名稱 (CN)"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
 msgstr "連絡人憑證"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
 msgstr "不信任此憑證的有效性"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr "限虛擬視窗"
@@ -20334,27 +19403,22 @@ msgstr "限虛擬視窗"
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "編輯"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
 msgstr "電子郵件憑證信任設定值"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
 msgstr "電子郵件收件者憑證"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
 msgstr "電子郵件簽名者憑證"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "到期日期"
@@ -20368,59 +19432,48 @@ msgstr "到期日期"
 msgid "Import"
 msgstr "匯入"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "發照日期"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "組織 (O)"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "組織單位 (OU)"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL 用戶端憑證"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL 伺服器憑證"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
 msgstr "信任此憑證的有效性"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr "信任此 CA 來識別電子郵件使用者。"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
 msgstr "信任此 CA 來識別軟體開發人員。"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
 msgstr "信任此 CA 來識別網站。"
@@ -20429,28 +19482,23 @@ msgstr "信任此 CA 來識別網站。"
 # ui/evolution-message-composer.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:90
 # ui/evolution.xml.h:65
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "檢視"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "您已經從可以識別您身份的組織取得憑證:"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "您已經擁有檔案的相關憑證，可以識別這些憑證單位:"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "您已經擁有檔案的相關憑證，可以識別這些人員:"
 
-# Novell Translation
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "您的憑證"
@@ -20459,7 +19507,6 @@ msgstr "您的憑證"
 msgid "_Edit CA Trust"
 msgstr "編輯 CA 信任(_E)"
 
-# Novell Translation
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:651
 msgid "Certificate already exists"
@@ -20470,7 +19517,6 @@ msgstr "憑證已經存在"
 # widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
 # widgets/misc/e-dateedit.c:1284
 # widgets/misc/e-dateedit.c:1465
-# Novell Translation
 #: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -20484,108 +19530,88 @@ msgstr "簽署"
 msgid "Encrypt"
 msgstr "加密"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "版本"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "版本 1"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "版本 2"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "版本 3"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 附 RSA 加密"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 附 RSA 加密"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 附 RSA 加密"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
 # calendar/gui/calendar-model.c:457
-# Novell Translation
 #: ../smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
 # widgets/misc/e-cell-date-edit.c:245
-# Novell Translation
 #: ../smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
 # calendar/gui/calendar-model.c:457
-# Novell Translation
 #: ../smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-# Novell Translation
 #: ../smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 加密"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "憑證鑰匙使用"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape 憑證類型"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "憑證單位鑰匙識別碼"
 
 # addressbook/contact-editor/fullname.glade.h:4
-# Novell Translation
 #: ../smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
@@ -20595,199 +19621,163 @@ msgstr "UID"
 msgid "E"
 msgstr "E"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "物件識別碼 (%s)"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "演算法識別碼"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "演算法參數"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "主旨公鑰資訊"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "主旨公鑰演算法"
 
 # mail/mail-autofilter.c:213
-# Novell Translation
 #: ../smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "主旨的公鑰"
 
 # camel/camel-filter-driver.c:652
-# Novell Translation
 #: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "錯誤：無法處理延伸"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "物件簽名者"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL 憑證單位"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "電子郵件單位"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-# Novell Translation
 #: ../smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "簽名"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-# Novell Translation
 #: ../smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "不可拒絕"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "鑰匙加密"
 
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
-# Novell Translation
 #: ../smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "資料密碼"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "鑰匙合同"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "憑證簽名者"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL 簽名者"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "重要"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "不重要"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "延伸"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
 # mail/mail-crypto.c:59
-# Novell Translation
 #: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "憑證簽名演算法"
 
 # ui/evolution-message-composer.xml.h:49
-# Novell Translation
 #: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "發照者"
 
-# Novell Translation
 #: ../smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "發照者獨有 ID"
 
 # mail/mail-autofilter.c:213
-# Novell Translation
 #: ../smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "主旨獨有 ID"
 
 # mail/mail-crypto.c:59
-# Novell Translation
 #: ../smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "憑證簽名值"
 
-# Novell Translation
 #: ../smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 檔案密碼"
 
 # camel/camel-smime-context.c:194
-# Novell Translation
 #: ../smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "輸入 PKCS12 檔案的密碼:"
 
-# Novell Translation
 #: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "輸入的憑證"
 
 # composer/e-msg-composer-attachment-bar.c:500
-# Novell Translation
 #: ../tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "要新增的附件。"
 
-# Novell Translation
 #: ../tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr "附件的內容類型。"
 
-# Novell Translation
 #: ../tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr "要顯示在郵件的檔案名稱。"
 
 # calendar/gui/gnome-cal.c:235
-# Novell Translation
 #: ../tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
 msgstr "附件的描述。"
 
-# Novell Translation
 #: ../tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
 msgstr "將附件標示成預設顯示在行內。"
 
-# Novell Translation
 #: ../tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
 msgstr "郵件的預設主旨。"
 
 # camel/providers/local/camel-mbox-summary.c:655
-# Novell Translation
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -20796,14 +19786,12 @@ msgstr "郵件的預設主旨。"
 msgid "Could not execute '%s': %s\n"
 msgstr "無法執行 `%s'：%s\n"
 
-# Novell Translation
 #: ../tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "關閉 %s (%s)\n"
 
 # ui/evolution-addressbook.xml.h:17
-# Novell Translation
 #: ../ui/evolution-addressbook.xml.h:2
 msgid "Contact _Preview"
 msgstr "連絡人預覽(_P)"
@@ -20824,6 +19812,13 @@ msgstr "複製選定範圍"
 msgid "Copy to Folder..."
 msgstr "複製至資料夾..."
 
+# ui/evolution-event-editor.xml.h:15
+# ui/evolution-task-editor-dialog.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "剪下"
+
 # ui/evolution-event-editor.xml.h:16
 # ui/evolution-task-editor-dialog.xml.h:17
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
@@ -20835,6 +19830,11 @@ msgstr "剪下選定範圍"
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
+# ui/evolution-mail.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Forward Contact"
+msgstr "轉寄連絡人"
+
 # ui/evolution-mail.xml.h:56
 #: ../ui/evolution-addressbook.xml.h:12
 msgid "Move Selected Contacts to Another Folder..."
@@ -20845,6 +19845,13 @@ msgstr "將選擇的連絡人移至另一個資料夾..."
 msgid "Move to Folder..."
 msgstr "移至資料夾..."
 
+# ui/evolution-event-editor.xml.h:30
+# ui/evolution-task-editor-dialog.xml.h:33
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "貼上"
+
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
@@ -20878,7 +19885,6 @@ msgid "Select all contacts"
 msgstr "選擇全部連絡人"
 
 # calendar/gui/e-calendar-table.c:714
-# Novell Translation
 #: ../ui/evolution-addressbook.xml.h:24
 msgid "Send a message to the selected contacts."
 msgstr "傳送郵件至選取的連絡人。"
@@ -20896,7 +19902,6 @@ msgid "Send selected contacts to another person."
 msgstr "傳送選定連絡人給其他使用者。"
 
 # ui/evolution-mail.xml.h:86
-# Novell Translation
 #: ../ui/evolution-addressbook.xml.h:27
 msgid "Show contact preview window"
 msgstr "顯示連絡人預覽視窗"
@@ -20924,10 +19929,6 @@ msgstr "執行(_A)"
 msgid "_Forward Contact..."
 msgstr "轉寄連絡人(_F)..."
 
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr "儲存成 VCard(_S)..."
-
 # ui/evolution-event-editor.xml.h:72
 # ui/evolution-task-editor-dialog.xml.h:86
 #: ../ui/evolution-addressbook.xml.h:42
@@ -20944,7 +19945,6 @@ msgid "Day"
 msgstr "天"
 
 # calendar/gui/e-week-view.c:3313
-# Novell Translation
 #: ../ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "刪除所有例項"
@@ -20956,14 +19956,12 @@ msgstr "刪除這個約會"
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-# Novell Translation
 #: ../ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "刪除此例項"
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-# Novell Translation
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "刪除此例項"
@@ -20998,7 +19996,7 @@ msgstr "月"
 # ui/evolution-event-editor.xml.h:29
 # ui/evolution-mail.xml.h:57
 # ui/evolution-task-editor-dialog.xml.h:32
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
 msgid "Next"
 msgstr "下一個"
 
@@ -21011,7 +20009,7 @@ msgstr "預覽將要列印的行事曆內容"
 # ui/evolution-event-editor.xml.h:33
 # ui/evolution-mail.xml.h:64
 # ui/evolution-task-editor-dialog.xml.h:36
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
 msgid "Previous"
 msgstr "上一個"
 
@@ -21028,7 +20026,6 @@ msgstr "發佈此行事曆的空閒/忙碌資訊"
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-# Novell Translation
 #: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "刪除舊約會和會議"
@@ -21042,20 +20039,17 @@ msgid "Select _Today"
 msgstr "選擇今天(_T)"
 
 # ui/evolution-calendar.xml.h:13
-# Novell Translation
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
 # shell/e-shell-importer.c:601
-# Novell Translation
 #: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "選取今日"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-# Novell Translation
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "顯示成清單"
@@ -21080,7 +20074,6 @@ msgstr "顯示一週"
 msgid "Show the working week"
 msgstr "顯示工作週"
 
-# Novell Translation
 #: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "檢視目前的約會"
@@ -21100,39 +20093,228 @@ msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
 # ui/evolution-mail.xml.h:9
-# Novell Translation
-#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr "複製選取的文字至剪貼簿"
 
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr "剪下(_T)"
-
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-# Novell Translation
-#: ../ui/evolution-composer-entries.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:3 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "剪下選取的文字至剪貼簿"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-# Novell Translation
-#: ../ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "全選(_A)"
 
 # ui/evolution-addressbook.xml.h:15
-# Novell Translation
-#: ../ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "選取所有文字"
 
+#: ../ui/evolution-editor.xml.h:2
+msgid "Click here to attach a file"
+msgstr "按這裡以附加檔案"
+
+# ui/evolution-message-composer.xml.h:4
+# ui/evolution-task-editor-dialog.xml.h:12
+#: ../ui/evolution-editor.xml.h:3
+msgid "Click here to close the current window"
+msgstr "按這裡以關閉目前視窗"
+
+# ui/evolution-message-composer.xml.h:4
+# ui/evolution-task-editor-dialog.xml.h:12
+#: ../ui/evolution-editor.xml.h:4
+msgid "Click here to save the current window"
+msgstr "按這裡以儲存目前視窗"
+
+#: ../ui/evolution-editor.xml.h:5
+msgid "Click here to view help availabe"
+msgstr "按這裡以檢視可用的說明"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:1
+# ui/evolution-contact-editor.xml.h:1
+# ui/evolution-event-editor.xml.h:10
+# ui/evolution-message-composer.xml.h:3
+# ui/evolution-subscribe.xml.h:2
+# ui/evolution-task-editor-dialog.xml.h:11
+# ui/evolution.xml.h:5
+#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:2
+msgid "Close"
+msgstr "關閉"
+
+#: ../ui/evolution-editor.xml.h:14
+msgid "_Attachments"
+msgstr "附加檔案(_A)"
+
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "關閉(_C)"
+
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:34
+msgid "_File"
+msgstr "檔案(_F)"
+
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:35
+msgid "_Help"
+msgstr "說明(_H)"
+
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:14
+msgid "_Insert"
+msgstr "插入(_I)"
+
+#: ../ui/evolution-editor.xml.h:21
+msgid "_Options"
+msgstr "選項(_O)"
+
+#: ../ui/evolution-event-editor.xml.h:2
+msgid "All day Event"
+msgstr "全天事件"
+
+# calendar/gui/calendar-model.c:366
+# calendar/gui/calendar-model.c:902
+# calendar/gui/e-calendar-table.c:325
+#: ../ui/evolution-event-editor.xml.h:3 ../ui/evolution-task-editor.xml.h:1
+msgid "Classify as Confidential"
+msgstr "分類為機密"
+
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:2
+msgid "Classify as Private"
+msgstr "分類為私人"
+
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:3
+msgid "Classify as public"
+msgstr "分類為公開"
+
+#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
+msgid "Insert advanced send options"
+msgstr "插入進階傳送選項"
+
+# calendar/gui/e-day-view.c:3175
+# calendar/gui/e-week-view.c:3309
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Make this a recurring event"
+msgstr "將此項設為循環事件"
+
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
+msgid "Pu_blic"
+msgstr "公開(_B)"
+
+#: ../ui/evolution-event-editor.xml.h:10
+msgid "Query free / busy information for the attendees"
+msgstr "查詢此到會者的空閒/忙碌資訊"
+
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
+msgid "R_ole Field"
+msgstr "角色欄位(_O)"
+
+#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
+msgid "Show Time _Zone"
+msgstr "顯示時區(_Z)"
+
+#: ../ui/evolution-event-editor.xml.h:15
+msgid "Show time as b_usy"
+msgstr "顯示時間為忙碌(_U)"
+
+# ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
+msgid "Toggles whether the Attendee Type field is displayed"
+msgstr "切換是否顯示「到會者類型」欄位"
+
+# ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "切換是否顯示「RSVP」欄位"
+
+# ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
+msgid "Toggles whether the Role field is displayed"
+msgstr "切換是否顯示「角色」欄位"
+
+# ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
+msgid "Toggles whether the Status field is displayed"
+msgstr "切換是否顯示「狀態」欄位"
+
+# ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
+msgid "Toggles whether the time zone is displayed"
+msgstr "切換是否顯示「時區」"
+
+# ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
+msgid "Toggles whether to display categories"
+msgstr "切換是否顯示「分類」"
+
+# ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-event-editor.xml.h:22
+msgid "Toggles whether to have All day Event"
+msgstr "切換是否要有全天事件"
+
+# ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-event-editor.xml.h:23
+msgid "Toggles whether to show time as busy"
+msgstr "切換是否將時間顯示為忙碌"
+
+# calendar/gui/e-calendar-table.c:162
+#: ../ui/evolution-event-editor.xml.h:24
+msgid "_Alarms"
+msgstr "鬧鈴(_A)"
+
+#: ../ui/evolution-event-editor.xml.h:25
+msgid "_All day Event"
+msgstr "全天事件(_A)"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:5
+# calendar/gui/e-calendar-table.c:151
+# calendar/gui/event-editor-dialog.glade.h:6
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
+msgid "_Classification"
+msgstr "分類(_C)"
+
+# calendar/gui/calendar-model.c:366
+# calendar/gui/calendar-model.c:902
+# calendar/gui/e-calendar-table.c:325
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
+msgid "_Confidential"
+msgstr "機密(_C)"
+
+# calendar/gui/calendar-model.c:363
+# calendar/gui/calendar-model.c:900
+# calendar/gui/e-calendar-table.c:324
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
+msgid "_Private"
+msgstr "私人(_P)"
+
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
+msgid "_Status Field"
+msgstr "狀態欄位(_S)"
+
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
+msgid "_Type Field"
+msgstr "類型欄位(_T)"
+
 # shell/e-shell-view.c:1203
 #: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
@@ -21177,10 +20359,9 @@ msgid "Message F_ilters"
 msgstr "郵件規則(_I)"
 
 # views/mail/galview.xml.h:4
-# Novell Translation
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _List As"
-msgstr "郵件排列為(_L)"
+msgstr "郵件列為(_L)"
 
 #: ../ui/evolution-mail-global.xml.h:11
 msgid "Message _Preview"
@@ -21285,7 +20466,7 @@ msgstr "標示郵件為已閱讀(_K)"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
@@ -21347,7 +20528,7 @@ msgstr "將選定的郵件暫時隱藏"
 msgid "Threaded Message list"
 msgstr "相關郵件清單"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "郵件(_M)"
@@ -21361,7 +20542,6 @@ msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
 # addressbook/gui/component/addressbook-config.c:662
-# Novell Translation
 #: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "新增寄件者至通訊錄"
@@ -21404,7 +20584,6 @@ msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
 # ui/evolution.xml.h:10
-# Novell Translation
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "建立規則(_U)"
@@ -21489,371 +20668,367 @@ msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
 #: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr "轉寄為(_O)..."
+
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "通信論壇過濾器(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "寄件者過濾器(_N)..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "收件者過濾器(_R)..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "主旨過濾器(_S)..."
 
 # ui/evolution-mail.xml.h:54
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "將選定的郵件加上跟隨標幟"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "跟隨(_U)..."
 
 # ui/evolution-mail.xml.h:30
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的郵件時強迫載入影像"
 
 # ui/evolution-mail.xml.h:38
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
 # ui/evolution-mail.xml.h:39
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
 # ui/evolution-mail.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
 # ui/evolution-mail.xml.h:41
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附加檔案形式轉寄給某人"
 
 # ui/evolution-message-composer.xml.h:10
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "增加文字大小"
 
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mar_k as"
 msgstr "標示成(_K)"
 
 # ui/evolution-mail.xml.h:52
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as important"
 msgstr "將選定的郵件標示成重要"
 
 # ui/evolution-mail.xml.h:54
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as junk"
 msgstr "將選取的郵件標示成垃圾郵件"
 
 # ui/evolution-mail.xml.h:53
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
 # ui/evolution-mail.xml.h:53
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Message Source"
 msgstr "郵件來源"
 
 # ui/evolution-mail.xml.h:55
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move"
 msgstr "移動"
 
 # ui/evolution-mail.xml.h:56
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Move selected message(s) to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
 # calendar/gui/calendar-commands.c:266
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Not Junk"
 msgstr "不是垃圾郵件"
 
 # ui/evolution-mail.xml.h:58
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
 # ui/evolution-mail.xml.h:59
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
 # ui/evolution-mail.xml.h:60
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Open the selected message in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件來編輯"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
 # mail/mail-ops.c:825
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Pos_t New Message to Folder"
 msgstr "張貼新郵件到資料夾(_T)"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
 msgstr "張貼回覆(_Y)"
 
 # mail/mail-ops.c:825
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a message to a Public folder"
 msgstr "張貼新郵件到公開資料夾"
 
 # ui/evolution-message-composer.xml.h:25
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Post a reply to a message in a Public folder"
 msgstr "張貼郵件的回覆至公開資料夾"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
 # ui/evolution-addressbook.xml.h:8
 # ui/evolution-mail.xml.h:63
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
 # mail/mail-callbacks.c:1407
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
 # ui/evolution-mail.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
 # ui/evolution-mail.xml.h:74
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Save the message as a text file"
 msgstr "另存郵件成文字檔案"
 
 # ui/evolution-mail.xml.h:95
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Mailing _List..."
 msgstr "通信論壇搜尋資料夾(_L)..."
 
 # ui/evolution-mail.xml.h:97
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from Recipients..."
 msgstr "收件者搜尋資料夾..."
 
 # ui/evolution-mail.xml.h:98
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from S_ubject..."
 msgstr "主旨搜尋資料夾(_U)..."
 
 # ui/evolution-mail.xml.h:96
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search Folder from Sen_der..."
 msgstr "寄件者搜尋資料夾(_D)..."
 
 # ui/evolution-mail.xml.h:75
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
 # ui/evolution-addressbook.xml.h:15
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select _All Text"
 msgstr "選取所有文字(_A)"
 
 # ui/evolution-mail.xml.h:80
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Select all the text in a message"
 msgstr "選擇郵件中的所有文字"
 
 # ui/evolution-event-editor.xml.h:50
 # ui/evolution-task-editor-dialog.xml.h:59
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "設定您目前印表機的版面設定"
 
 # ui/evolution-mail.xml.h:75
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
 # ui/evolution-mail.xml.h:86
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "使用正常模式顯示郵件"
 
 # ui/evolution-mail.xml.h:87
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
 # ui/evolution-mail.xml.h:89
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
 # ui/evolution-mail.xml.h:94
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Un-delete the selected messages"
 msgstr "復原選定的郵件"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+# ui/evolution-message-composer.xml.h:1
+#: ../ui/evolution-mail-message.xml.h:102
+msgid "_Attached"
+msgstr "已附加(_A)"
+
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Caret Mode"
 msgstr "漏字模式(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
 # mail/mail-search.c:268
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "重要(_I)"
 
+# mail/mail-config.glade.h:37
+#: ../ui/evolution-mail-message.xml.h:112
+msgid "_Inline"
+msgstr "行內(_I)"
+
 # calendar/gui/goto-dialog.glade.h:9
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "載入圖片(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Normal Size"
 msgstr "一般大小(_N)"
 
 # calendar/gui/calendar-commands.c:266
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
+# mail/mail-config.glade.h:56
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Quoted"
+msgstr "已引用(_Q)"
+
 # mail/mail-callbacks.c:1188
-# Novell Translation
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Save Message..."
 msgstr "儲存郵件(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:2
-msgid "Close"
-msgstr "關閉"
-
 # ui/evolution.xml.h:6
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
@@ -21864,18 +21039,6 @@ msgstr "關閉這個視窗"
 msgid "Main toolbar"
 msgstr "主工具列"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "關閉(_C)"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:34
-msgid "_File"
-msgstr "檔案(_F)"
-
 # calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
@@ -21893,7 +21056,6 @@ msgstr "刪除選定的備忘錄"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-# Novell Translation
 #: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
@@ -21909,7 +21071,6 @@ msgid "Print the list of memos"
 msgstr "列印備忘錄清單"
 
 # calendar/gui/e-calendar-table.c:714
-# Novell Translation
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
 msgstr "檢視選取的備忘錄"
@@ -21980,7 +21141,6 @@ msgstr "PGP 加密"
 msgid "PGP Sign"
 msgstr "PGP 加簽"
 
-# Novell Translation
 #: ../ui/evolution-message-composer.xml.h:15
 msgid "Request read receipt"
 msgstr "要求讀信回條"
@@ -22077,7 +21237,6 @@ msgid "Toggles whether the From chooser is displayed"
 msgstr "切換寄件者選擇器的顯示狀態"
 
 # ui/evolution-message-composer.xml.h:40
-# Novell Translation
 #: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "切換是否顯示「張貼至」欄位"
@@ -22088,7 +21247,6 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
 # ui/evolution-message-composer.xml.h:38
-# Novell Translation
 #: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the To field is displayed"
 msgstr "切換是否顯示「收件者」欄位"
@@ -22113,11 +21271,6 @@ msgstr "全部刪除(_D)"
 msgid "_From Field"
 msgstr "寄件者欄位(_F)"
 
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "_Insert"
-msgstr "插入(_I)"
-
 #: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "開啟(_O)..."
@@ -22196,6 +21349,25 @@ msgstr "取消訂閱"
 msgid "_Invert Selection"
 msgstr "反向選擇(_I)"
 
+#: ../ui/evolution-task-editor.xml.h:4
+msgid "Click change / view the status details of the task"
+msgstr "按這裡以改變/檢視該工作的詳細狀態資訊"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: ../ui/evolution-task-editor.xml.h:10
+msgid "Status Details"
+msgstr "狀態詳細資料"
+
+# addressbook/backend/ebook/e-card.c:3434
+#: ../ui/evolution-task-editor.xml.h:11
+msgid "Time Zone"
+msgstr "時區"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: ../ui/evolution-task-editor.xml.h:23
+msgid "_Status Details"
+msgstr "狀態詳細資料(_S)"
+
 # calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
@@ -22221,7 +21393,6 @@ msgid "Mar_k as Complete"
 msgstr "標示為完成(_K)"
 
 # calendar/gui/e-calendar-table.c:713
-# Novell Translation
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "將選取的工作標示成完成"
@@ -22243,7 +21414,6 @@ msgid "Print the list of tasks"
 msgstr "列印工作清單"
 
 # ui/evolution-mail.xml.h:86
-# Novell Translation
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
 msgstr "顯示連絡人預覽視窗"
@@ -22253,7 +21423,6 @@ msgid "Task _Preview"
 msgstr "工作預覽(_P)"
 
 # calendar/gui/e-calendar-table.c:714
-# Novell Translation
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "檢視選取的工作"
@@ -22263,7 +21432,6 @@ msgid "_Open Task"
 msgstr "開啟工作(_O)"
 
 # ui/evolution.xml.h:1
-# Novell Translation
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "關於 Evolution..."
@@ -22274,7 +21442,6 @@ msgid "Change Evolution's settings"
 msgstr "改變 Evolution 的設定值"
 
 # ui/evolution-mail.xml.h:4
-# Novell Translation
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "變更工具列的可見性"
@@ -22358,7 +21525,6 @@ msgid "Set up Pilot configuration"
 msgstr "設定 Pilot 組態"
 
 # ui/evolution.xml.h:27
-# Novell Translation
 #: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
@@ -22383,12 +21549,10 @@ msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:22
-# Novell Translation
 #: ../ui/evolution.xml.h:28
 msgid "Tool_bar"
 msgstr "工具列(_B)"
 
-# Novell Translation
 #: ../ui/evolution.xml.h:29
 msgid "Tool_bar style"
 msgstr "工具列風格(_B)"
@@ -22398,7 +21562,6 @@ msgid "View/Hide the Status Bar"
 msgstr "顯示/隱藏狀態列"
 
 # ui/evolution.xml.h:1
-# Novell Translation
 #: ../ui/evolution.xml.h:31
 msgid "_About Evolution..."
 msgstr "關於 Evolution(_A)..."
@@ -22408,10 +21571,6 @@ msgstr "關於 Evolution(_A)..."
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "說明(_H)"
-
 #: ../ui/evolution.xml.h:36
 msgid "_Hide buttons"
 msgstr "隱藏按鈕(_H)"
@@ -22432,10 +21591,6 @@ msgstr "新增(_N)"
 msgid "_Quick Reference"
 msgstr "快速偏好設定(_Q)"
 
-#: ../ui/evolution.xml.h:41
-msgid "_Quit"
-msgstr "離開(_Q)"
-
 #: ../ui/evolution.xml.h:42
 msgid "_Send / Receive"
 msgstr "傳送/接收(_S)"
@@ -22535,7 +21690,6 @@ msgid "UTC"
 msgstr "UTC"
 
 # addressbook/backend/ebook/e-card.c:3434
-# Novell Translation
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>時區</b>"
@@ -22555,7 +21709,6 @@ msgstr "選擇一個時區"
 msgid "TimeZone Combobox"
 msgstr "時區組合式方塊 "
 
-# Novell Translation
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
@@ -22571,7 +21724,6 @@ msgid "Collection"
 msgstr "收集"
 
 # widgets/menus/gal-view-menus.c:202
-# Novell Translation
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
@@ -22579,14 +21731,12 @@ msgid "Define Views for %s"
 msgstr "定義 %s 的檢視"
 
 # widgets/menus/gal-view-menus.c:202
-# Novell Translation
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
 msgid "Define Views"
 msgstr "定義檢視"
 
 # widgets/menus/gal-view-menus.c:202
-# Novell Translation
 #: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
@@ -22605,7 +21755,6 @@ msgstr "表格"
 
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-# Novell Translation
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
 msgid "Instance"
 msgstr "實體"
@@ -22616,7 +21765,6 @@ msgid "Save Current View"
 msgstr "儲存目前檢視"
 
 # ui/evolution-tasks.xml.h:2
-# Novell Translation
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "建立新的檢視(_C)"
@@ -22632,19 +21780,16 @@ msgstr "置換現存的檢視(_R)"
 msgid "Custom View"
 msgstr "自訂檢視"
 
-# Novell Translation
 #: ../widgets/menus/gal-view-instance.c:586
 msgid "Save Custom View"
 msgstr "儲存自訂檢視"
 
 # widgets/menus/gal-view-menus.c:202
-# Novell Translation
 #: ../widgets/menus/gal-view-instance.c:590
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "定義檢視..."
 
-# Novell Translation
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
 msgstr "儲存自訂檢視..."
@@ -22654,7 +21799,6 @@ msgid "Factory"
 msgstr "工廠"
 
 # widgets/menus/gal-view-menus.c:202
-# Novell Translation
 #: ../widgets/menus/gal-view-new-dialog.c:115
 msgid "Define New View"
 msgstr "定義新的檢視"
@@ -22724,7 +21868,6 @@ msgstr "GDK 填色"
 msgid "Fill stipple"
 msgstr "填入網點"
 
-# Novell Translation
 #: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
 msgid "X1"
@@ -22735,7 +21878,6 @@ msgstr "X1"
 msgid "X2"
 msgstr "X2"
 
-# Novell Translation
 #: ../widgets/misc/e-canvas-background.c:498
 #: ../widgets/misc/e-canvas-background.c:499
 msgid "Y1"
@@ -22761,7 +21903,6 @@ msgid "Minimum Width"
 msgstr "最小寬度"
 
 # ui/evolution-message-composer.xml.h:26
-# Novell Translation
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
@@ -22769,12 +21910,12 @@ msgstr "間距"
 
 # widgets/misc/e-cell-date-edit.c:221
 # widgets/misc/e-dateedit.c:418
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:460
 msgid "Now"
 msgstr "現在"
 
 # widgets/misc/e-cell-date-edit.c:726
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:802
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式：%s"
@@ -22828,7 +21969,6 @@ msgstr "Unicode"
 msgid "Western European"
 msgstr "西歐字母"
 
-# Novell Translation
 #: ../widgets/misc/e-charset-picker.c:74
 msgid "Western European, New"
 msgstr "西歐，新"
@@ -22881,47 +22021,44 @@ msgstr "..."
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:7
 # calendar/gui/event-editor-dialog.glade.h:8
-#: ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:320
 msgid "Date and Time Entry"
 msgstr "日期與時刻項目"
 
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:339
 msgid "Text entry to input date"
 msgstr "用來輸入日期的文字項目"
 
-#: ../widgets/misc/e-dateedit.c:336
+#: ../widgets/misc/e-dateedit.c:340
 msgid "Text Date Entry"
 msgstr "文字日期項目"
 
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:361
 msgid "Click this button to show a calendar"
 msgstr "按此按鈕以顯示行事曆"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: ../widgets/misc/e-dateedit.c:354
+#: ../widgets/misc/e-dateedit.c:362
 msgid "Date Button"
 msgstr "日期按鈕"
 
-#: ../widgets/misc/e-dateedit.c:374
+#: ../widgets/misc/e-dateedit.c:383
 msgid "Combo box to select time"
 msgstr "用以選擇時刻的組合式方塊"
 
-#: ../widgets/misc/e-dateedit.c:375
+#: ../widgets/misc/e-dateedit.c:384
 msgid "Time Combo Box"
 msgstr "時刻的組合式方塊"
 
 # ui/evolution-mail.xml.h:104
-# Novell Translation
 #: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "展開"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "是否展開展開器"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "展開器標籤的文字"
@@ -22929,49 +22066,40 @@ msgstr "展開器標籤的文字"
 # calendar/gui/calendar-model.c:1064
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
-# Novell Translation
 #: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "使用底線"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "如果設定，文字的底線會指示字元應該當成加速鍵"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "標籤和子代之間的距離"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "標籤工具"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "一種工具，可以一般展開器標籤中顯示"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
 msgid "Expander Size"
 msgstr "展開器大小"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大小"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "指示器間距"
 
-# Novell Translation
 #: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周圍的間距"
@@ -23005,7 +22133,6 @@ msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)..."
 
 # ui/evolution-message-composer.xml.h:12
-# Novell Translation
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "選擇影像"
@@ -23023,7 +22150,6 @@ msgstr ""
 "用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的組合方塊來選"
 "擇時區。"
 
-# Novell Translation
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "同步對象:"
@@ -23122,27 +22248,23 @@ msgstr "刪除時(_L):"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-# Novell Translation
 #: ../widgets/misc/e-send-options.glade.h:1
 msgid "<b>Delivery Options</b>"
 msgstr "<b>遞送選項</b>"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 # calendar/gui/event-editor-dialog.glade.h:21
-# Novell Translation
 #: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
 msgstr "<b>回覆</b>"
 
 # mail/mail-config.glade.h:10
-# Novell Translation
 #: ../widgets/misc/e-send-options.glade.h:3
 msgid "<b>Return Notification</b>"
 msgstr "<b>返回通知</b>"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-# Novell Translation
 #: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
 msgstr "<b>狀態追蹤</b>"
@@ -23155,7 +22277,6 @@ msgstr "自動刪除項目(_U)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
-# Novell Translation
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "C_lassification"
 msgstr "分類(_L)"
@@ -23164,7 +22285,6 @@ msgstr "分類(_L)"
 msgid "Creat_e a sent item to track information"
 msgstr "建立新的傳送項目至追蹤資訊(_E)"
 
-# Novell Translation
 #: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
 msgstr "已遞送與已開啟"
@@ -23174,7 +22294,6 @@ msgstr "已遞送與已開啟"
 msgid "Gene_ral Options"
 msgstr "一般選項(_R)"
 
-# Novell Translation
 #: ../widgets/misc/e-send-options.glade.h:10
 msgid ""
 "None\n"
@@ -23228,7 +22347,6 @@ msgid "When acce_pted:"
 msgstr "當接受時(_P):"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-# Novell Translation
 #: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "當完成時(_M)："
@@ -23307,7 +22425,6 @@ msgid "Item(s) belong to these _categories:"
 msgstr "屬於這些分類的項目:"
 
 # calendar/gui/e-calendar-table.c:150
-# Novell Translation
 #: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "可用的分類(_A):"
@@ -23740,12 +22857,10 @@ msgstr "繪出線條與 +/- 展開符號。"
 msgid "Minicard Test"
 msgstr "迷你名片測試"
 
-# Novell Translation
 #: ../widgets/text/e-entry-test.c:50
 msgid "Copyright (C) 2000, Helix Code, Inc."
 msgstr "Copyright (C) 2000, Helix Code, Inc."
 
-# Novell Translation
 #: ../widgets/text/e-entry-test.c:52
 msgid "This should test the minicard canvas item"
 msgstr "這可以測試迷你名片畫布項目"
author	Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>	2005-11-27 06:52:15 +0800
committer	Chao-Hsiung Liao <chliao@src.gnome.org>	2005-11-27 06:52:15 +0800
commit	d1fc1e7bce39241c0d21ba87116089b643b1784c (patch)
tree	9a6a0d74574858b293b8c7503ba81c262fadf643 /po/zh_TW.po
parent	59d486de79a5940919071fa7ca7bbbae96cb87cc (diff)
download	gsoc2013-evolution-d1fc1e7bce39241c0d21ba87116089b643b1784c.tar.gz gsoc2013-evolution-d1fc1e7bce39241c0d21ba87116089b643b1784c.tar.zst gsoc2013-evolution-d1fc1e7bce39241c0d21ba87116089b643b1784c.zip