fix language team reference
authorKwok-Koon Cheung <baddog@src.gnome.org>
Fri, 24 Jun 2005 03:27:37 +0000 (03:27 +0000)
committerKwok-Koon Cheung <baddog@src.gnome.org>
Fri, 24 Jun 2005 03:27:37 +0000 (03:27 +0000)
po/ChangeLog
po/zh_TW.po

index 60a647d..2f4669b 100644 (file)
@@ -1,3 +1,7 @@
+2005-06-22  Abel Cheung  <maddog@linuxhall.org>
+
+       * zh_TW.po: Fix language team reference.
+
 2005-06-21  Priit Laes  <plaes@cvs.gnome.org>
 
        * et.po: Translation updated by Ivar Smolin.
index d6e3872..24d61eb 100644 (file)
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.1.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-14 15:54+0800\n"
+"POT-Creation-Date: 2005-06-23 21:16+0000\n"
 "PO-Revision-Date: 2003-03-23 11:33+0800\n"
 "Last-Translator: Craig Jeffares <cjeffares@novell.com>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,62 +18,75 @@ msgstr ""
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: addressbook/backends/file/e-book-backend-file.c:485
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2033
-#: addressbook/backends/vcf/e-book-backend-vcf.c:452
+#: ../addressbook/backends/file/e-book-backend-file.c:528
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:1991
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:473
 msgid "Loading..."
 msgstr "載入中..."
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/backends/file/e-book-backend-file.c:487
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2017
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2031
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3401
-#: addressbook/backends/vcf/e-book-backend-vcf.c:454
+#: ../addressbook/backends/file/e-book-backend-file.c:530
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:1977
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:1989
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3405
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Searching..."
 msgstr "搜尋..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:647
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2225
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3538
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr ""
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2307
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2411
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2441
+#, c-format
+msgid "Updating contacts cache (%d)... "
+msgstr ""
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:647
 msgid "Using Distinguished Name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
 # mail/mail-config.glade.h:29
-#: addressbook/backends/ldap/e-book-backend-ldap.c:650
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:650
 msgid "Using Email Address"
 msgstr "使用電子郵件地址"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: addressbook/backends/ldap/e-book-backend-ldap.c:820
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:820
 msgid "Reconnecting to LDAP server..."
 msgstr "正重新連線至 LDAP 伺服器..."
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
 # Novell Translation
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1368
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1368
 msgid "Adding contact to LDAP server..."
 msgstr "正在新增連絡人至 LDAP 伺服器..."
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
 # Novell Translation
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1493
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1493
 msgid "Removing contact from LDAP server..."
 msgstr "正在移除 LDAP 伺服器中的連絡人..."
 
 # Novell Translation
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1750
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1750
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 伺服器中的連絡人..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3290
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3295
 msgid "Receiving LDAP search results..."
 msgstr "接收 LDAP 搜尋結果..."
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3421
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3425
 msgid "Error performing search"
 msgstr "進行搜尋時發生錯誤"
 
@@ -82,65 +95,67 @@ msgstr "進行搜尋時發生錯誤"
 #. * function names, e.g.
 #. * "e_book_add_contact" on book before
 #. * "e_book_open
-#: addressbook/libebook/e-book.c:240 addressbook/libebook/e-book.c:244
-#: addressbook/libebook/e-book.c:446 addressbook/libebook/e-book.c:450
-#: addressbook/libebook/e-book.c:579 addressbook/libebook/e-book.c:583
-#: addressbook/libebook/e-book.c:672 addressbook/libebook/e-book.c:676
-#: addressbook/libebook/e-book.c:952 addressbook/libebook/e-book.c:957
-#: addressbook/libebook/e-book.c:1132 addressbook/libebook/e-book.c:1136
-#: addressbook/libebook/e-book.c:1277 addressbook/libebook/e-book.c:1281
-#: addressbook/libebook/e-book.c:1479 addressbook/libebook/e-book.c:1483
-#: addressbook/libebook/e-book.c:1684 addressbook/libebook/e-book.c:1688
-#: addressbook/libebook/e-book.c:1910 addressbook/libebook/e-book.c:1914
-#: addressbook/libebook/e-book.c:2117 addressbook/libebook/e-book.c:2121
-#: addressbook/libebook/e-book.c:3200
+#: ../addressbook/libebook/e-book.c:238 ../addressbook/libebook/e-book.c:242
+#: ../addressbook/libebook/e-book.c:454 ../addressbook/libebook/e-book.c:458
+#: ../addressbook/libebook/e-book.c:599 ../addressbook/libebook/e-book.c:603
+#: ../addressbook/libebook/e-book.c:692 ../addressbook/libebook/e-book.c:696
+#: ../addressbook/libebook/e-book.c:1010 ../addressbook/libebook/e-book.c:1015
+#: ../addressbook/libebook/e-book.c:1202 ../addressbook/libebook/e-book.c:1206
+#: ../addressbook/libebook/e-book.c:1363 ../addressbook/libebook/e-book.c:1367
+#: ../addressbook/libebook/e-book.c:1576 ../addressbook/libebook/e-book.c:1580
+#: ../addressbook/libebook/e-book.c:1817 ../addressbook/libebook/e-book.c:1821
+#: ../addressbook/libebook/e-book.c:2057 ../addressbook/libebook/e-book.c:2061
+#: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277
+#: ../addressbook/libebook/e-book.c:3373
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "在通訊錄中「%s」在「%s」之前"
 
 # Novell Translation
-#: addressbook/libebook/e-book.c:253 addressbook/libebook/e-book.c:459
-#: addressbook/libebook/e-book.c:592 addressbook/libebook/e-book.c:685
-#: addressbook/libebook/e-book.c:967 addressbook/libebook/e-book.c:1146
-#: addressbook/libebook/e-book.c:1291 addressbook/libebook/e-book.c:1492
-#: addressbook/libebook/e-book.c:1697 addressbook/libebook/e-book.c:1924
-#: addressbook/libebook/e-book.c:2130 addressbook/libebook/e-book.c:2468
-#: addressbook/libebook/e-book.c:2664
+#: ../addressbook/libebook/e-book.c:251 ../addressbook/libebook/e-book.c:467
+#: ../addressbook/libebook/e-book.c:612 ../addressbook/libebook/e-book.c:705
+#: ../addressbook/libebook/e-book.c:1025 ../addressbook/libebook/e-book.c:1216
+#: ../addressbook/libebook/e-book.c:1377 ../addressbook/libebook/e-book.c:1589
+#: ../addressbook/libebook/e-book.c:1830 ../addressbook/libebook/e-book.c:2071
+#: ../addressbook/libebook/e-book.c:2286 ../addressbook/libebook/e-book.c:2622
+#: ../addressbook/libebook/e-book.c:2828
 msgid "book busy"
 msgstr "通訊錄忙碌中"
 
 # Novell Translation
-#: addressbook/libebook/e-book.c:286 addressbook/libebook/e-book.c:290
-#: addressbook/libebook/e-book.c:492 addressbook/libebook/e-book.c:496
-#: addressbook/libebook/e-book.c:621 addressbook/libebook/e-book.c:625
-#: addressbook/libebook/e-book.c:714 addressbook/libebook/e-book.c:718
-#: addressbook/libebook/e-book.c:996 addressbook/libebook/e-book.c:999
-#: addressbook/libebook/e-book.c:1178 addressbook/libebook/e-book.c:1181
-#: addressbook/libebook/e-book.c:1320 addressbook/libebook/e-book.c:1324
-#: addressbook/libebook/e-book.c:1528 addressbook/libebook/e-book.c:1532
-#: addressbook/libebook/e-book.c:1744 addressbook/libebook/e-book.c:1748
-#: addressbook/libebook/e-book.c:1956 addressbook/libebook/e-book.c:1960
-#: addressbook/libebook/e-book.c:2158 addressbook/libebook/e-book.c:2162
-#: addressbook/libebook/e-book.c:2409 addressbook/libebook/e-book.c:2496
-#: addressbook/libebook/e-book.c:2500 addressbook/libebook/e-book.c:2692
-#: addressbook/libebook/e-book.c:2696 addressbook/libebook/e-book.c:3209
+#: ../addressbook/libebook/e-book.c:284 ../addressbook/libebook/e-book.c:288
+#: ../addressbook/libebook/e-book.c:500 ../addressbook/libebook/e-book.c:504
+#: ../addressbook/libebook/e-book.c:641 ../addressbook/libebook/e-book.c:645
+#: ../addressbook/libebook/e-book.c:734 ../addressbook/libebook/e-book.c:738
+#: ../addressbook/libebook/e-book.c:1054 ../addressbook/libebook/e-book.c:1057
+#: ../addressbook/libebook/e-book.c:1248 ../addressbook/libebook/e-book.c:1251
+#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
+#: ../addressbook/libebook/e-book.c:1625 ../addressbook/libebook/e-book.c:1629
+#: ../addressbook/libebook/e-book.c:1877 ../addressbook/libebook/e-book.c:1881
+#: ../addressbook/libebook/e-book.c:2103 ../addressbook/libebook/e-book.c:2107
+#: ../addressbook/libebook/e-book.c:2314 ../addressbook/libebook/e-book.c:2318
+#: ../addressbook/libebook/e-book.c:2563 ../addressbook/libebook/e-book.c:2650
+#: ../addressbook/libebook/e-book.c:2654 ../addressbook/libebook/e-book.c:2856
+#: ../addressbook/libebook/e-book.c:2860 ../addressbook/libebook/e-book.c:3382
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "CORBA 例外造成「%s」呼叫"
 
 # ui/evolution-mail.xml.h:3
 # Novell Translation
-#: addressbook/libebook/e-book.c:2390
-msgid "e_book_cancel: there is no current operation"
+#: ../addressbook/libebook/e-book.c:2544
+#, fuzzy, c-format
+msgid "%s: there is no current operation"
 msgstr "e_book_cancel:目前沒有操作"
 
 # Novell Translation
-#: addressbook/libebook/e-book.c:2425
-msgid "e_book_cancel: couldn't cancel"
+#: ../addressbook/libebook/e-book.c:2579
+#, fuzzy, c-format
+msgid "%s: couldn't cancel"
 msgstr "e_book_cancel:無法取消"
 
 # Novell Translation
-#: addressbook/libebook/e-book.c:2454 addressbook/libebook/e-book.c:2458
+#: ../addressbook/libebook/e-book.c:2608 ../addressbook/libebook/e-book.c:2612
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "在通訊錄中「%s」在「%s」之後"
@@ -149,56 +164,53 @@ msgstr "在通訊錄中「%s」在「%s」之後"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-# Novell Translation
-#: addressbook/libebook/e-book.c:2524
-msgid "e_book_open: cancelled"
-msgstr "e_book_open:已取消"
+#: ../addressbook/libebook/e-book.c:2678
+#, fuzzy, c-format
+msgid "%s: cancelled"
+msgstr "使用者已取消"
 
 # Novell Translation
-#: addressbook/libebook/e-book.c:3066
-msgid "e_book_load_uri: Invalid source."
+#: ../addressbook/libebook/e-book.c:3239
+#, fuzzy, c-format
+msgid "%s: Invalid source."
 msgstr "e_book_load_uri:無效的來源。"
 
-# Novell Translation
-#: addressbook/libebook/e-book.c:3074
-#, c-format
-msgid "e_book_load_uri: no factories available for uri `%s'"
-msgstr "e_book_load_uri:uri `%s' 沒有可用的製造廠"
-
-# Novell Translation
-#: addressbook/libebook/e-book.c:3086
-msgid "e_book_load_uri: Could not create EBookListener"
-msgstr "e_book_load_uri:無法建立 EBookListener"
-
 # camel/camel-session.c:295
 # camel/camel-session.c:364
 # Novell Translation
-#: addressbook/libebook/e-book.c:3138
-#, c-format
-msgid "e_book_new: no factories available for uri `%s'"
+#: ../addressbook/libebook/e-book.c:3247 ../addressbook/libebook/e-book.c:3311
+#, fuzzy, c-format
+msgid "%s: no factories available for uri `%s'"
 msgstr "e_book_new:uri `%s' 沒有可用的製造廠"
 
 # Novell Translation
-#: addressbook/libebook/e-book.c:3332
-msgid "e_book_get_self: there was no self contact uid stored in gconf"
+#: ../addressbook/libebook/e-book.c:3259
+#, fuzzy, c-format
+msgid "%s: Could not create EBookListener"
+msgstr "e_book_load_uri:無法建立 EBookListener"
+
+# Novell Translation
+#: ../addressbook/libebook/e-book.c:3522
+#, fuzzy, c-format
+msgid "%s: there was no self contact uid stored in gconf"
 msgstr "e_book_get_self:沒有儲存於 gconf 中的本身連絡人 uid"
 
 # Novell Translation
-#: addressbook/libebook/e-book.c:3443
-#, c-format
-msgid ""
-"e_book_set_default_source: there was no source for uid `%s' stored in gconf."
+#: ../addressbook/libebook/e-book.c:3652
+#, fuzzy, c-format
+msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "e_book_set_default_source:沒有儲存於 gconf 中的 uid `%s' 來源。"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:102
+#: ../addressbook/libebook/e-contact.c:102
 msgid "Unique ID"
 msgstr "獨特的 ID"
 
-# addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/libebook/e-contact.c:103
-msgid "File As"
-msgstr "歸檔為"
+# composer/e-msg-composer-attachment.glade.h:4
+#: ../addressbook/libebook/e-contact.c:103
+#, fuzzy
+msgid "File Under"
+msgstr "檔案名稱:"
 
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
@@ -206,178 +218,178 @@ msgstr "歸檔為"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: addressbook/libebook/e-contact.c:109
+#: ../addressbook/libebook/e-contact.c:109
 msgid "Full Name"
 msgstr "全名"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/libebook/e-contact.c:110
+#: ../addressbook/libebook/e-contact.c:110
 msgid "Name"
 msgstr "名稱"
 
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
 # Novell Translation
-#: addressbook/libebook/e-contact.c:111
+#: ../addressbook/libebook/e-contact.c:111
 msgid "Given Name"
 msgstr "名"
 
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
-#: addressbook/libebook/e-contact.c:112
+#: ../addressbook/libebook/e-contact.c:112
 msgid "Family Name"
 msgstr "姓"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:113
 msgid "Nickname"
 msgstr "暱稱"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:114
 msgid "Name or Org"
 msgstr "姓名或組織"
 
 # addressbook/backend/ebook/e-card.c:3346
 # Novell Translation
 #. Address fields
-#: addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:117
 msgid "Address List"
 msgstr "地址清單"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Home Address"
 msgstr "住家地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
 # Novell Translation
-#: addressbook/libebook/e-contact.c:119
+#: ../addressbook/libebook/e-contact.c:119
 msgid "Work Address"
 msgstr "工作地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: addressbook/libebook/e-contact.c:120
+#: ../addressbook/libebook/e-contact.c:120
 msgid "Other Address"
 msgstr "其它地址"
 
 # data/evolution.keys.in.h:1
 # Novell Translation
-#: addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:122
 msgid "Home Address Label"
 msgstr "住家地址標籤"
 
 # data/evolution.keys.in.h:1
 # Novell Translation
-#: addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:123
 msgid "Work Address Label"
 msgstr "工作地址標籤"
 
 # data/evolution.keys.in.h:1
 # Novell Translation
-#: addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Other Address Label"
 msgstr "其他地址標籤"
 
 # addressbook/gui/widgets/e-addressbook-view.c:703
-#: addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Assistant Phone"
 msgstr "助理電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:704
-#: addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Business Phone"
 msgstr "商務電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:715
-#: addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Business Phone 2"
 msgstr "商務電話 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1245
 # addressbook/gui/widgets/e-addressbook-view.c:713
-#: addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Business Fax"
 msgstr "商務傅真"
 
 # addressbook/gui/widgets/e-addressbook-view.c:705
-#: addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Callback Phone"
 msgstr "回撥電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:712
-#: addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Car Phone"
 msgstr "汽車電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:706
-#: addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Company Phone"
 msgstr "公司電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:707
-#: addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Home Phone"
 msgstr "住家電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:716
-#: addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Home Phone 2"
 msgstr "住家電話 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
-#: addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Home Fax"
 msgstr "住家傳真"
 
 # addressbook/contact-editor/e-contact-editor.c:1252
 # addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:136
 msgid "ISDN"
 msgstr "ISDN"
 
 # addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Mobile Phone"
 msgstr "行動電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:718
-#: addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Other Phone"
 msgstr "其它電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
-#: addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Other Fax"
 msgstr "其它傳真"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Pager"
 msgstr "呼叫器"
 
 # addressbook/gui/widgets/e-addressbook-view.c:702
-#: addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Primary Phone"
 msgstr "主要電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
-#: addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Radio"
 msgstr "無線電電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1259
 # addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Telex"
 msgstr "電報"
 
 # addressbook/gui/widgets/e-addressbook-view.c:723
-#: addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:144
 msgid "TTY"
 msgstr "TTY"
 
@@ -385,458 +397,491 @@ msgstr "TTY"
 # addressbook/gui/widgets/e-addressbook-view.c:725
 # Novell Translation
 #. Email fields
-#: addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Email List"
 msgstr "電子郵件清單"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
 # Novell Translation
-#: addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Email 1"
 msgstr "電子郵件 1"
 
 # addressbook/contact-editor/e-contact-editor.c:1285
 # addressbook/gui/widgets/e-addressbook-view.c:725
-#: addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Email 2"
 msgstr "電子郵件 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
-#: addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Email 3"
 msgstr "電子郵件 3"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
 # Novell Translation
-#: addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Email 4"
 msgstr "電子郵件 4"
 
 # addressbook/backend/ebook/e-card.c:3428
-#: addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Mailer"
 msgstr "寄件者"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Wants HTML Mail"
 msgstr "需要 HTML 郵件"
 
 # Novell Translation
 #. Instant messaging fields
-#: addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:156
 msgid "AIM Screen Name List"
 msgstr "AIM 螢幕名稱清單"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:157
-msgid "Groupwise Id List"
+#: ../addressbook/libebook/e-contact.c:157
+#, fuzzy
+msgid "GroupWise Id List"
 msgstr "Groupwise Id 清單"
 
 # addressbook/gui/component/addressbook-storage.c:99
 # Novell Translation
-#: addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Jabber Id List"
 msgstr "Jabber Id 清單"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo!螢幕名稱清單"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:160
 msgid "MSN Screen Name List"
 msgstr "MSN 螢幕名稱清單"
 
 # mail/mail-config.glade.h:45
 # Novell Translation
-#: addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:161
 msgid "ICQ Id List"
 msgstr "ICQ Id 清單"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:163
 msgid "AIM Home Screen Name 1"
 msgstr "AIM 家用螢幕名稱 1"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:164
 msgid "AIM Home Screen Name 2"
 msgstr "AIM 家用螢幕名稱 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:165
 msgid "AIM Home Screen Name 3"
 msgstr "AIM 家用螢幕名稱 3"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:166
 msgid "AIM Work Screen Name 1"
 msgstr "AIM 工作螢幕名稱 1"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:167
 msgid "AIM Work Screen Name 2"
 msgstr "AIM 工作螢幕名稱 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:168
 msgid "AIM Work Screen Name 3"
 msgstr "AIM 工作螢幕名稱 3"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:169
-msgid "Groupwise Home Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:169
+#, fuzzy
+msgid "GroupWise Home Screen Name 1"
 msgstr "Groupwise 家用螢幕名稱 1"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:170
-msgid "Groupwise Home Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:170
+#, fuzzy
+msgid "GroupWise Home Screen Name 2"
 msgstr "Groupwise 家用螢幕名稱 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:171
-msgid "Groupwise Home Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:171
+#, fuzzy
+msgid "GroupWise Home Screen Name 3"
 msgstr "Groupwise 家用螢幕名稱 3"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:172
-msgid "Groupwise Work Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:172
+#, fuzzy
+msgid "GroupWise Work Screen Name 1"
 msgstr "Groupwise 工作螢幕名稱 1"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:173
-msgid "Groupwise Work Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:173
+#, fuzzy
+msgid "GroupWise Work Screen Name 2"
 msgstr "Groupwise 工作螢幕名稱 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:174
-msgid "Groupwise Work Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:174
+#, fuzzy
+msgid "GroupWise Work Screen Name 3"
 msgstr "Groupwise 工作螢幕名稱 3"
 
 # addressbook/gui/component/addressbook-storage.c:99
 # Novell Translation
-#: addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Jabber Home Id 1"
 msgstr "Jabber 家用 Id 1"
 
 # addressbook/gui/component/addressbook-storage.c:99
 # Novell Translation
-#: addressbook/libebook/e-contact.c:176
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Jabber Home Id 2"
 msgstr "Jabber 家用 Id 2"
 
 # addressbook/gui/component/addressbook-storage.c:99
 # Novell Translation
-#: addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Jabber Home Id 3"
 msgstr "Jabber 家用 Id 3"
 
 # addressbook/gui/component/addressbook-storage.c:99
 # Novell Translation
-#: addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Jabber Work Id 1"
 msgstr "Jabber 工作 Id 1"
 
 # addressbook/gui/component/addressbook-storage.c:99
 # Novell Translation
-#: addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Jabber Work Id 2"
 msgstr "Jabber 工作 Id 2"
 
 # addressbook/gui/component/addressbook-storage.c:99
 # Novell Translation
-#: addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Jabber Work Id 3"
 msgstr "Jabber 工作 Id 3"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!家用螢幕名稱 1"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!家用螢幕名稱 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:183
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!家用螢幕名稱 3"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!工作螢幕名稱 1"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!工作螢幕名稱 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:186
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!工作螢幕名稱 3"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:187
 msgid "MSN Home Screen Name 1"
 msgstr "MSN 家用螢幕名稱 1"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:188
 msgid "MSN Home Screen Name 2"
 msgstr "MSN 家用螢幕名稱 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:189
 msgid "MSN Home Screen Name 3"
 msgstr "MSN 家用螢幕名稱 3"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:190
 msgid "MSN Work Screen Name 1"
 msgstr "MSN 工作螢幕名稱 1"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:191
 msgid "MSN Work Screen Name 2"
 msgstr "MSN 工作螢幕名稱 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:192
 msgid "MSN Work Screen Name 3"
 msgstr "MSN 工作螢幕名稱 3"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICQ Home Id 1"
 msgstr "ICQ 家用 Id 1"
 
 # addressbook/contact-editor/e-contact-editor.c:1250
 # Novell Translation
-#: addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:194
 msgid "ICQ Home Id 2"
 msgstr "ICQ 家用 Id 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:195
 msgid "ICQ Home Id 3"
 msgstr "ICQ 家用 Id 3"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:196
 msgid "ICQ Work Id 1"
 msgstr "ICQ 工作 Id 1"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:197
 msgid "ICQ Work Id 2"
 msgstr "ICQ 工作 Id 2"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:198
 msgid "ICQ Work Id 3"
 msgstr "ICQ 工作 Id 3"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
 #. Organizational fields
-#: addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:201
 msgid "Organization"
 msgstr "團體"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:202
 msgid "Organizational Unit"
 msgstr "團體單位"
 
 # addressbook/gui/widgets/e-addressbook-view.c:729
-#: addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Office"
 msgstr "辦公室"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
-#: addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Title"
 msgstr "頭銜"
 
-#: addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Role"
 msgstr "角色"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Manager"
 msgstr "主管"
 
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Assistant"
 msgstr "助理"
 
 # Novell Translation
 #. Web fields
-#: addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Homepage URL"
 msgstr "首頁 URL"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Weblog URL"
 msgstr "Weblog URL"
 
 # Novell Translation
-#: addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Video Conferencing URL"
 msgstr "視訊會議 URL"
 
 # addressbook/gui/component/addressbook-config.c:409
 # Novell Translation
 #. Photo/Logo
-#: addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Photo"
 msgstr "相片"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
 # Novell Translation
-#: addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Logo"
 msgstr "標幟"
 
 # Novell Translation
 #. Security fields
-#: addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:220
 msgid "X.509 Certificate"
 msgstr "X.509 憑證"
 
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
-#: addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Category List"
 msgstr "類別清單"
 
 # calendar/gui/e-calendar-table.c:150
-#: addressbook/libebook/e-contact.c:224
-#: libedataserverui/e-categories-dialog.c:369
+#: ../addressbook/libebook/e-contact.c:224
+#: ../libedataserverui/e-categories-dialog.c:398
 msgid "Categories"
 msgstr "類別"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #. Collaboration fields
-#: addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:227
 msgid "Calendar URI"
 msgstr "行事曆 URI"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:228
 msgid "Free/Busy URL"
 msgstr "空閒/忙碌 URL"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 # Novell Translation
-#: addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICS Calendar"
 msgstr "ICS 行事曆"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 # Novell Translation
 #. Misc fields
-#: addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Spouse's Name"
 msgstr "配偶姓名"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
-#: addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Note"
 msgstr "備註"
 
 # addressbook/backend/ebook/e-card.c:3335
-#: addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Birth Date"
 msgstr "出生日期"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: addressbook/libebook/e-contact.c:236
+#. Make sure we have all categories
+#: ../addressbook/libebook/e-contact.c:236
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:453
+#: ../libedataserver/e-categories.c:235
 msgid "Anniversary"
 msgstr "紀念日"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:238
 msgid "List"
 msgstr "清單"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:239
 msgid "List Show Addresses"
 msgstr "清單顯示地址"
 
+#: ../addressbook/libebook/e-contact.c:241
+msgid "Last Revision"
+msgstr ""
+
 # addressbook/gui/component/addressbook-storage.c:99
-#: addressbook/libebook/e-contact.c:1208
+#: ../addressbook/libebook/e-contact.c:1222
+#: ../addressbook/libebook/e-destination.c:751
 msgid "Unnamed List"
 msgstr "未命名的清單"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
 # Novell Translation
-#. Set category and visibility
-#: calendar/backends/contacts/e-cal-backend-contacts.c:446
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:455
+#: ../libedataserver/e-categories.c:236
 msgid "Birthday"
 msgstr "生日"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
 # Novell Translation
-#: calendar/backends/contacts/e-cal-backend-contacts.c:470
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:481
 #, c-format
 msgid "Birthday: %s"
 msgstr "生日:%s"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
 # Novell Translation
-#: calendar/backends/contacts/e-cal-backend-contacts.c:491
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:505
 #, c-format
 msgid "Anniversary: %s"
 msgstr "紀念日:%s"
 
 # Novell Translation
-#: calendar/backends/file/e-cal-backend-file.c:174
+#: ../calendar/backends/file/e-cal-backend-file.c:193
 msgid "Can't save calendar data: Malformed URI."
 msgstr "無法儲存行事曆資料:URI 的格式不正確。"
 
+# mail/message-browser.c:191
+# ui/evolution-mail.xml.h:71
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:786
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:237
+#, fuzzy
+msgid "Reply Requested: by "
+msgstr "回覆方式(_R):"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:791
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:242
+msgid "Reply Requested: When convenient"
+msgstr ""
+
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
 # Novell Translation
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:484
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:574
 msgid "Invalid server URI"
 msgstr "無效的伺服器 URI"
 
+# camel/providers/imap/camel-imap-folder.c:172
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:605
+#, fuzzy
+msgid "Could not create thread for getting deltas"
+msgstr "無法建立目錄 %s: %s"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:531
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:534
-#: camel/providers/groupwise/camel-gw-listener.c:405
-#: camel/providers/groupwise/camel-gw-listener.c:435
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:627
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:630
 msgid "Calendar"
 msgstr "行事曆"
 
 # camel/providers/local/camel-mbox-store.c:110
 # Novell Translation
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:541
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:784
-#: calendar/backends/http/e-cal-backend-http.c:484
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:637
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:877
+#: ../calendar/backends/http/e-cal-backend-http.c:495
+#: ../calendar/backends/weather/e-cal-backend-weather.c:444
 msgid "Could not create cache file"
 msgstr "無法建立快取檔案"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:551
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:647
 #, fuzzy
 msgid "Could not create thread for populating cache"
 msgstr "無法建立目錄 %s: %s"
@@ -844,199 +889,425 @@ msgstr "無法建立目錄 %s: %s"
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 # Novell Translation
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:557
-#: calendar/libecal/e-cal.c:4560
-#: camel/providers/groupwise/camel-groupwise-folder.c:533
-#: camel/providers/groupwise/camel-groupwise-store.c:503
-#: camel/providers/groupwise/camel-groupwise-store.c:641
-#: camel/providers/groupwise/camel-groupwise-store.c:800
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:653
+#: ../calendar/libecal/e-cal.c:4850
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:841
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:861
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:888
+#: ../camel/providers/groupwise/camel-groupwise-store.c:520
+#: ../camel/providers/groupwise/camel-groupwise-store.c:539
+#: ../camel/providers/groupwise/camel-groupwise-store.c:584
+#: ../camel/providers/groupwise/camel-groupwise-store.c:745
+#: ../camel/providers/groupwise/camel-groupwise-store.c:943
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:176
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-# shell/e-shell-view-menu.c:602
-# shell/e-shell-view-menu.c:614
-# Novell Translation
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:776
-#, fuzzy
-msgid "Repository is Offline"
-msgstr "容器已離線"
-
 # mail/mail-config.glade.h:37
 # Novell Translation
-#: calendar/backends/http/e-cal-backend-http.c:240
+#: ../calendar/backends/http/e-cal-backend-http.c:240
 msgid "Redirected to Invalid URI"
 msgstr "重新指向無效的 URI"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 # Novell Translation
-#: calendar/backends/http/e-cal-backend-http.c:264
+#: ../calendar/backends/http/e-cal-backend-http.c:264
 msgid "Bad file format."
 msgstr "錯誤的檔案格式。"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
 # Novell Translation
-#: calendar/backends/http/e-cal-backend-http.c:270
+#: ../calendar/backends/http/e-cal-backend-http.c:270
 msgid "Not a calendar."
 msgstr "並非行事曆。"
 
+# mail/mail-ops.c:1872
+#: ../calendar/backends/weather/e-cal-backend-weather.c:140
+#, fuzzy
+msgid "Could not retrieve weather data"
+msgstr "無法寫入資料:%s"
+
+# mail/mail-format.c:756
+# mail/message-list.c:1082
+#: ../calendar/backends/weather/e-cal-backend-weather.c:194
+#, fuzzy
+msgid "Fair"
+msgstr "法洛"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:195
+msgid "Snow showers"
+msgstr "陣雪"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:196
+msgid "Snow"
+msgstr "下雪"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:197
+#, fuzzy
+msgid "Partly cloudy"
+msgstr "局部有漏斗雲"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:198
+msgid "Smoke"
+msgstr "煙"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:199
+#, fuzzy
+msgid "Thunderstorms"
+msgstr "雷暴"
+
+# addressbook/printing/e-contact-print.glade.h:4
+#: ../calendar/backends/weather/e-cal-backend-weather.c:200
+#, fuzzy
+msgid "Cloudy"
+msgstr "科第"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:201
+msgid "Drizzle"
+msgstr "毛毛雨"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+# calendar/gui/event-editor.c:481
+#: ../calendar/backends/weather/e-cal-backend-weather.c:202
+#, fuzzy
+msgid "Sunny"
+msgstr "星期日"
+
+# calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/backends/weather/e-cal-backend-weather.c:203
+msgid "Dust"
+msgstr "微塵"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: ../calendar/backends/weather/e-cal-backend-weather.c:204
+msgid "Clear"
+msgstr "清除"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:205
+msgid "Mostly cloudy"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:206
+#, fuzzy
+msgid "Windy"
+msgstr "文克"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:207
+msgid "Rain showers"
+msgstr "陣雨"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:208
+#, fuzzy
+msgid "Foggy"
+msgstr "霧"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:209
+msgid "Rain/snow mixed"
+msgstr ""
+
+# mail/message-list.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:210
+#, fuzzy
+msgid "Sleet"
+msgstr "Seeb"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:211
+msgid "Very hot/humid"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:212
+msgid "Blizzard"
+msgstr ""
+
+# ui/evolution-task-editor-dialog.xml.h:24
+#: ../calendar/backends/weather/e-cal-backend-weather.c:213
+msgid "Freezing rain"
+msgstr "凍雨"
+
+# addressbook/printing/e-contact-print.glade.h:11
+#: ../calendar/backends/weather/e-cal-backend-weather.c:214
+msgid "Haze"
+msgstr "霾"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:215
+#, fuzzy
+msgid "Blowing snow"
+msgstr "吹降雪"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:216
+msgid "Freezing drizzle"
+msgstr "凍毛毛雨"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:217
+msgid "Very cold/wind chill"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: ../calendar/backends/weather/e-cal-backend-weather.c:218
+msgid "Rain"
+msgstr "下雨"
+
+# ui/evolution-event-editor.xml.h:9
+# ui/evolution-task-editor-dialog.xml.h:10
+#: ../calendar/backends/weather/e-cal-backend-weather.c:228
+#: ../calendar/backends/weather/e-cal-backend-weather.c:236
+#: ../calendar/backends/weather/e-cal-backend-weather.c:238
+#: ../calendar/backends/weather/e-cal-backend-weather.c:245
+#, fuzzy
+msgid "Weather: Sunny"
+msgstr "天氣設定"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: ../calendar/backends/weather/e-cal-backend-weather.c:229
+#: ../calendar/backends/weather/e-cal-backend-weather.c:230
+#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#, fuzzy
+msgid "Weather: Snow"
+msgstr "天氣"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:231
+msgid "Weather: Partly Cloudy"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: ../calendar/backends/weather/e-cal-backend-weather.c:232
+#: ../calendar/backends/weather/e-cal-backend-weather.c:237
+#: ../calendar/backends/weather/e-cal-backend-weather.c:242
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#, fuzzy
+msgid "Weather: Fog"
+msgstr "天氣"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:233
+#, fuzzy
+msgid "Weather: Thunderstorms"
+msgstr "雷暴"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: ../calendar/backends/weather/e-cal-backend-weather.c:234
+#: ../calendar/backends/weather/e-cal-backend-weather.c:239
+#, fuzzy
+msgid "Weather: Cloudy"
+msgstr "天氣"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: ../calendar/backends/weather/e-cal-backend-weather.c:235
+#: ../calendar/backends/weather/e-cal-backend-weather.c:241
+#: ../calendar/backends/weather/e-cal-backend-weather.c:243
+#: ../calendar/backends/weather/e-cal-backend-weather.c:244
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#, fuzzy
+msgid "Weather: Rain"
+msgstr "天氣"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:327
+#, c-format
+msgid "%.1f°C - %s"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:329
+#, c-format
+msgid "%.1f°F - %s"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:332
+#, c-format
+msgid "%.1f/%.1f°C - %s"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:334
+#, c-format
+msgid "%.1f/%.1f°F - %s"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:340
+#, fuzzy, c-format
+msgid "%d%% chance of precipitation\n"
+msgstr "小塊的降水"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:347
+#, c-format
+msgid "%.1fcm snow\n"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:349
+#, fuzzy, c-format
+msgid "%.1fin snow\n"
+msgstr "漂雪"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:352
+#, c-format
+msgid "%.1f-%.1fcm snow\n"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:354
+#, c-format
+msgid "%.1f-%.1fin snow\n"
+msgstr ""
+
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/libecal/e-cal-component.c:1299
+#: ../calendar/libecal/e-cal-component.c:1314
 msgid "Untitled appointment"
 msgstr "未命名的約會"
 
 # calendar/gui/print.c:300
-#: calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "1st"
 msgstr "1日"
 
 # calendar/gui/print.c:300
-#: calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "2nd"
 msgstr "2日"
 
 # calendar/gui/print.c:300
-#: calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "3rd"
 msgstr "3日"
 
 # calendar/gui/print.c:300
-#: calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "4th"
 msgstr "4日"
 
 # calendar/gui/print.c:300
-#: calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4018
 msgid "5th"
 msgstr "5日"
 
 # calendar/gui/print.c:301
-#: calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4019
 msgid "6th"
 msgstr "6日"
 
 # calendar/gui/print.c:301
-#: calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4020
 msgid "7th"
 msgstr "7日"
 
 # calendar/gui/print.c:301
-#: calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4021
 msgid "8th"
 msgstr "8日"
 
 # calendar/gui/print.c:301
-#: calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4022
 msgid "9th"
 msgstr "9日"
 
 # calendar/gui/print.c:301
-#: calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4023
 msgid "10th"
 msgstr "10日"
 
 # calendar/gui/print.c:302
-#: calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4024
 msgid "11th"
 msgstr "11日"
 
 # calendar/gui/print.c:302
-#: calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4025
 msgid "12th"
 msgstr "12日"
 
 # calendar/gui/print.c:302
-#: calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4026
 msgid "13th"
 msgstr "13日"
 
 # calendar/gui/print.c:302
-#: calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4027
 msgid "14th"
 msgstr "14日"
 
 # calendar/gui/print.c:302
-#: calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4028
 msgid "15th"
 msgstr "15日"
 
 # calendar/gui/print.c:303
-#: calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4029
 msgid "16th"
 msgstr "16日"
 
 # calendar/gui/print.c:303
-#: calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4030
 msgid "17th"
 msgstr "17日"
 
 # calendar/gui/print.c:303
-#: calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4031
 msgid "18th"
 msgstr "18日"
 
 # calendar/gui/print.c:303
-#: calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4032
 msgid "19th"
 msgstr "19日"
 
 # calendar/gui/print.c:303
-#: calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4033
 msgid "20th"
 msgstr "20日"
 
 # calendar/gui/print.c:304
-#: calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4034
 msgid "21st"
 msgstr "21日"
 
 # calendar/gui/print.c:304
-#: calendar/libecal/e-cal-recur.c:4017
+#: ../calendar/libecal/e-cal-recur.c:4035
 msgid "22nd"
 msgstr "22日"
 
 # calendar/gui/print.c:304
-#: calendar/libecal/e-cal-recur.c:4018
+#: ../calendar/libecal/e-cal-recur.c:4036
 msgid "23rd"
 msgstr "23日"
 
 # calendar/gui/print.c:304
-#: calendar/libecal/e-cal-recur.c:4019
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "24th"
 msgstr "24日"
 
 # calendar/gui/print.c:304
-#: calendar/libecal/e-cal-recur.c:4020
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "25th"
 msgstr "25日"
 
 # calendar/gui/print.c:305
-#: calendar/libecal/e-cal-recur.c:4021
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "26th"
 msgstr "26日"
 
 # calendar/gui/print.c:305
-#: calendar/libecal/e-cal-recur.c:4022
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "27th"
 msgstr "27日"
 
 # calendar/gui/print.c:305
-#: calendar/libecal/e-cal-recur.c:4023
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "28th"
 msgstr "28日"
 
 # calendar/gui/print.c:305
-#: calendar/libecal/e-cal-recur.c:4024
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "29th"
 msgstr "29日"
 
 # calendar/gui/print.c:305
-#: calendar/libecal/e-cal-recur.c:4025
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "30th"
 msgstr "30日"
 
 # calendar/gui/print.c:306
-#: calendar/libecal/e-cal-recur.c:4026
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "31st"
 msgstr "31日"
 
@@ -1045,7 +1316,7 @@ msgstr "31日"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:10
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
-#: calendar/libecal/e-cal-util.c:569 calendar/libecal/e-cal-util.c:591
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:708
 msgid "High"
 msgstr "高"
 
@@ -1055,7 +1326,7 @@ msgstr "高"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: calendar/libecal/e-cal-util.c:571 calendar/libecal/e-cal-util.c:593
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:710
 msgid "Normal"
 msgstr "普通"
 
@@ -1064,7 +1335,7 @@ msgstr "普通"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:12
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
-#: calendar/libecal/e-cal-util.c:573 calendar/libecal/e-cal-util.c:595
+#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712
 msgid "Low"
 msgstr "低"
 
@@ -1072,85 +1343,85 @@ msgstr "低"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. An empty string is the same as 'None'.
-#: calendar/libecal/e-cal-util.c:589
+#: ../calendar/libecal/e-cal-util.c:706
 msgid "Undefined"
 msgstr "未指定"
 
 # camel/camel-smime-context.c:194
 # Novell Translation
 #. actually ask the client for authentication
-#: calendar/libecal/e-cal.c:1590
+#: ../calendar/libecal/e-cal.c:1590 ../libedataserverui/e-book-auth-util.c:192
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: calendar/libecal/e-cal.c:4532
+#: ../calendar/libecal/e-cal.c:4822
 msgid "Invalid argument"
 msgstr "無效的參數"
 
 # Novell Translation
-#: calendar/libecal/e-cal.c:4534
+#: ../calendar/libecal/e-cal.c:4824
 msgid "Backend is busy"
 msgstr "後端忙碌中"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
 # Novell Translation
-#: calendar/libecal/e-cal.c:4536
+#: ../calendar/libecal/e-cal.c:4826
 msgid "Repository is offline"
 msgstr "容器已離線"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
 # Novell Translation
-#: calendar/libecal/e-cal.c:4538
+#: ../calendar/libecal/e-cal.c:4828
 msgid "No such calendar"
 msgstr "無此行事曆"
 
 # Novell Translation
-#: calendar/libecal/e-cal.c:4540 servers/groupwise/e-gw-connection.c:158
+#: ../calendar/libecal/e-cal.c:4830 ../servers/groupwise/e-gw-connection.c:166
 msgid "Object not found"
 msgstr "未發現物件"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
 # Novell Translation
-#: calendar/libecal/e-cal.c:4542 servers/groupwise/e-gw-connection.c:154
+#: ../calendar/libecal/e-cal.c:4832 ../servers/groupwise/e-gw-connection.c:160
 msgid "Invalid object"
 msgstr "無效的物件"
 
 # addressbook/conduit/address-conduit.c:214
 # Novell Translation
-#: calendar/libecal/e-cal.c:4544
+#: ../calendar/libecal/e-cal.c:4834
 msgid "URI not loaded"
 msgstr "URI 未載入"
 
 # Novell Translation
-#: calendar/libecal/e-cal.c:4546
+#: ../calendar/libecal/e-cal.c:4836
 msgid "URI already loaded"
 msgstr "URI 已載入"
 
 # shell/e-storage.c:475
-#: calendar/libecal/e-cal.c:4548
+#: ../calendar/libecal/e-cal.c:4838
 msgid "Permission denied"
 msgstr "權限不足"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: calendar/libecal/e-cal.c:4550 servers/groupwise/e-gw-connection.c:160
+#: ../calendar/libecal/e-cal.c:4840 ../servers/groupwise/e-gw-connection.c:168
 #, fuzzy
 msgid "Unknown User"
 msgstr "不明的錯誤"
 
 # Novell Translation
-#: calendar/libecal/e-cal.c:4552
+#: ../calendar/libecal/e-cal.c:4842
 msgid "Object ID already exists"
 msgstr "物件 ID 已存在"
 
 # shell/e-storage.c:477
-#: calendar/libecal/e-cal.c:4554
+#: ../calendar/libecal/e-cal.c:4844
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
@@ -1159,121 +1430,122 @@ msgstr "通訊協定不支援"
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
 # Novell Translation
-#: calendar/libecal/e-cal.c:4556
+#: ../calendar/libecal/e-cal.c:4846
 msgid "Operation has been cancelled"
 msgstr "操作已取消"
 
 # calendar/gui/e-itip-control.c:883
 # Novell Translation
-#: calendar/libecal/e-cal.c:4558
+#: ../calendar/libecal/e-cal.c:4848
 msgid "Could not cancel operation"
 msgstr "無法取消操作"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: calendar/libecal/e-cal.c:4562
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: ../calendar/libecal/e-cal.c:4852
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "要求驗證"
 
 # Novell Translation
-#: calendar/libecal/e-cal.c:4564
+#: ../calendar/libecal/e-cal.c:4854
 msgid "A CORBA exception has occurred"
 msgstr "發生 CORBA 例外"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: calendar/libecal/e-cal.c:4566 camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-command.c:401
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
-#: camel/providers/pop3/camel-pop3-store.c:548
-#: servers/groupwise/e-gw-connection.c:166
+#: ../calendar/libecal/e-cal.c:4856
+#: ../camel/providers/imap/camel-imap-command.c:304
+#: ../camel/providers/imap/camel-imap-command.c:404
+#: ../camel/providers/imap4/camel-imap4-store.c:376
+#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:542
+#: ../camel/providers/pop3/camel-pop3-store.c:548
+#: ../servers/groupwise/e-gw-connection.c:174
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 # shell/e-storage.c:459
-#: calendar/libecal/e-cal.c:4568
+#: ../calendar/libecal/e-cal.c:4858
 msgid "No error"
 msgstr "沒有錯誤"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:50
-#: calendar/libedata-cal/e-cal-backend-sexp.c:529
-#: calendar/libedata-cal/e-cal-backend-sexp.c:722
-#: calendar/libedata-cal/e-cal-backend-sexp.c:749
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:65
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:576
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:769
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:796
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "「%s」不需要引數"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:75
-#: calendar/libedata-cal/e-cal-backend-sexp.c:169
-#: calendar/libedata-cal/e-cal-backend-sexp.c:203
-#: calendar/libedata-cal/e-cal-backend-sexp.c:239
-#: calendar/libedata-cal/e-cal-backend-sexp.c:787
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:98
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:208
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:250
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:286
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:834
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "「%s」需要一個引數"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:81
-#: calendar/libedata-cal/e-cal-backend-sexp.c:88
-#: calendar/libedata-cal/e-cal-backend-sexp.c:245
-#: calendar/libedata-cal/e-cal-backend-sexp.c:473
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:104
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:111
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:520
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "「%s」的第一個引數必須為字串"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:96
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "「%s」的第一個引數必須為 ISO 8601 日期/時間字串"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:127
-#: calendar/libedata-cal/e-cal-backend-sexp.c:312
-#: calendar/libedata-cal/e-cal-backend-sexp.c:467
-#: calendar/libedata-cal/e-cal-backend-sexp.c:561
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:158
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:359
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:514
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:608
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "「%s」需要兩個引數"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:133
-#: calendar/libedata-cal/e-cal-backend-sexp.c:175
-#: calendar/libedata-cal/e-cal-backend-sexp.c:209
-#: calendar/libedata-cal/e-cal-backend-sexp.c:318
-#: calendar/libedata-cal/e-cal-backend-sexp.c:567
-#: calendar/libedata-cal/e-cal-backend-sexp.c:793
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:164
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:214
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:365
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:614
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:840
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "「%s」的第一個引數必須為 time_t"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:141
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:172
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "「%s」的第二個引數必須為整數"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:326
-#: calendar/libedata-cal/e-cal-backend-sexp.c:575
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:373
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:622
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "「%s」的第二個引數必須為 time_t"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:481
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:528
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "「%s」的第二個引數必須為字串"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:501
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:548
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1282,13 +1554,13 @@ msgstr ""
 "「%s」的第一個引數必須為「任何」、「摘要」之一,或「描述」、「位置」其中之一"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:624
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:671
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "「%s」需要至少一個引數"
 
 # Novell Translation
-#: calendar/libedata-cal/e-cal-backend-sexp.c:638
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:685
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1296,71 +1568,71 @@ msgid ""
 msgstr "「%s」的所有引數必須為字串,或只有一個引數為布林偽值 (#f)"
 
 # camel/camel-cipher-context.c:171
-#: camel/camel-cipher-context.c:103
+#: ../camel/camel-cipher-context.c:103
 msgid "Signing is not supported by this cipher"
 msgstr "此加密器不支援加簽"
 
 # mail/mail-ops.c:603
 # Novell Translation
-#: camel/camel-cipher-context.c:129
+#: ../camel/camel-cipher-context.c:129
 msgid "Signing message"
 msgstr "正在簽署訊息"
 
 # camel/camel-cipher-context.c:251
-#: camel/camel-cipher-context.c:146
+#: ../camel/camel-cipher-context.c:146
 msgid "Verifying is not supported by this cipher"
 msgstr "此加密器不支援驗證加簽"
 
 # mail/mail-ops.c:603
 # Novell Translation
-#: camel/camel-cipher-context.c:172
+#: ../camel/camel-cipher-context.c:172
 msgid "Verifying message"
 msgstr "正在確認訊息"
 
 # camel/camel-cipher-context.c:294
-#: camel/camel-cipher-context.c:190
+#: ../camel/camel-cipher-context.c:190
 msgid "Encryption is not supported by this cipher"
 msgstr "此加密器不支援加密"
 
 # mail/mail-ops.c:603
 # Novell Translation
-#: camel/camel-cipher-context.c:216
+#: ../camel/camel-cipher-context.c:216
 msgid "Encrypting message"
 msgstr "正在加密訊息"
 
 # camel/camel-cipher-context.c:336
-#: camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:233
 msgid "Decryption is not supported by this cipher"
 msgstr "此加密器不支援解密"
 
 # mail/mail-ops.c:603
 # Novell Translation
-#: camel/camel-cipher-context.c:255
+#: ../camel/camel-cipher-context.c:255
 msgid "Decrypting message"
 msgstr "正在解密訊息"
 
 # camel/camel-cipher-context.c:336
-#: camel/camel-cipher-context.c:272
+#: ../camel/camel-cipher-context.c:272
 msgid "You may not import keys with this cipher"
 msgstr "您不能匯入此加密器的金鑰"
 
 # camel/camel-cipher-context.c:336
-#: camel/camel-cipher-context.c:302
+#: ../camel/camel-cipher-context.c:302
 msgid "You may not export keys with this cipher"
 msgstr "您不能匯出此加密器的金鑰"
 
 # mail/mail-ops.c:1728
-#: camel/camel-data-cache.c:134
+#: ../camel/camel-data-cache.c:134
 msgid "Unable to create cache path"
 msgstr "無法建立快取路徑"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: camel/camel-data-cache.c:376
+#: ../camel/camel-data-cache.c:376
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "無法移除快取項目: %s: %s"
 
-#: camel/camel-disco-diary.c:195
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1371,7 +1643,7 @@ msgstr ""
 "接下來在此伺服器上的操作,在您重新連線到網路時\n"
 "將不會重播。"
 
-#: camel/camel-disco-diary.c:258
+#: ../camel/camel-disco-diary.c:258
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -1382,36 +1654,35 @@ msgstr ""
 "%s\n"
 "這個資料夾內所做的變更將不會重新同步。"
 
-#: camel/camel-disco-diary.c:294
+#: ../camel/camel-disco-diary.c:294
 msgid "Resynchronizing with server"
 msgstr "與伺服器重新同步"
 
 # Novell Translation
-#: camel/camel-disco-folder.c:42 camel/camel-offline-folder.c:50
+#: ../camel/camel-disco-folder.c:42 ../camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
 msgstr "複製資料夾內容至本地用於離線作業"
 
 # Novell Translation
-#: camel/camel-disco-folder.c:104 camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:104 ../camel/camel-offline-folder.c:110
 msgid "Downloading new messages for offline mode"
 msgstr "正在下載新訊息用於離線模式"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: camel/camel-disco-folder.c:467
+#: ../camel/camel-disco-folder.c:467
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "準備資料夾“%s”供離線使用"
 
 # camel/camel-disco-store.c:271
-#: camel/camel-disco-store.c:405
+#: ../camel/camel-disco-store.c:405
 msgid "You must be working online to complete this operation"
 msgstr "您必須於線上工作才能完成此操作"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:512
-#: camel/camel-process.c:48
+#: ../camel/camel-filter-driver.c:701 ../camel/camel-filter-search.c:523
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "建立到“%s”的導管失敗: %s"
@@ -1419,109 +1690,109 @@ msgstr "建立到“%s”的導管失敗: %s"
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
 # Novell Translation
-#: camel/camel-filter-driver.c:713 camel/camel-process.c:90
+#: ../camel/camel-filter-driver.c:745
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "無法建立子代處理 '%s':%s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/camel-filter-driver.c:756
+#: ../camel/camel-filter-driver.c:788
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "無法讀取 %s 的歡迎辭: %s"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
+#: ../camel/camel-filter-driver.c:977 ../camel/camel-filter-driver.c:986
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:866
-#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1075 ../camel/camel-filter-driver.c:1453
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "分析過濾器發生錯誤: %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1429
+#: ../camel/camel-filter-driver.c:1084 ../camel/camel-filter-driver.c:1462
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "執行過濾器發生錯誤: %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: camel/camel-filter-driver.c:1119
+#: ../camel/camel-filter-driver.c:1151
 msgid "Unable to open spool folder"
 msgstr "無法開啟 spool 資料夾"
 
 # camel/camel-filter-driver.c:652
-#: camel/camel-filter-driver.c:1128
+#: ../camel/camel-filter-driver.c:1160
 msgid "Unable to process spool folder"
 msgstr "無法處理 spool 資料夾"
 
 # camel/camel-filter-driver.c:666
-#: camel/camel-filter-driver.c:1143
+#: ../camel/camel-filter-driver.c:1175
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:671
-#: camel/camel-filter-driver.c:1147
+#: ../camel/camel-filter-driver.c:1179
 msgid "Cannot open message"
 msgstr "不能開啟郵件"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
+#: ../camel/camel-filter-driver.c:1180 ../camel/camel-filter-driver.c:1192
 #, c-format
 msgid "Failed on message %d"
 msgstr "在第 %d 封郵件發生錯誤"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
+#: ../camel/camel-filter-driver.c:1206 ../camel/camel-filter-driver.c:1297
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: camel/camel-filter-driver.c:1178 camel/camel-filter-driver.c:1270
+#: ../camel/camel-filter-driver.c:1210 ../camel/camel-filter-driver.c:1302
 msgid "Complete"
 msgstr "完成"
 
 # camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:1235
+#: ../camel/camel-filter-driver.c:1267
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在接收第 %d / %d 封郵件"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: camel/camel-filter-driver.c:1250
+#: ../camel/camel-filter-driver.c:1282
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-search.c:135
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "取回郵件失敗。"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/camel-filter-search.c:385
+#: ../camel/camel-filter-search.c:396
 msgid "Invalid arguments to (system-flag)"
 msgstr "無效的參數給 (system-flag)"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/camel-filter-search.c:400
+#: ../camel/camel-filter-search.c:411
 msgid "Invalid arguments to (user-tag)"
 msgstr "無效的參數給 (user-tag)"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-search.c:548
+#: ../camel/camel-filter-search.c:559
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "建立子程序“%s”失敗: %s"
@@ -1529,13 +1800,13 @@ msgstr "建立子程序“%s”失敗: %s"
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
+#: ../camel/camel-filter-search.c:682 ../camel/camel-filter-search.c:690
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤: %s: %s"
 
 # camel/camel-folder-search.c:328
-#: camel/camel-folder-search.c:357 camel/camel-folder-search.c:478
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:478
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1545,7 +1816,7 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: camel/camel-folder-search.c:367 camel/camel-folder-search.c:488
+#: ../camel/camel-folder-search.c:367 ../camel/camel-folder-search.c:488
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1556,83 +1827,83 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: camel/camel-folder-search.c:674 camel/camel-folder-search.c:707
+#: ../camel/camel-folder-search.c:674 ../camel/camel-folder-search.c:707
 msgid "(match-all) requires a single bool result"
 msgstr "(符合-全部) 需要單一布林值結果"
 
 # Novell Translation
-#: camel/camel-folder-search.c:757
+#: ../camel/camel-folder-search.c:757
 msgid "(match-threads) not allowed inside match-all"
 msgstr "(符合線串) 不允許放在 match-all 裏面"
 
 # Novell Translation
-#: camel/camel-folder-search.c:760 camel/camel-folder-search.c:764
+#: ../camel/camel-folder-search.c:760 ../camel/camel-folder-search.c:764
 msgid "(match-threads) requires a match type string"
 msgstr "(符合線串) 需要相符類型字串"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
 # Novell Translation
-#: camel/camel-folder-search.c:786
+#: ../camel/camel-folder-search.c:786
 msgid "(match-threads) expects an array result"
 msgstr "(符合線串) 期望陣列結果"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
 # Novell Translation
-#: camel/camel-folder-search.c:792
+#: ../camel/camel-folder-search.c:792
 msgid "(match-threads) requires the folder set"
 msgstr "(符合線串) 需要資料夾設定"
 
 # camel/camel-folder-search.c:559
-#: camel/camel-folder-search.c:881
+#: ../camel/camel-folder-search.c:881
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "在不明的檔頭內執行查詢:%s"
 
-#: camel/camel-folder.c:610
+#: ../camel/camel-folder.c:620
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "不支援的操作:添加郵件: %s"
 
 # camel/camel-folder-search.c:338
-#: camel/camel-folder.c:1200
+#: ../camel/camel-folder.c:1242
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支援的操作:以詞句搜尋: %s"
 
-#: camel/camel-folder.c:1240
+#: ../camel/camel-folder.c:1283
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "不支援的操作:以 uids 搜尋: %s"
 
 # mail/mail-ops.c:898
-#: camel/camel-folder.c:1352
+#: ../camel/camel-folder.c:1399
 msgid "Moving messages"
 msgstr "移動郵件"
 
 # mail/mail-ops.c:898
-#: camel/camel-folder.c:1352
+#: ../camel/camel-folder.c:1399
 msgid "Copying messages"
 msgstr "複製郵件"
 
 # widgets/misc/e-messagebox.c:159
 # Novell Translation
-#: camel/camel-folder.c:1601
+#: ../camel/camel-folder.c:1653
 msgid "Learning junk"
 msgstr "了解垃圾郵件"
 
 # Novell Translation
-#: camel/camel-folder.c:1618
+#: ../camel/camel-folder.c:1670
 msgid "Learning non-junk"
 msgstr "了解非垃圾郵件"
 
 # mail/mail-ops.c:1565
-#: camel/camel-folder.c:1637
+#: ../camel/camel-folder.c:1689
 msgid "Filtering new message(s)"
 msgstr "取回 %d 封郵件"
 
-#: camel/camel-gpg-context.c:735
+#: ../camel/camel-gpg-context.c:734
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1643,15 +1914,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:749
+#: ../camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: camel/camel-gpg-context.c:773
+#: ../camel/camel-gpg-context.c:772
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg passphrase 要求時失敗。"
 
-#: camel/camel-gpg-context.c:787
+#: ../camel/camel-gpg-context.c:786
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1661,112 +1932,92 @@ msgstr ""
 "“%s”"
 
 # mail/mail-send-recv.c:471
-#: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
-#: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1701 camel/providers/nntp/camel-nntp-store.c:1274
+#: ../camel/camel-gpg-context.c:803 ../camel/camel-gpg-context.c:1000
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: camel/camel-gpg-context.c:822
+#: ../camel/camel-gpg-context.c:821
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解鎖私密金鑰時失敗:輸入了 3 次錯誤的 passhprase 。"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:827
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應: %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:879
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "不能加密郵件:沒有提供有效的收件者。"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1157
-#, fuzzy, c-format
-msgid ""
-"Failed to GPG %s: %s\n"
-"\n"
-"%s"
-msgstr ""
-"無法 GPG %s: %s\n"
-"\n"
-"%.*s"
-
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1162
+#. always called on an i/o error
+#: ../camel/camel-gpg-context.c:1138 ../camel/camel-gpg-context.c:1262
+#: ../camel/camel-gpg-context.c:1687 ../camel/camel-gpg-context.c:1732
 #, c-format
-msgid "Failed to GPG %s: %s\n"
-msgstr "無法 GPG %s: %s\n"
+msgid "Failed to execute gpg: %s"
+msgstr "執行 gpg 失敗: %s"
 
 # mail/mail-ops.c:1872
 # Novell Translation
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:389
+#: ../camel/camel-gpg-context.c:1230 ../camel/camel-smime-context.c:389
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "無法產生簽名資料:%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1766
-#: camel/camel-gpg-context.c:1817
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "執行 gpg 失敗: %s"
-
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
-#: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1718
-#: camel/camel-gpg-context.c:1788 camel/camel-gpg-context.c:1839
+#: ../camel/camel-gpg-context.c:1277 ../camel/camel-gpg-context.c:1437
+#: ../camel/camel-gpg-context.c:1519 ../camel/camel-gpg-context.c:1534
+#: ../camel/camel-gpg-context.c:1623 ../camel/camel-gpg-context.c:1638
+#: ../camel/camel-gpg-context.c:1703 ../camel/camel-gpg-context.c:1748
 msgid "Failed to execute gpg."
 msgstr "執行 gpg 失敗。"
 
-#: camel/camel-gpg-context.c:1350
+#: ../camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "這是數位加簽的郵件"
 
 # camel/camel-pgp-context.c:890
 # Novell Translation
-#: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:692
-#: camel/camel-smime-context.c:703 camel/camel-smime-context.c:710
+#: ../camel/camel-gpg-context.c:1377 ../camel/camel-gpg-context.c:1383
+#: ../camel/camel-gpg-context.c:1389 ../camel/camel-smime-context.c:692
+#: ../camel/camel-smime-context.c:703 ../camel/camel-smime-context.c:710
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "無法確認訊息簽名:錯誤的訊息格式"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1477
+#: ../camel/camel-gpg-context.c:1423
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "不能驗證此郵件的簽章:無法建立暫存檔案:%s"
 
 # mail/mail-ops.c:1872
 # Novell Translation
-#: camel/camel-gpg-context.c:1565
+#: ../camel/camel-gpg-context.c:1502
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "無法產生加密資料:%s"
 
 # Novell Translation
-#: camel/camel-gpg-context.c:1623
+#: ../camel/camel-gpg-context.c:1552
 msgid "This is a digitally encrypted message part"
 msgstr "這是數位化加密訊息部份"
 
-#: camel/camel-gpg-context.c:1674
+#: ../camel/camel-gpg-context.c:1603
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 組件時失敗:通訊協定錯誤"
 
 # Novell Translation
-#: camel/camel-gpg-context.c:1725 camel/camel-smime-context.c:966
+#: ../camel/camel-gpg-context.c:1645 ../camel/camel-smime-context.c:966
 msgid "Encrypted content"
 msgstr "加密內容"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/camel-gpg-context.c:1744
+#: ../camel/camel-gpg-context.c:1664
 msgid "Unable to parse message content"
 msgstr "無法從編輯器取得郵件"
 
@@ -1774,37 +2025,37 @@ msgstr "無法從編輯器取得郵件"
 # calendar/gui/event-editor.c:1601
 # calendar/gui/event-editor.c:1628
 # camel/providers/smtp/camel-smtp-transport.c:221
-#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1465
-#: camel/providers/imap4/camel-imap4-engine.c:1504
-#: camel/providers/imap4/camel-imap4-engine.c:1549
-#: camel/providers/imap4/camel-imap4-engine.c:1605
-#: camel/providers/imap4/camel-imap4-store.c:1250
-#: camel/providers/imap4/camel-imap4-utils.c:575
-#: camel/providers/smtp/camel-smtp-transport.c:163
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/camel-gpg-context.c:1688 ../camel/camel-gpg-context.c:1733
+#: ../camel/camel-tcp-stream-openssl.c:631
+#: ../camel/providers/imap4/camel-imap4-engine.c:1550
+#: ../camel/providers/imap4/camel-imap4-engine.c:1589
+#: ../camel/providers/imap4/camel-imap4-engine.c:1634
+#: ../camel/providers/imap4/camel-imap4-engine.c:1690
+#: ../camel/providers/imap4/camel-imap4-store.c:1434
+#: ../camel/providers/imap4/camel-imap4-utils.c:575
+#: ../camel/providers/smtp/camel-smtp-transport.c:163
+#: ../camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "不明"
 
 # camel/camel-movemail.c:306
-#: camel/camel-lock-client.c:100
+#: ../camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "不能建立鎖定 helper 導管:%s"
 
-#: camel/camel-lock-client.c:113
+#: ../camel/camel-lock-client.c:113
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "不能分叉鎖定 helper : %s"
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: ../camel/camel-lock-client.c:191 ../camel/camel-lock-client.c:214
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "無法鎖定“%s”: lock-helper 協定錯誤"
 
 # camel/camel-movemail.c:318
-#: camel/camel-lock-client.c:204
+#: ../camel/camel-lock-client.c:204
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "無法鎖定“%s”"
@@ -1813,97 +2064,97 @@ msgstr "無法鎖定“%s”"
 # camel/camel-lock.c:111
 # camel/camel-movemail.c:138
 # camel/camel-movemail.c:185
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: ../camel/camel-lock.c:92 ../camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "無法建立用於 %s: %s 的鎖定檔案"
 
 # camel/camel-lock.c:151
 # camel/camel-movemail.c:219
-#: camel/camel-lock.c:154
+#: ../camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "嘗試取得 %s 上的鎖定檔案逾時。請稍後再試一次。"
 
 # camel/camel-lock.c:201
-#: camel/camel-lock.c:209
+#: ../camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "使用 fcntl(2) 取得鎖失敗: %s"
 
 # camel/camel-lock.c:255
-#: camel/camel-lock.c:272
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "使用 flock(2) 取得鎖失敗: %s"
 
 # camel/camel-movemail.c:101
-#: camel/camel-movemail.c:104
+#: ../camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "無法檢查郵件檔案 %s:%s"
 
 # camel/camel-movemail.c:148
-#: camel/camel-movemail.c:117
+#: ../camel/camel-movemail.c:117
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "無法開啟郵件檔案 %s:%s"
 
 # camel/camel-movemail.c:158
-#: camel/camel-movemail.c:125
+#: ../camel/camel-movemail.c:125
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "無法開啟暫存郵件檔案 %s:%s"
 
 # camel/camel-movemail.c:274
-#: camel/camel-movemail.c:154
+#: ../camel/camel-movemail.c:154
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s:%s"
 
 # camel/camel-movemail.c:306
-#: camel/camel-movemail.c:184
+#: ../camel/camel-movemail.c:184
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "無法建立導管:%s"
 
 # camel/camel-movemail.c:318
-#: camel/camel-movemail.c:196
+#: ../camel/camel-movemail.c:196
 #, c-format
 msgid "Could not fork: %s"
 msgstr "無法另外執行一個行程:%s"
 
 # camel/camel-movemail.c:356
-#: camel/camel-movemail.c:234
+#: ../camel/camel-movemail.c:234
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail 程式失敗:%s"
 
 # camel/camel-movemail.c:357
-#: camel/camel-movemail.c:235
+#: ../camel/camel-movemail.c:235
 msgid "(Unknown error)"
 msgstr "(不明的錯誤)"
 
 # camel/camel-movemail.c:245
-#: camel/camel-movemail.c:258
+#: ../camel/camel-movemail.c:258
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "讀取郵件檔案時發生錯誤:%s"
 
 # camel/camel-movemail.c:256
-#: camel/camel-movemail.c:269
+#: ../camel/camel-movemail.c:269
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "寫入郵件暫存檔案時發生錯誤:%s"
 
 # camel/camel-movemail.c:587
-#: camel/camel-movemail.c:462 camel/camel-movemail.c:529
+#: ../camel/camel-movemail.c:462 ../camel/camel-movemail.c:529
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "複製郵件暫存檔案時發生錯誤:%s"
 
 # shell/e-storage.c:467
-#: camel/camel-multipart-signed.c:586
+#: ../camel/camel-multipart-signed.c:598
 msgid "parse error"
 msgstr "解析錯誤"
 
@@ -1913,55 +2164,56 @@ msgstr "解析錯誤"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: camel/camel-net-utils.c:446 camel/camel-net-utils.c:608
-#: camel/camel-net-utils.c:739 camel/providers/pop3/camel-pop3-store.c:448
-#: camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/camel-net-utils.c:446 ../camel/camel-net-utils.c:608
+#: ../camel/camel-net-utils.c:739
+#: ../camel/providers/pop3/camel-pop3-store.c:448
+#: ../camel/providers/pop3/camel-pop3-store.c:529
 msgid "Cancelled"
 msgstr "已取消"
 
 # camel/camel-filter-driver.c:671
 # Novell Translation
-#: camel/camel-net-utils.c:465
+#: ../camel/camel-net-utils.c:465
 #, fuzzy
 msgid "cannot create thread"
 msgstr "無法建立 CMS 訊息"
 
 # camel/camel-service.c:548
-#: camel/camel-net-utils.c:612
+#: ../camel/camel-net-utils.c:612
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析:%s"
 
 # camel/camel-service.c:600
-#: camel/camel-net-utils.c:634
+#: ../camel/camel-net-utils.c:634
 #, fuzzy
 msgid "Host lookup failed"
 msgstr "搜尋主機失敗:找不到主機"
 
 # camel/camel-service.c:600
-#: camel/camel-net-utils.c:636
+#: ../camel/camel-net-utils.c:636
 #, fuzzy, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "搜尋主機失敗: %s :找不到主機"
 
 # camel/camel-service.c:548
-#: camel/camel-net-utils.c:743
+#: ../camel/camel-net-utils.c:743
 msgid "Resolving address"
 msgstr "解析位址"
 
-#: camel/camel-net-utils.c:763
+#: ../camel/camel-net-utils.c:763
 msgid "Name lookup failed"
 msgstr ""
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/camel-net-utils.c:766
+#: ../camel/camel-net-utils.c:766
 #, fuzzy, c-format
 msgid "Name lookup failed: %s"
 msgstr "NNTP 指令失敗: %s"
 
 # mail/mail-ops.c:898 
 # Novell Translation
-#: camel/camel-offline-folder.c:250
+#: ../camel/camel-offline-folder.c:253
 #, fuzzy, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "正在複製訊息至資料夾 %s"
@@ -1969,64 +2221,64 @@ msgstr "正在複製訊息至資料夾 %s"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/camel-offline-journal.c:140 camel/camel-offline-journal.c:163
+#: ../camel/camel-offline-journal.c:165 ../camel/camel-offline-journal.c:188
 #, fuzzy, c-format
 msgid "Cannot write offline journal for folder `%s': %s"
 msgstr "無法建立資料夾 `%s':%s"
 
 # camel/camel-session.c:68
-#: camel/camel-provider.c:59
+#: ../camel/camel-provider.c:59
 msgid "Virtual folder email provider"
 msgstr "虛擬資料夾電子郵件供應商"
 
 # camel/camel-session.c:70
-#: camel/camel-provider.c:61
+#: ../camel/camel-provider.c:61
 msgid "For reading mail as a query of another set of folders"
 msgstr "使讀取郵件如同查詢其他資料夾"
 
 # camel/camel-provider.c:131
-#: camel/camel-provider.c:185
+#: ../camel/camel-provider.c:185
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "無法載入模組 %s: 此系統不支援載入模組。"
 
 # camel/camel-provider.c:140
-#: camel/camel-provider.c:194
+#: ../camel/camel-provider.c:194
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "無法載入 %s:%s"
 
 # camel/camel-provider.c:148
-#: camel/camel-provider.c:202
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "無法載入 %s:模組內沒有初始碼。"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: camel/camel-provider.c:374 camel/camel-session.c:161
+#: ../camel/camel-provider.c:374 ../camel/camel-session.c:161
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "沒有通訊協定“%s”的提供者"
 
 # camel/camel-sasl-anonymous.c:33
-#: camel/camel-sasl-anonymous.c:35
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "匿名"
 
 # camel/camel-sasl-anonymous.c:35
-#: camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "這個選項將會使用匿名登入至伺服器。"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:88
+#: ../camel/camel-sasl-anonymous.c:122 ../camel/camel-sasl-plain.c:88
 msgid "Authentication failed."
 msgstr "驗証失敗。"
 
 # camel/camel-sasl-anonymous.c:119
-#: camel/camel-sasl-anonymous.c:121
+#: ../camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2036,7 +2288,7 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-anonymous.c:131
-#: camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2046,7 +2298,7 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-anonymous.c:143
-#: camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:155
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2056,12 +2308,12 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-cram-md5.c:35
-#: camel/camel-sasl-cram-md5.c:36
+#: ../camel/camel-sasl-cram-md5.c:36
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 # camel/camel-sasl-cram-md5.c:37
-#: camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:38
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2070,12 +2322,12 @@ msgstr ""
 "務。"
 
 # camel/camel-sasl-digest-md5.c:43
-#: camel/camel-sasl-digest-md5.c:49
+#: ../camel/camel-sasl-digest-md5.c:49
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 # camel/camel-sasl-digest-md5.c:45
-#: camel/camel-sasl-digest-md5.c:51
+#: ../camel/camel-sasl-digest-md5.c:51
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2084,66 +2336,71 @@ msgstr ""
 "務。"
 
 # camel/camel-sasl-digest-md5.c:810
-#: camel/camel-sasl-digest-md5.c:814
-msgid "Server challenge too long (>2048 octets)\n"
+#: ../camel/camel-sasl-digest-md5.c:819
+#, fuzzy
+msgid "Server challenge too long (>2048 octets)"
 msgstr "伺服器查問過長(>2048 位元 )\n"
 
 # camel/camel-sasl-digest-md5.c:819
-#: camel/camel-sasl-digest-md5.c:823
+#: ../camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge invalid\n"
 msgstr "伺服器查問無效\n"
 
 # camel/camel-sasl-digest-md5.c:825
-#: camel/camel-sasl-digest-md5.c:829
-msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+#: ../camel/camel-sasl-digest-md5.c:834
+#, fuzzy
+msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "伺服器查問包含無效的 “Quality of Protection”代符\n"
 
 # camel/camel-sasl-digest-md5.c:847
-#: camel/camel-sasl-digest-md5.c:859
-msgid "Server response did not contain authorization data\n"
+#: ../camel/camel-sasl-digest-md5.c:864
+#, fuzzy
+msgid "Server response did not contain authorization data"
 msgstr "伺服器回覆並未包含許可資料\n"
 
 # camel/camel-sasl-digest-md5.c:865
-#: camel/camel-sasl-digest-md5.c:877
-msgid "Server response contained incomplete authorization data\n"
+#: ../camel/camel-sasl-digest-md5.c:882
+#, fuzzy
+msgid "Server response contained incomplete authorization data"
 msgstr "伺服器回覆包含不完整的許可資料\n"
 
 # camel/camel-sasl-digest-md5.c:875
-#: camel/camel-sasl-digest-md5.c:887
-msgid "Server response does not match\n"
+#: ../camel/camel-sasl-digest-md5.c:892
+#, fuzzy
+msgid "Server response does not match"
 msgstr "伺服器回覆不符\n"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:57
+#: ../camel/camel-sasl-gssapi.c:57
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
 # camel/camel-sasl-kerberos4.c:42
-#: camel/camel-sasl-gssapi.c:59
+#: ../camel/camel-sasl-gssapi.c:59
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "這個選項將會使用 Kerberos 4 驗證連線至伺服器。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:157
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "提供的證件不支援指定的機制,或者是執行無法辨識。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:162
+#: ../camel/camel-sasl-gssapi.c:162
 msgid "The provided target_name parameter was ill-formed."
 msgstr "提供的 target_name 參數格式錯誤。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:165
+#: ../camel/camel-sasl-gssapi.c:165
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "提供的 target_name 參數包含無效或不支援的名稱類型。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:169
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2151,65 +2408,65 @@ msgstr ""
 "input_token 包含不同的通道,透過  input_chan_bindings,連結至這些指定的參數。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:174
+#: ../camel/camel-sasl-gssapi.c:174
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token 包含無效的簽名,或者無法確認的簽名。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:178
+#: ../camel/camel-sasl-gssapi.c:178
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr "提供的證件不適用於網路位置,或者證件識別指標未參照任何憑證。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:183
+#: ../camel/camel-sasl-gssapi.c:183
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "提供的網路位置識別指標未參照有效的網路位置。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:186
+#: ../camel/camel-sasl-gssapi.c:186
 msgid "The consistency checks performed on the input_token failed."
 msgstr "在 input_token 執行一致性檢查失敗。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:189
 msgid "The consistency checks performed on the credential failed."
 msgstr "在證件執行一致性檢查失敗。"
 
 # Novell Translation
-#: camel/camel-sasl-gssapi.c:192
+#: ../camel/camel-sasl-gssapi.c:192
 msgid "The referenced credentials have expired."
 msgstr "參照的證件已經過期。"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: camel/camel-sasl-gssapi.c:198 camel/camel-sasl-gssapi.c:246
-#: camel/camel-sasl-gssapi.c:282 camel/camel-sasl-gssapi.c:297
-#: camel/camel-sasl-kerberos4.c:226
-#: camel/providers/imap/camel-imap-store.c:1222
+#: ../camel/camel-sasl-gssapi.c:198 ../camel/camel-sasl-gssapi.c:246
+#: ../camel/camel-sasl-gssapi.c:282 ../camel/camel-sasl-gssapi.c:297
+#: ../camel/camel-sasl-kerberos4.c:226
+#: ../camel/providers/imap/camel-imap-store.c:1245
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
 # mail/mail-config.glade.h:1
-#: camel/camel-sasl-gssapi.c:307
+#: ../camel/camel-sasl-gssapi.c:307
 msgid "Unsupported security layer."
 msgstr "不支援的類型"
 
 # camel/camel-sasl-kerberos4.c:40
-#: camel/camel-sasl-kerberos4.c:42
+#: ../camel/camel-sasl-kerberos4.c:42
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
 # camel/camel-sasl-kerberos4.c:42
-#: camel/camel-sasl-kerberos4.c:44
+#: ../camel/camel-sasl-kerberos4.c:44
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "這個選項將會使用 Kerberos 4 驗證連線至伺服器。"
 
 # camel/camel-sasl-kerberos4.c:161
-#: camel/camel-sasl-kerberos4.c:169
+#: ../camel/camel-sasl-kerberos4.c:169
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2219,83 +2476,83 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-login.c:32
-#: camel/camel-sasl-login.c:33
+#: ../camel/camel-sasl-login.c:33
 msgid "Login"
 msgstr "登入"
 
 # camel/camel-sasl-login.c:34
 # camel/camel-sasl-plain.c:34
-#: camel/camel-sasl-login.c:35 camel/camel-sasl-plain.c:35
+#: ../camel/camel-sasl-login.c:35 ../camel/camel-sasl-plain.c:35
 msgid "This option will connect to the server using a simple password."
 msgstr "這個選項將會使用普通的密碼連線至伺服器。"
 
 # camel/camel-sasl-login.c:127
-#: camel/camel-sasl-login.c:128
+#: ../camel/camel-sasl-login.c:128
 msgid "Unknown authentication state."
 msgstr "未知的驗証狀況。"
 
-#: camel/camel-sasl-ntlm.c:32
+#: ../camel/camel-sasl-ntlm.c:32
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 # camel/camel-sasl-kerberos4.c:42
-#: camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:34
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "這個選項將會使用 NTLM / 安全密碼驗證連線至基於 Windows 的伺服器。"
 
-#: camel/camel-sasl-plain.c:33
+#: ../camel/camel-sasl-plain.c:33
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:37
+#: ../camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "POP 先於 SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:39
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "這個選項將會在進行 SMTP 之前允許 POP連線"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: camel/camel-sasl-popb4smtp.c:104
+#: ../camel/camel-sasl-popb4smtp.c:104
 msgid "POP Source URI"
 msgstr "POP 來源 URI"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: ../camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP 先於 SMTP 允許使用未知的傳輸"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: ../camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP 先於 SMTP 允許使用非 POP 來源"
 
 # camel/camel-search-private.c:111
-#: camel/camel-search-private.c:151
+#: ../camel/camel-search-private.c:151
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表示式編譯失敗: %s: %s"
 
 # camel/camel-service.c:154
-#: camel/camel-service.c:272
+#: ../camel/camel-service.c:272
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL“%s”需要 username 元件"
 
 # camel/camel-service.c:162
-#: camel/camel-service.c:276
+#: ../camel/camel-service.c:276
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL“%s”需要 host 元件"
 
 # camel/camel-service.c:170
-#: camel/camel-service.c:280
+#: ../camel/camel-service.c:280
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL“%s”需要 path 元件"
 
 # camel/camel-session.c:479
-#: camel/camel-session.c:283
+#: ../camel/camel-session.c:283
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2306,159 +2563,159 @@ msgstr ""
 
 # camel/camel-smime-context.c:327
 # Novell Translation
-#: camel/camel-smime-context.c:231
+#: ../camel/camel-smime-context.c:231
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "找不到 '%s' 的憑證"
 
 # camel/camel-filter-driver.c:671
 # Novell Translation
-#: camel/camel-smime-context.c:237
+#: ../camel/camel-smime-context.c:237
 msgid "Cannot create CMS message"
 msgstr "無法建立 CMS 訊息"
 
 # Novell Translation
-#: camel/camel-smime-context.c:242
+#: ../camel/camel-smime-context.c:242
 msgid "Cannot create CMS signed data"
 msgstr "無法建立 CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/camel-smime-context.c:248
+#: ../camel/camel-smime-context.c:248
 msgid "Cannot attach CMS signed data"
 msgstr "無法附加 CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/camel-smime-context.c:255
+#: ../camel/camel-smime-context.c:255
 msgid "Cannot attach CMS data"
 msgstr "無法附加 CMS 資料"
 
 # Novell Translation
-#: camel/camel-smime-context.c:261
+#: ../camel/camel-smime-context.c:261
 msgid "Cannot create CMS Signer information"
 msgstr "無法建立 CMS SignerInfo"
 
 # Novell Translation
-#: camel/camel-smime-context.c:267
+#: ../camel/camel-smime-context.c:267
 msgid "Cannot find certificate chain"
 msgstr "找不到憑證鏈"
 
 # Novell Translation
-#: camel/camel-smime-context.c:273
+#: ../camel/camel-smime-context.c:273
 msgid "Cannot add CMS Signing time"
 msgstr "無法新增 CMS SigningTime"
 
 # composer/e-msg-composer.c:1092
 # Novell Translation
-#: camel/camel-smime-context.c:295 camel/camel-smime-context.c:307
+#: ../camel/camel-smime-context.c:295 ../camel/camel-smime-context.c:307
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' 的加密憑證不存在"
 
 # Novell Translation
-#: camel/camel-smime-context.c:314
+#: ../camel/camel-smime-context.c:314
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 SMIMEEncKeyPrefs 屬性"
 
 # Novell Translation
-#: camel/camel-smime-context.c:319
+#: ../camel/camel-smime-context.c:319
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 MS SMIMEEncKeyPrefs 屬性"
 
 # Novell Translation
-#: camel/camel-smime-context.c:324
+#: ../camel/camel-smime-context.c:324
 msgid "Cannot add encryption certificate"
 msgstr "無法新增加密憑證"
 
 # Novell Translation
-#: camel/camel-smime-context.c:330
+#: ../camel/camel-smime-context.c:330
 msgid "Cannot add CMS Signer information"
 msgstr "無法新增 CMS SignerInfo"
 
 # mail/mail-crypto.c:251
 # Novell Translation
-#: camel/camel-smime-context.c:400 camel/camel-smime-context.c:848
+#: ../camel/camel-smime-context.c:400 ../camel/camel-smime-context.c:848
 msgid "Cannot create encoder context"
 msgstr "無法建立編碼器網路位置"
 
 # camel/camel-movemail.c:274
 # Novell Translation
-#: camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:406
 msgid "Failed to add data to CMS encoder"
 msgstr "無法新增資料至 CMS 編碼器"
 
 # Novell Translation
-#: camel/camel-smime-context.c:411 camel/camel-smime-context.c:865
+#: ../camel/camel-smime-context.c:411 ../camel/camel-smime-context.c:865
 msgid "Failed to encode data"
 msgstr "無法編碼資料"
 
 # calendar/gui/calendar-model.c:1064
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
-#: camel/camel-smime-context.c:484
+#: ../camel/camel-smime-context.c:484
 msgid "Unverified"
 msgstr "未指定"
 
 # mail/mail-config.glade.h:74
-#: camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:486
 msgid "Good signature"
 msgstr "儲存簽名檔"
 
 # mail/mail-config.glade.h:74
-#: camel/camel-smime-context.c:488
+#: ../camel/camel-smime-context.c:488
 msgid "Bad signature"
 msgstr "儲存簽名檔"
 
 # Novell Translation
-#: camel/camel-smime-context.c:490
+#: ../camel/camel-smime-context.c:490
 msgid "Content tampered with or altered in transit"
 msgstr "內容在傳送時被竄改或變更"
 
-#: camel/camel-smime-context.c:492
+#: ../camel/camel-smime-context.c:492
 msgid "Signing certificate not found"
 msgstr "在憑證鏈中的自我加簽憑證"
 
-#: camel/camel-smime-context.c:494
+#: ../camel/camel-smime-context.c:494
 msgid "Signing certificate not trusted"
 msgstr "憑證不被信任"
 
 # Novell Translation
-#: camel/camel-smime-context.c:496
+#: ../camel/camel-smime-context.c:496
 msgid "Signature algorithm unknown"
 msgstr "簽名演算法不明"
 
 # Novell Translation
-#: camel/camel-smime-context.c:498
+#: ../camel/camel-smime-context.c:498
 msgid "Signature algorithm unsupported"
 msgstr "簽名演算法不支援"
 
 # mail/mail-config.glade.h:74
-#: camel/camel-smime-context.c:500
+#: ../camel/camel-smime-context.c:500
 msgid "Malformed signature"
 msgstr "儲存簽名檔"
 
 # shell/e-storage.c:467
-#: camel/camel-smime-context.c:502
+#: ../camel/camel-smime-context.c:502
 msgid "Processing error"
 msgstr "解析錯誤"
 
 # Novell Translation
-#: camel/camel-smime-context.c:539
+#: ../camel/camel-smime-context.c:539
 msgid "No signed data in signature"
 msgstr "簽名中沒有 signedData"
 
 # Novell Translation
-#: camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:546
 msgid "Digests missing from enveloped data"
 msgstr "包裹的資料中遺漏摘要"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/camel-smime-context.c:559 camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:559 ../camel/camel-smime-context.c:569
 msgid "Cannot calculate digests"
 msgstr "無法計算摘要"
 
@@ -2470,164 +2727,164 @@ msgstr "無法計算摘要"
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
 # Novell Translation
-#: camel/camel-smime-context.c:574
+#: ../camel/camel-smime-context.c:574
 msgid "Cannot set message digests"
 msgstr "無法設定訊息摘要"
 
 # mail/mail-crypto.c:59
 # Novell Translation
-#: camel/camel-smime-context.c:584 camel/camel-smime-context.c:589
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:589
 msgid "Certificate import failed"
 msgstr "憑證輸入失敗"
 
 # Novell Translation
-#: camel/camel-smime-context.c:599
+#: ../camel/camel-smime-context.c:599
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "限憑證訊息,無法驗證憑證"
 
 # Novell Translation
-#: camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:602
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "限憑證訊息、匯入和驗證的憑證"
 
 # mail/mail-config.glade.h:74
 # Novell Translation
-#: camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:606
 msgid "Cannot find signature digests"
 msgstr "找不到簽名摘要"
 
 # mail/mail-config.glade.h:72
-#: camel/camel-smime-context.c:622
+#: ../camel/camel-smime-context.c:622
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "伺服器: %s,類型: %s"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/camel-smime-context.c:723
+#: ../camel/camel-smime-context.c:723
 msgid "Decoder failed"
 msgstr "解碼器失敗"
 
 # camel/camel-smime-context.c:327
 # Novell Translation
-#: camel/camel-smime-context.c:775
+#: ../camel/camel-smime-context.c:775
 #, c-format
 msgid "Cannot find certificate for `%s'"
 msgstr "找不到 `%s' 的憑證"
 
 # Novell Translation
-#: camel/camel-smime-context.c:782
+#: ../camel/camel-smime-context.c:782
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "找不到一般大量加密演算法"
 
 # Novell Translation
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:791
+#: ../camel/camel-smime-context.c:791
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "無法配置插槽給加密大量鑰匙"
 
 # camel/camel-filter-driver.c:671
 # Novell Translation
-#: camel/camel-smime-context.c:802
+#: ../camel/camel-smime-context.c:802
 msgid "Cannot create CMS Message"
 msgstr "無法建立 CMS 訊息"
 
 # camel/camel-filter-driver.c:671
 # Novell Translation
-#: camel/camel-smime-context.c:808
+#: ../camel/camel-smime-context.c:808
 msgid "Cannot create CMS Enveloped data"
 msgstr "無法建立 CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/camel-smime-context.c:814
+#: ../camel/camel-smime-context.c:814
 msgid "Cannot attach CMS Enveloped data"
 msgstr "無法附加 CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:820
 msgid "Cannot attach CMS data object"
 msgstr "無法附加 CMS 資料物件"
 
 # camel/camel-filter-driver.c:671
 # Novell Translation
-#: camel/camel-smime-context.c:829
+#: ../camel/camel-smime-context.c:829
 msgid "Cannot create CMS Recipient information"
 msgstr "無法建立 CMS RecipientInfo"
 
 # Novell Translation
-#: camel/camel-smime-context.c:834
+#: ../camel/camel-smime-context.c:834
 msgid "Cannot add CMS Recipient information"
 msgstr "無法新增 CMS RecipientInfo"
 
 # camel/providers/imap/camel-imap-store.c:531
 # Novell Translation
-#: camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:859
 msgid "Failed to add data to encoder"
 msgstr "無法新增資料至編碼器"
 
 # Novell Translation
-#: camel/camel-smime-context.c:946
+#: ../camel/camel-smime-context.c:946
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "解碼器失敗,錯誤 %d"
 
 # Novell Translation
-#: camel/camel-smime-context.c:953
+#: ../camel/camel-smime-context.c:953
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 解密:找不到加密內容"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
 # Novell Translation
-#: camel/camel-smime-context.c:980
+#: ../camel/camel-smime-context.c:980
 msgid "import keys: unimplemented"
 msgstr "輸入鑰匙:未執行"
 
 # Novell Translation
-#: camel/camel-smime-context.c:988
+#: ../camel/camel-smime-context.c:988
 msgid "export keys: unimplemented"
 msgstr "輸出鑰匙:未執行"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:214
+#: ../camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "不能取得資料夾:在此儲存空間上無效的操作"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/camel-store.c:244
+#: ../camel/camel-store.c:246
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "無法建立資料夾 `%s':資料夾已存在"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:298
+#: ../camel/camel-store.c:300
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "不能建立資料夾:在此儲存空間上無效的操作"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/camel-store.c:326
+#: ../camel/camel-store.c:328
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "無法建立資料夾:%s:資料夾已存在"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-store.c:390 camel/camel-vee-store.c:367
-#: camel/providers/local/camel-maildir-store.c:221
+#: ../camel/camel-store.c:392 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:217
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾: %s :無效的操作"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-store.c:440 camel/camel-vee-store.c:404
-#: camel/providers/local/camel-maildir-store.c:293
+#: ../camel/camel-store.c:442 ../camel/camel-vee-store.c:404
+#: ../camel/providers/local/camel-maildir-store.c:289
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "不能重新命名資料夾: %s :無效的操作"
@@ -2637,138 +2894,140 @@ msgstr "不能重新命名資料夾: %s :無效的操作"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: camel/camel-store.c:778
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:781 ../camel/camel-vtrash-folder.c:47
 msgid "Trash"
 msgstr "垃圾桶"
 
 # calendar/gui/goto-dialog.glade.h:9
 # Novell Translation
-#: camel/camel-store.c:780
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:784 ../camel/camel-vtrash-folder.c:49
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: ../camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "無法取得發照者的憑證。"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: ../camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr "無法取得憑證撒銷清單"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: ../camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr "無法解密憑證簽章"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: ../camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "無法解密憑證撒銷簽章"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: ../camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr "無法解碼發照者的公開金鑰"
 
 # mail/mail-crypto.c:59
-#: camel/camel-tcp-stream-openssl.c:578
+#: ../camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr "憑證簽章失敗"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: ../camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr "憑證撒銷清單簽章失敗"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: ../camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr "憑證尚未生效"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: ../camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr "憑證已經失效"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: ../camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr "CRL 尚未生效"
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: ../camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr "CRL 已經失效"
 
 # shell/e-shell-importer.c:404
-#: camel/camel-tcp-stream-openssl.c:593
+#: ../camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr "CRL 中發生錯誤"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: camel/camel-tcp-stream-openssl.c:595
+#: ../camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "記憶體不足"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: ../camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr "零深度 自我加簽的憑證"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: ../camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr "在憑證鏈中的自我加簽憑證"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: ../camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr "無法自本地端取得發照者的憑證"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: ../camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr "驗證 leaf 憑證失敗。"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: ../camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr "憑證鏈太長"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: ../camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr "憑證已撒銷"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: ../camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr "無效的憑證機構 (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: ../camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr "路徑長度過長"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/camel-tcp-stream-openssl.c:613
+#: ../camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr "無效的目的"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: ../camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr "憑證不被信任"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: ../camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr "憑證被拒絕"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: ../camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr "主旨/發照者不符"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: ../camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID 不符"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: ../camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/發照者序列不符"
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: ../camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr "金鑰的用途並不支援憑證加簽"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: ../camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr "應用程式驗證時錯誤"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:827
+#: ../camel/camel-tcp-stream-openssl.c:696 ../camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2781,17 +3040,17 @@ msgstr ""
 "指紋:              %s\n"
 "簽章:              %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
+#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:839
 msgid "GOOD"
 msgstr "良好"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
+#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:839
 msgid "BAD"
 msgstr "不良"
 
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
-#: camel/camel-tcp-stream-openssl.c:704
+#: ../camel/camel-tcp-stream-openssl.c:704
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -2811,7 +3070,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:837
+#: ../camel/camel-tcp-stream-ssl.c:843
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2826,7 +3085,7 @@ msgstr ""
 "\n"
 "您想要接受嗎?"
 
-#: camel/camel-tcp-stream-ssl.c:881
+#: ../camel/camel-tcp-stream-ssl.c:887
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2835,7 +3094,7 @@ msgstr ""
 "憑證問題: %s\n"
 "發照者: %s"
 
-#: camel/camel-tcp-stream-ssl.c:933
+#: ../camel/camel-tcp-stream-ssl.c:939
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2844,7 +3103,7 @@ msgstr ""
 "不正確的憑證網域: %s\n"
 "發照者: %s"
 
-#: camel/camel-tcp-stream-ssl.c:951
+#: ../camel/camel-tcp-stream-ssl.c:957
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2853,7 +3112,7 @@ msgstr ""
 "憑證已逾期: %s\n"
 "發照者: %s"
 
-#: camel/camel-tcp-stream-ssl.c:968
+#: ../camel/camel-tcp-stream-ssl.c:974
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2863,54 +3122,54 @@ msgstr ""
 "發照者: %s"
 
 # camel/camel-url.c:289
-#: camel/camel-url.c:293
+#: ../camel/camel-url.c:293
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "無法分析 URL“%s”"
 
 # shell/e-shell-importer.c:384
-#: camel/camel-vee-folder.c:476
+#: ../camel/camel-vee-folder.c:476
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "儲存“%s”時發生錯誤: %s"
 
 # camel/camel-vee-folder.c:451
-#: camel/camel-vee-folder.c:518
+#: ../camel/camel-vee-folder.c:518
 #, c-format
 msgid "No such message %s in %s"
 msgstr "沒有 %s 這類郵件在 %s 中"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: camel/camel-vee-folder.c:643 camel/camel-vee-folder.c:649
+#: ../camel/camel-vee-folder.c:643 ../camel/camel-vee-folder.c:649
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
-#: camel/camel-vee-store.c:343
+#: ../camel/camel-vee-store.c:100 ../camel/camel-vee-store.c:343
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:390
+#: ../camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾: %s :沒有這個資料夾"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾: %s :沒有這個資料夾"
 
 # camel/providers/local/camel-mbox-summary.c:644
 # Novell Translation
-#: camel/camel-vtrash-folder.c:47
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Cannot copy messages to the Trash folder"
 msgstr "無法複製訊息到「垃圾筒」資料夾"
 
 # camel/providers/local/camel-mbox-summary.c:644
 # Novell Translation
-#: camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Cannot copy messages to the Junk folder"
 msgstr "無法複製訊息到「垃圾郵件」資料夾"
 
@@ -2921,8 +3180,8 @@ msgstr "無法複製訊息到「垃圾郵件」資料夾"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:115
+#: ../camel/providers/imap/camel-imap-folder.c:1980
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2934,11 +3193,11 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
-#: camel/providers/local/camel-maildir-folder.c:245
-#: camel/providers/local/camel-mbox-folder.c:403
-#: camel/providers/local/camel-mh-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:115
+#: ../camel/providers/imap/camel-imap-folder.c:1980
+#: ../camel/providers/local/camel-maildir-folder.c:245
+#: ../camel/providers/local/camel-mbox-folder.c:340
+#: ../camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
 msgstr "沒有這封郵件"
 
@@ -2946,15 +3205,15 @@ msgstr "沒有這封郵件"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/groupwise/camel-groupwise-folder.c:120
-#: camel/providers/imap4/camel-imap4-folder.c:696
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/nntp/camel-nntp-folder.c:233
-#: camel/providers/nntp/camel-nntp-folder.c:372
-#: camel/providers/pop3/camel-pop3-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:431
-#: camel/providers/pop3/camel-pop3-folder.c:492
-#: camel/providers/pop3/camel-pop3-folder.c:510
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:129
+#: ../camel/providers/imap4/camel-imap4-folder.c:787
+#: ../camel/providers/nntp/camel-nntp-folder.c:157
+#: ../camel/providers/nntp/camel-nntp-folder.c:233
+#: ../camel/providers/nntp/camel-nntp-folder.c:372
+#: ../camel/providers/pop3/camel-pop3-folder.c:263
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:492
+#: ../camel/providers/pop3/camel-pop3-folder.c:510
 msgid "User cancelled"
 msgstr "使用者已取消"
 
@@ -2965,39 +3224,39 @@ msgstr "使用者已取消"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/groupwise/camel-groupwise-folder.c:125
-#: camel/providers/imap4/camel-imap4-folder.c:701
-#: camel/providers/nntp/camel-nntp-folder.c:148
-#: camel/providers/nntp/camel-nntp-folder.c:150
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/nntp/camel-nntp-folder.c:235
-#: camel/providers/pop3/camel-pop3-folder.c:434
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:513
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:135
+#: ../camel/providers/imap4/camel-imap4-folder.c:792
+#: ../camel/providers/nntp/camel-nntp-folder.c:148
+#: ../camel/providers/nntp/camel-nntp-folder.c:150
+#: ../camel/providers/nntp/camel-nntp-folder.c:159
+#: ../camel/providers/nntp/camel-nntp-folder.c:235
+#: ../camel/providers/pop3/camel-pop3-folder.c:434
+#: ../camel/providers/pop3/camel-pop3-folder.c:495
+#: ../camel/providers/pop3/camel-pop3-folder.c:502
+#: ../camel/providers/pop3/camel-pop3-folder.c:513
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s: %s"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: camel/providers/groupwise/camel-groupwise-folder.c:145
-#: camel/providers/imap4/camel-imap4-folder.c:719
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:153
+#: ../camel/providers/imap4/camel-imap4-folder.c:810
 #, fuzzy
 msgid "This message is not available in offline mode."
 msgstr "這封郵件目前仍未可用"
 
 # camel/camel-movemail.c:306
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-folder.c:171
-#: camel/providers/groupwise/camel-groupwise-folder.c:272
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
 #, fuzzy
 msgid "Could not get message"
 msgstr "無法建立訊息。"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: camel/providers/groupwise/camel-groupwise-folder.c:471
-#: camel/providers/imap/camel-imap-folder.c:245
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:714
+#: ../camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "無法載入給 %s 的摘要"
@@ -3009,115 +3268,105 @@ msgstr "無法載入給 %s 的摘要"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/groupwise/camel-groupwise-folder.c:685
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1158
 #, fuzzy, c-format
 msgid "Cannot create message: %s"
 msgstr "無法取得郵件 %s: %s"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: camel/providers/groupwise/camel-groupwise-folder.c:697
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1170
 #, fuzzy, c-format
 msgid "Cannot append message to folder `%s': %s"
 msgstr "不能將郵件儲存到 mh 資料夾: %s: %s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/groupwise/camel-groupwise-journal.c:240
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:283
 #, fuzzy, c-format
 msgid "Cannot get folder container %s"
 msgstr "不能取得資料夾:%s:%s"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: camel/providers/groupwise/camel-groupwise-journal.c:328
-#: camel/providers/imap4/camel-imap4-journal.c:276
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:347
+#: ../camel/providers/imap4/camel-imap4-journal.c:320
 #, fuzzy
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "不能將郵件儲存到 mh 資料夾: %s: %s"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: camel/providers/groupwise/camel-groupwise-journal.c:344
-#: camel/providers/imap4/camel-imap4-journal.c:292
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:363
+#: ../camel/providers/imap4/camel-imap4-journal.c:336
 #, fuzzy, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "不能將郵件儲存到 mbox 檔案: %s: %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: camel/providers/groupwise/camel-groupwise-provider.c:51
-#: camel/providers/imap4/camel-imap4-provider.c:36
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:51
+#: ../camel/providers/imap4/camel-imap4-provider.c:36
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
 msgid "Check for new messages in all folders"
 msgstr "檢查所有資料夾裡的新郵件"
 
 # addressbook/printing/e-contact-print.glade.h:23
-#: camel/providers/groupwise/camel-groupwise-provider.c:56
-#: camel/providers/imap/camel-imap-provider.c:64
-#: camel/providers/imap4/camel-imap4-provider.c:49
-#: camel/providers/local/camel-local-provider.c:43
-#: camel/providers/local/camel-local-provider.c:79
-#: camel/providers/local/camel-local-provider.c:99
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imap4/camel-imap4-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:43
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
 msgid "Options"
 msgstr "選項"
 
 # camel/providers/imap/camel-imap-provider.c:57
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-provider.c:58
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:58
 msgid "Apply filters to new messages in Inbox on this server"
 msgstr "套用過濾器至此伺服器「收件信箱」的新訊息"
 
 # camel/providers/imap/camel-imap-provider.c:45
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
 msgid "Check new messages for Junk contents"
 msgstr "檢查新訊息中是否有「垃圾郵件」內容"
 
 # camel/providers/imap/camel-imap-provider.c:45
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
 msgid "Only check for Junk messages in the INBOX folder"
 msgstr "只檢查「收件信箱」資料夾中的「垃圾郵件」"
 
 # mail/mail-config.glade.h:12
-#: camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
 #, fuzzy
 msgid "Automatically synchronize account locally"
 msgstr "自動檢查新郵件(_A)"
 
-# importers/pine-importer.c:661
-# Novell Translation
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Address Book and Calendar"
-msgstr "通訊錄和行事曆"
-
-# Novell Translation
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Post Office Agent:"
-msgstr "郵局代辦:"
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
+#, fuzzy
+msgid "SOAP Settings"
+msgstr "設定"
 
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "Post Office Agent SOAP Port:"
 msgstr "郵局代辦 SOAP 埠:"
 
-# mail/mail-config.glade.h:79
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
-msgid "Use Secure Connection (SSL)"
-msgstr "使用安全連線 (SSL)"
-
-# Novell Translation
-#: camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-provider.c:93
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "For accessing Novell Groupwise servers"
 msgstr "用於存取 Novell Groupwise 服務"
 
@@ -3127,42 +3376,43 @@ msgstr "用於存取 Novell Groupwise 服務"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: camel/providers/groupwise/camel-groupwise-provider.c:108
-#: camel/providers/imap/camel-imap-provider.c:96
-#: camel/providers/imap4/camel-imap4-provider.c:81
-#: camel/providers/nntp/camel-nntp-provider.c:72
-#: camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:102
+#: ../camel/providers/imap/camel-imap-provider.c:96
+#: ../camel/providers/imap4/camel-imap4-provider.c:88
+#: ../camel/providers/imapp/camel-imapp-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
 msgstr "密碼"
 
 # camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/groupwise/camel-groupwise-provider.c:110
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
 #, fuzzy
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: camel/providers/groupwise/camel-groupwise-store.c:267
+#: ../camel/providers/groupwise/camel-groupwise-store.c:270
 #, fuzzy
-msgid "Host or user not availbale in url"
+msgid "Host or user not available in url"
 msgstr "類別編輯器無法使用。"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: camel/providers/groupwise/camel-groupwise-store.c:359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:364
 #, fuzzy, c-format
-msgid "%sPlease enter the Groupwise password for %s@%s"
+msgid "%sPlease enter the GroupWise password for %s@%s"
 msgstr "%s 請輸入給 %s@%s 的 POP 密碼"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: camel/providers/groupwise/camel-groupwise-store.c:373
-#: camel/providers/imap/camel-imap-store.c:1301
+#: ../camel/providers/groupwise/camel-groupwise-store.c:378
+#: ../camel/providers/imap/camel-imap-store.c:1324
 msgid "You didn't enter a password."
 msgstr "您沒有輸入密碼。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/groupwise/camel-groupwise-store.c:382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:392
 #, fuzzy
 msgid "Unable to authenticate to GroupWise server."
 msgstr ""
@@ -3170,28 +3420,32 @@ msgstr ""
 "%s\n"
 "\n"
 
+#: ../camel/providers/groupwise/camel-groupwise-store.c:433
+msgid "Some features may not work correctly with your current server version"
+msgstr ""
+
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/groupwise/camel-groupwise-store.c:479
-#: camel/providers/imap/camel-imap-store.c:1852
-#: camel/providers/imap/camel-imap-store.c:2042
+#: ../camel/providers/groupwise/camel-groupwise-store.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1875
+#: ../camel/providers/imap/camel-imap-store.c:2065
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:499
-#: camel/providers/imap/camel-imap-folder.c:2287
-#: camel/providers/imap/camel-imap-folder.c:2357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:574
+#: ../camel/providers/imap/camel-imap-folder.c:2288
+#: ../camel/providers/imap/camel-imap-folder.c:2358
 msgid "Fetching summary information for new messages"
 msgstr "正取得新郵件的摘要資訊"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:610
+#: ../camel/providers/groupwise/camel-groupwise-store.c:711
 #, fuzzy
 msgid "Cannot get folder info in offline mode."
 msgstr "不能將資料夾移至其子資料夾之中。"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/groupwise/camel-groupwise-store.c:781
+#: ../camel/providers/groupwise/camel-groupwise-store.c:924
 #, fuzzy
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "無法建立以此為名的資料夾"
@@ -3199,14 +3453,14 @@ msgstr "無法建立以此為名的資料夾"
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-store.c:830
+#: ../camel/providers/groupwise/camel-groupwise-store.c:975
 #, fuzzy
 msgid "Cannot delete GroupWise folders in offline mode."
 msgstr "無法刪除資料夾 `%s':特殊資料夾"
 
 # camel/providers/local/camel-local-store.c:237
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-store.c:873
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1021
 #, fuzzy
 msgid "Cannot rename GroupWise folders in offline mode."
 msgstr "您無法在「新聞」儲存區重新命名資料夾。"
@@ -3214,84 +3468,59 @@ msgstr "您無法在「新聞」儲存區重新命名資料夾。"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-store.c:879
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1040
 #, fuzzy, c-format
 msgid "Cannot rename Groupwise folder `%s' to `%s'"
 msgstr "無法將資料夾 `%s' 重新命名為 `%s':錯誤的指令"
 
 # shell/e-shortcuts-view.c:137
 # Novell Translation
-#: camel/providers/groupwise/camel-groupwise-store.c:911
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1076
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
 #, fuzzy, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise"
 
 # camel/camel-remote-store.c:195
-#: camel/providers/groupwise/camel-groupwise-store.c:913
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1078
 #, fuzzy, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s 的 IMAP 服務於 %s"
 
-# Novell Translation
-#: camel/providers/groupwise/camel-groupwise-transport.c:121
-#, fuzzy, c-format
-msgid "Groupwise server %s"
-msgstr "Groupwise Id 清單"
-
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
 #, fuzzy, c-format
-msgid "Groupwise mail delivery via %s"
+msgid "GroupWise mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
 # mail/mail-ops.c:603
-#: camel/providers/groupwise/camel-groupwise-transport.c:159
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
 #, fuzzy
 msgid "Sending Message"
 msgstr "傳送郵件"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: camel/providers/groupwise/camel-gw-listener.c:406
-msgid "Tasks"
-msgstr "工作"
-
-#: camel/providers/groupwise/camel-gw-listener.c:436
-msgid "Checklist"
-msgstr "濃靄"
-
-# camel/camel-smime-context.c:194
-#: camel/providers/groupwise/camel-gw-listener.c:483
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
-
-#: camel/providers/groupwise/camel-gw-listener.c:494
-msgid "Failed to authenticate.\n"
-msgstr "驗證憑證失敗。\n"
-
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/imap/camel-imap-command.c:219
-#: camel/providers/imap/camel-imap-command.c:258
-#: camel/providers/imap/camel-imap-command.c:460
-#: camel/providers/imap/camel-imap-store.c:3209
+#: ../camel/providers/imap/camel-imap-command.c:219
+#: ../camel/providers/imap/camel-imap-command.c:258
+#: ../camel/providers/imap/camel-imap-command.c:465
+#: ../camel/providers/imap/camel-imap-store.c:3240
 msgid "Operation cancelled"
 msgstr "作業已取消"
 
 # camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-store.c:3212
+#: ../camel/providers/imap/camel-imap-command.c:303
+#: ../camel/providers/imap/camel-imap-store.c:3243
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線: %s"
 
 # camel/providers/imap/camel-imap-command.c:232
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:321
+#. we might get a ']' from a BAD response since we +12, but who cares?
+#: ../camel/providers/imap/camel-imap-command.c:324
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -3301,79 +3530,79 @@ msgstr ""
 "%s"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/providers/imap/camel-imap-command.c:390
+#: ../camel/providers/imap/camel-imap-command.c:393
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的回應: %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/imap/camel-imap-command.c:400
+#: ../camel/providers/imap/camel-imap-command.c:403
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP 指令失敗: %s"
 
 # camel/providers/imap/camel-imap-command.c:295
-#: camel/providers/imap/camel-imap-command.c:470
+#: ../camel/providers/imap/camel-imap-command.c:479
 msgid "Server response ended too soon."
 msgstr "伺服器太早傳回結束的回應。"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: camel/providers/imap/camel-imap-command.c:675
+#: ../camel/providers/imap/camel-imap-command.c:686
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP 伺服器的回應沒有包含 %s 資訊"
 
 # camel/providers/imap/camel-imap-command.c:524
-#: camel/providers/imap/camel-imap-command.c:711
+#: ../camel/providers/imap/camel-imap-command.c:722
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的 OK 回應: %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/providers/imap/camel-imap-folder.c:226
+#: ../camel/providers/imap/camel-imap-folder.c:226
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "無法建立目錄 %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:330
+#: ../camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "資料夾已破壞並在伺服器上重建。"
 
 # mail/mail-ops.c:1649
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-#: camel/providers/imap4/camel-imap4-summary.c:1270
+#: ../camel/providers/imap/camel-imap-folder.c:573
+#: ../camel/providers/imap4/camel-imap4-summary.c:1472
 msgid "Scanning for changed messages"
 msgstr "掃描變更過的郵件"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/providers/imap/camel-imap-folder.c:1939
+#: ../camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "無法從取回郵件: %s"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: camel/providers/imap/camel-imap-folder.c:2021
-#: camel/providers/imap/camel-imap-folder.c:2623
-#: camel/providers/nntp/camel-nntp-folder.c:221
+#: ../camel/providers/imap/camel-imap-folder.c:2022
+#: ../camel/providers/imap/camel-imap-folder.c:2624
+#: ../camel/providers/nntp/camel-nntp-folder.c:221
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
 # Novell Translation
-#: camel/providers/imap/camel-imap-folder.c:2464
+#: ../camel/providers/imap/camel-imap-folder.c:2465
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "不完整的伺服器回應:未提供任何資訊給訊息 %d"
 
 # Novell Translation
-#: camel/providers/imap/camel-imap-folder.c:2472
+#: ../camel/providers/imap/camel-imap-folder.c:2473
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "不完整的伺服器回應:未提供 UID 給訊息 %d"
 
 # Novell Translation
-#: camel/providers/imap/camel-imap-folder.c:2485
+#: ../camel/providers/imap/camel-imap-folder.c:2486
 #, c-format
 msgid ""
 "Unexpected server response: Identical UIDs provided for messages %d and %d"
@@ -3381,42 +3610,42 @@ msgstr "非預期的伺服器回應:提供相同的 UID 給訊息 %d 和 %d"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: camel/providers/imap/camel-imap-folder.c:2661
+#: ../camel/providers/imap/camel-imap-folder.c:2662
 msgid "Could not find message body in FETCH response."
 msgstr "在 FETCH 的回應內找不到郵件的內文。"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: camel/providers/imap/camel-imap-message-cache.c:156
+#: ../camel/providers/imap/camel-imap-message-cache.c:156
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "無法開啟快取目錄:%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/providers/imap/camel-imap-message-cache.c:253
-#: camel/providers/imap/camel-imap-message-cache.c:310
-#: camel/providers/imap/camel-imap-message-cache.c:341
-#: camel/providers/imap/camel-imap-message-cache.c:373
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#: ../camel/providers/imap/camel-imap-message-cache.c:310
+#: ../camel/providers/imap/camel-imap-message-cache.c:341
+#: ../camel/providers/imap/camel-imap-message-cache.c:373
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "快取郵件 %s 失敗: %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/providers/imap/camel-imap-message-cache.c:418
+#: ../camel/providers/imap/camel-imap-message-cache.c:418
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "快取 %s 失敗: %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imap/camel-imap-provider.c:44
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: camel/providers/imap/camel-imap-provider.c:46
-#: camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/imap/camel-imap-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
 #, fuzzy
 msgid "C_heck for new messages in all folders"
 msgstr "檢查所有資料夾裡的新郵件"
@@ -3424,208 +3653,231 @@ msgstr "檢查所有資料夾裡的新郵件"
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
 # Novell Translation
-#: camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imap4/camel-imap4-provider.c:41
 msgid "Connection to Server"
 msgstr "連線到伺服器"
 
 # camel/providers/imap/camel-imap-store.c:531
 # Novell Translation
-#: camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imap4/camel-imap4-provider.c:43
 #, fuzzy
 msgid "_Use custom command to connect to server"
 msgstr "使用自訂指令來連線到伺服器"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
 # Novell Translation
-#: camel/providers/imap/camel-imap-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:53
+#: ../camel/providers/imap4/camel-imap4-provider.c:45
 msgid "Command:"
 msgstr "指令:"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: camel/providers/imap/camel-imap-provider.c:56
-#: camel/providers/imap4/camel-imap4-provider.c:41
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "資料夾"
 
 # camel/providers/imap/camel-imap-provider.c:50
-#: camel/providers/imap/camel-imap-provider.c:58
-#: camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imap4/camel-imap4-provider.c:50
 #, fuzzy
 msgid "_Show only subscribed folders"
 msgstr "只顯示已訂閱的資料夾"
 
 # camel/providers/imap/camel-imap-provider.c:52
-#: camel/providers/imap/camel-imap-provider.c:60
-#: camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:52
 #, fuzzy
 msgid "O_verride server-supplied folder namespace"
 msgstr "覆蓋伺服器提供之資料夾的命名空間"
 
 # camel/providers/imap/camel-imap-provider.c:54
-#: camel/providers/imap/camel-imap-provider.c:62
-#: camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap4/camel-imap4-provider.c:54
 msgid "Namespace"
 msgstr "命名空間"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/imap/camel-imap-provider.c:66
-#: camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imap4/camel-imap4-provider.c:58
 #, fuzzy
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "將過濾器套用於此伺服器上 INBOX 裡的新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:45
 # Novell Translation
-#: camel/providers/imap/camel-imap-provider.c:68
-#: camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imap4/camel-imap4-provider.c:60
 #, fuzzy
 msgid "Check new messages for _Junk contents"
 msgstr "檢查新訊息中是否有「垃圾郵件」內容"
 
 # camel/providers/imap/camel-imap-provider.c:45
 # Novell Translation
-#: camel/providers/imap/camel-imap-provider.c:70
-#: camel/providers/imap4/camel-imap4-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imap4/camel-imap4-provider.c:62
 #, fuzzy
 msgid "Only check for Junk messa_ges in the INBOX folder"
 msgstr "只檢查「收件信箱」資料夾中的「垃圾郵件」"
 
 # mail/mail-config.glade.h:12
-#: camel/providers/imap/camel-imap-provider.c:72
-#: camel/providers/imap4/camel-imap4-provider.c:57
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap4/camel-imap4-provider.c:64
 #, fuzzy
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "自動檢查新郵件(_A)"
 
 # camel/providers/imap/camel-imap-provider.c:63
-#: camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:81
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
 # camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/imapp/camel-imapp-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/imap/camel-imap-store.c:421
-#: camel/providers/imap4/camel-imap4-store.c:206
+#: ../camel/providers/imap/camel-imap-store.c:421
+#: ../camel/providers/imap4/camel-imap4-store.c:215
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 伺服器 %s"
 
 # camel/camel-remote-store.c:195
-#: camel/providers/imap/camel-imap-store.c:423
-#: camel/providers/imap4/camel-imap4-store.c:208
+#: ../camel/providers/imap/camel-imap-store.c:423
+#: ../camel/providers/imap4/camel-imap4-store.c:217
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s 的 IMAP 服務於 %s"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/imap/camel-imap-store.c:535
-#: camel/providers/imap/camel-imap-store.c:550
-#: camel/providers/imap4/camel-imap4-store.c:240
-#: camel/providers/imap4/camel-imap4-store.c:255
-#: camel/providers/nntp/camel-nntp-store.c:200
-#: camel/providers/nntp/camel-nntp-store.c:215
-#: camel/providers/pop3/camel-pop3-store.c:169
-#: camel/providers/pop3/camel-pop3-store.c:184
-#: camel/providers/smtp/camel-smtp-transport.c:257
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: ../camel/providers/imap/camel-imap-store.c:553
+#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap4/camel-imap4-store.c:322
+#: ../camel/providers/imap4/camel-imap4-store.c:337
+#: ../camel/providers/nntp/camel-nntp-store.c:200
+#: ../camel/providers/nntp/camel-nntp-store.c:215
+#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:257
+#: ../camel/providers/smtp/camel-smtp-transport.c:272
 #, fuzzy, c-format
 msgid "Could not connect to %s: %s"
 msgstr "無法連線至 %s (埠號 %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:536
-#: camel/providers/imap4/camel-imap4-store.c:241
-#: camel/providers/nntp/camel-nntp-store.c:201
-#: camel/providers/pop3/camel-pop3-store.c:170
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imap4/camel-imap4-store.c:323
+#: ../camel/providers/nntp/camel-nntp-store.c:201
+#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
 msgid "SSL unavailable"
 msgstr "TLS 無法使用"
 
 # camel/camel-remote-store.c:252
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:817
-#: camel/providers/imap4/camel-imap4-store.c:252
-#: camel/providers/nntp/camel-nntp-store.c:212
-#: camel/providers/nntp/camel-nntp-store.c:231
-#: camel/providers/pop3/camel-pop3-store.c:181
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/imap/camel-imap-store.c:565
+#: ../camel/providers/imap/camel-imap-store.c:835
+#: ../camel/providers/imap4/camel-imap4-store.c:270
+#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imapp/camel-imapp-store.c:248
+#: ../camel/providers/nntp/camel-nntp-store.c:212
+#: ../camel/providers/nntp/camel-nntp-store.c:231
+#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:269
 msgid "Connection cancelled"
 msgstr "連線已取消"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:677
-#: camel/providers/imap/camel-imap-store.c:683
-#: camel/providers/imap4/camel-imap4-store.c:280
-#: camel/providers/imap4/camel-imap4-store.c:293
-#: camel/providers/imap4/camel-imap4-store.c:309
+#: ../camel/providers/imap/camel-imap-store.c:673
+#: ../camel/providers/imap/camel-imap-store.c:695
+#: ../camel/providers/imap/camel-imap-store.c:701
+#: ../camel/providers/imap4/camel-imap4-store.c:362
+#: ../camel/providers/imap4/camel-imap4-store.c:375
+#: ../camel/providers/imap4/camel-imap4-store.c:391
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: %s"
 
 # shell/e-storage.c:477
-#: camel/providers/imap/camel-imap-store.c:656
-#: camel/providers/smtp/camel-smtp-transport.c:326
+#: ../camel/providers/imap/camel-imap-store.c:674
+#: ../camel/providers/smtp/camel-smtp-transport.c:326
 #, fuzzy
 msgid "STARTTLS not supported"
 msgstr "不支援 SSL/TLS 擴充機能。"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/imap4/camel-imap4-store.c:281
-#: camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/imap/camel-imap-store.c:696
+#: ../camel/providers/imap4/camel-imap4-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:246
 msgid "SSL negotiations failed"
 msgstr "SSL 協商失敗"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap4/camel-imap4-store.c:310
-#: camel/providers/pop3/camel-pop3-store.c:252
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: ../camel/providers/imap/camel-imap-store.c:702
+#: ../camel/providers/imap4/camel-imap4-store.c:392
+#: ../camel/providers/pop3/camel-pop3-store.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:365
 #, fuzzy
 msgid "SSL is not available in this build"
 msgstr "此一版本的 Evolution 並未啟用 LDAP"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/imap/camel-imap-store.c:820
+#: ../camel/providers/imap/camel-imap-store.c:838
+#: ../camel/providers/imap4/camel-imap4-store.c:273
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "無法連線至 %s (埠號 %d): %s"
 
+# mail/local-config.glade.h:8
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1021
+#: ../camel/providers/imap/camel-imap-store.c:2429
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
+#: ../camel/providers/imap4/camel-imap4-store.c:1267
+#: ../camel/providers/local/camel-maildir-folder.c:75
+#: ../camel/providers/local/camel-maildir-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:289
+#: ../camel/providers/local/camel-maildir-store.c:511
+#: ../camel/providers/local/camel-maildir-store.c:524
+#: ../camel/providers/local/camel-spool-store.c:460
+msgid "Inbox"
+msgstr "收件匣"
+
 # camel/providers/imap/camel-imap-store.c:456
-#: camel/providers/imap/camel-imap-store.c:1254
+#: ../camel/providers/imap/camel-imap-store.c:1277
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 伺服器 %s 不支援所要求的驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: camel/providers/imap/camel-imap-store.c:1264
-#: camel/providers/smtp/camel-smtp-transport.c:498
+#: ../camel/providers/imap/camel-imap-store.c:1287
+#: ../camel/providers/smtp/camel-smtp-transport.c:501
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支援驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/imap/camel-imap-store.c:1287
+#: ../camel/providers/imap/camel-imap-store.c:1310
+#: ../camel/providers/imapp/camel-imapp-store.c:364
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s 請輸入 %s@%s 的 IMAP 密碼"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:1330
+#: ../camel/providers/imap/camel-imap-store.c:1353
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3637,54 +3889,54 @@ msgstr ""
 "\n"
 
 # Novell Translation
-#: camel/providers/imap/camel-imap-store.c:1870
-#: camel/providers/imap/camel-imap-store.c:2248
-#: camel/providers/imap4/camel-imap4-store.c:770
+#: ../camel/providers/imap/camel-imap-store.c:1893
+#: ../camel/providers/imap/camel-imap-store.c:2271
+#: ../camel/providers/imap4/camel-imap4-store.c:856
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "資料夾名稱「%s」無效,因為它包括字元「%c」"
 
-#: camel/providers/imap/camel-imap-store.c:1928
-#: camel/providers/imap/camel-imap-store.c:2309
+#: ../camel/providers/imap/camel-imap-store.c:1951
+#: ../camel/providers/imap/camel-imap-store.c:2333
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap/camel-imap-store.c:1983
-#: camel/providers/local/camel-maildir-store.c:192
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mh-store.c:237
+#: ../camel/providers/imap/camel-imap-store.c:2006
+#: ../camel/providers/local/camel-maildir-store.c:190
+#: ../camel/providers/local/camel-mbox-store.c:199
+#: ../camel/providers/local/camel-mh-store.c:237
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "無法建立資料夾 `%s':資料夾已存在。"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imap/camel-imap-store.c:2282
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "不明的母資料夾: %s"
 
 # camel/providers/pop3/camel-pop3-store.c:199
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-command.c:551
-#: camel/providers/imap4/camel-imap4-command.c:558
+#: ../camel/providers/imap4/camel-imap4-command.c:550
+#: ../camel/providers/imap4/camel-imap4-command.c:557
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "傳送指令至 IMAP 伺服器 %s 失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:232
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-command.c:661
+#: ../camel/providers/imap4/camel-imap4-command.c:660
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "IMAP4 伺服器 %s 非預期的回應:%s"
 
 # camel/providers/imap/camel-imap-command.c:232
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-engine.c:216
+#: ../camel/providers/imap4/camel-imap4-engine.c:222
 #, c-format
 msgid "Unexpected greeting from IMAP server %s."
 msgstr "IMAP 伺服器 %s 非預期的問候語。"
@@ -3692,7 +3944,7 @@ msgstr "IMAP 伺服器 %s 非預期的問候語。"
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-engine.c:410
+#: ../camel/providers/imap4/camel-imap4-engine.c:432
 #, c-format
 msgid "Cannot select folder `%s': Invalid mailbox name"
 msgstr "無法選取資料夾 `%s':無效的信箱名稱"
@@ -3700,25 +3952,30 @@ msgstr "無法選取資料夾 `%s':無效的信箱名稱"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-engine.c:416
+#: ../camel/providers/imap4/camel-imap4-engine.c:438
 #, c-format
 msgid "Cannot select folder `%s': Bad command"
 msgstr "無法選取資料夾 `%s':錯誤的指令"
 
 # camel/camel-remote-store.c:476
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1503
-#: camel/providers/imap4/camel-imap4-engine.c:1548
-#: camel/providers/imap4/camel-imap4-engine.c:1604
+#: ../camel/providers/imap4/camel-imap4-engine.c:1549
+#: ../camel/providers/imap4/camel-imap4-engine.c:1588
+#: ../camel/providers/imap4/camel-imap4-engine.c:1633
+#: ../camel/providers/imap4/camel-imap4-engine.c:1689
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "IMAP4 伺服器 %s 意外中斷連線:%s"
 
+#: ../camel/providers/imap4/camel-imap4-folder.c:85
+msgid ""
+"Enable Mailing-List detection required for some filter and vFolder rules"
+msgstr ""
+
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:306
+#: ../camel/providers/imap4/camel-imap4-folder.c:398
 #, fuzzy, c-format
 msgid "Cannot access folder `%s': %s"
 msgstr "無法取得資料夾 `%s':%s"
@@ -3726,7 +3983,7 @@ msgstr "無法取得資料夾 `%s':%s"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:365
+#: ../camel/providers/imap4/camel-imap4-folder.c:457
 #, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr "無法同步化旗標至資料夾 `%s':未知的"
@@ -3734,7 +3991,7 @@ msgstr "無法同步化旗標至資料夾 `%s':未知的"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:371
+#: ../camel/providers/imap4/camel-imap4-folder.c:463
 #, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr "無法同步化旗標至資料夾 `%s':錯誤的指令"
@@ -3742,7 +3999,7 @@ msgstr "無法同步化旗標至資料夾 `%s':錯誤的指令"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:512
+#: ../camel/providers/imap4/camel-imap4-folder.c:603
 #, c-format
 msgid "Cannot expunge folder `%s': Unknown"
 msgstr "無法清空資料夾 `%s':未知的"
@@ -3750,7 +4007,7 @@ msgstr "無法清空資料夾 `%s':未知的"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:517
+#: ../camel/providers/imap4/camel-imap4-folder.c:608
 #, c-format
 msgid "Cannot expunge folder `%s': Bad command"
 msgstr "無法清空資料夾 `%s':錯誤的指令"
@@ -3759,7 +4016,7 @@ msgstr "無法清空資料夾 `%s':錯誤的指令"
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:773
+#: ../camel/providers/imap4/camel-imap4-folder.c:864
 #, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
 msgstr "無法取得訊息 %s (從資料夾 `%s'):沒有此訊息"
@@ -3768,15 +4025,22 @@ msgstr "無法取得訊息 %s (從資料夾 `%s'):沒有此訊息"
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:778
+#: ../camel/providers/imap4/camel-imap4-folder.c:869
 #, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr "無法取得訊息 %s (從資料夾 `%s'):錯誤的指令"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
+#: ../camel/providers/imap4/camel-imap4-folder.c:913
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Folder is read-only"
+msgstr "不能將郵件儲存到 mh 資料夾: %s: %s"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:911
+#: ../camel/providers/imap4/camel-imap4-folder.c:1006
 #, c-format
 msgid "Cannot append message to folder `%s': Unknown error"
 msgstr "無法附加訊息至資料夾 `%s':未知的錯誤"
@@ -3784,7 +4048,7 @@ msgstr "無法附加訊息至資料夾 `%s':未知的錯誤"
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:940
+#: ../camel/providers/imap4/camel-imap4-folder.c:1035
 #, c-format
 msgid "Cannot append message to folder `%s': Bad command"
 msgstr "無法附加訊息至資料夾 `%s':錯誤的指令"
@@ -3793,7 +4057,7 @@ msgstr "無法附加訊息至資料夾 `%s':錯誤的指令"
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:1048
+#: ../camel/providers/imap4/camel-imap4-folder.c:1155
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr "無法從資料夾 `%s' 移動訊息至資料夾 `%s':未知的"
@@ -3802,7 +4066,7 @@ msgstr "無法從資料夾 `%s' 移動訊息至資料夾 `%s':未知的"
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:1052
+#: ../camel/providers/imap4/camel-imap4-folder.c:1159
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr "無法從資料夾 `%s' 複製訊息至資料夾 `%s':未知的"
@@ -3811,7 +4075,7 @@ msgstr "無法從資料夾 `%s' 複製訊息至資料夾 `%s':未知的"
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:1060
+#: ../camel/providers/imap4/camel-imap4-folder.c:1167
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr "無法從資料夾 `%s' 移動訊息至資料夾 `%s':錯誤的指令"
@@ -3820,33 +4084,34 @@ msgstr "無法從資料夾 `%s' 移動訊息至資料夾 `%s':錯誤的指令"
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-folder.c:1064
+#: ../camel/providers/imap4/camel-imap4-folder.c:1171
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr "無法從資料夾 `%s' 複製訊息至資料夾 `%s':錯誤的指令"
 
 # mail/mail-config.glade.h:34
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-provider.c:64
-msgid "IMAPv4rev1"
+#: ../camel/providers/imap4/camel-imap4-provider.c:71
+#, fuzzy
+msgid "IMAP4rev1"
 msgstr "IMAPv4rev1"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/imap4/camel-imap4-provider.c:66
+#: ../camel/providers/imap4/camel-imap4-provider.c:73
 #, fuzzy
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
 # camel/providers/imap/camel-imap-provider.c:82
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-provider.c:83
+#: ../camel/providers/imap4/camel-imap4-provider.c:90
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr "此選項會使用純文字密碼,連線到 IMAPv4rev1 伺服器。"
 
 # camel/providers/pop3/camel-pop3-store.c:409
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:391
+#: ../camel/providers/imap4/camel-imap4-store.c:477
 #, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
@@ -3854,21 +4119,21 @@ msgstr "無法驗證 IMAP 伺服器 %s (使用 %s 驗證機制)"
 
 # camel/providers/smtp/camel-smtp-transport.c:395
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:436
+#: ../camel/providers/imap4/camel-imap4-store.c:522
 #, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr "%s請輸入 IMAP 密碼 (%s 於主機 %s)"
 
 # camel/providers/pop3/camel-pop3-store.c:199
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:506
+#: ../camel/providers/imap4/camel-imap4-store.c:592
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "無法驗證 IMAP 伺服器 %s (使用 %s)"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/imap4/camel-imap4-store.c:668
-#: camel/providers/imap4/camel-imap4-store.c:780
+#: ../camel/providers/imap4/camel-imap4-store.c:754
+#: ../camel/providers/imap4/camel-imap4-store.c:866
 #, fuzzy
 msgid "Cannot create IMAP folders in offline mode."
 msgstr "無法建立以此為名的資料夾"
@@ -3876,14 +4141,14 @@ msgstr "無法建立以此為名的資料夾"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:707
+#: ../camel/providers/imap4/camel-imap4-store.c:793
 #, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "無法取得資料夾 `%s' (從 IMAP 伺服器 %s):未知的"
 
 # camel/providers/local/camel-mbox-summary.c:655
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:828
+#: ../camel/providers/imap4/camel-imap4-store.c:914
 #, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr "無法建立資料夾 `%s':無效的信箱名稱"
@@ -3891,7 +4156,7 @@ msgstr "無法建立資料夾 `%s':無效的信箱名稱"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:834
+#: ../camel/providers/imap4/camel-imap4-store.c:920
 #, c-format
 msgid "Cannot create folder `%s': Bad command"
 msgstr "無法建立資料夾 `%s':錯誤的指令"
@@ -3899,7 +4164,7 @@ msgstr "無法建立資料夾 `%s':錯誤的指令"
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:865
+#: ../camel/providers/imap4/camel-imap4-store.c:951
 #, c-format
 msgid "Cannot delete folder `%s': Special folder"
 msgstr "無法刪除資料夾 `%s':特殊資料夾"
@@ -3907,7 +4172,7 @@ msgstr "無法刪除資料夾 `%s':特殊資料夾"
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:872
+#: ../camel/providers/imap4/camel-imap4-store.c:958
 #, fuzzy
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "無法刪除資料夾 `%s':特殊資料夾"
@@ -3915,7 +4180,7 @@ msgstr "無法刪除資料夾 `%s':特殊資料夾"
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:931
+#: ../camel/providers/imap4/camel-imap4-store.c:1017
 #, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr "無法刪除資料夾 `%s':無效的信箱名稱"
@@ -3923,7 +4188,7 @@ msgstr "無法刪除資料夾 `%s':無效的信箱名稱"
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:936
+#: ../camel/providers/imap4/camel-imap4-store.c:1022
 #, c-format
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "無法刪除資料夾 `%s':錯誤的指令"
@@ -3931,21 +4196,21 @@ msgstr "無法刪除資料夾 `%s':錯誤的指令"
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:956
+#: ../camel/providers/imap4/camel-imap4-store.c:1042
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr "無法將資料夾 `%s' 重新命名為 `%s':特殊資料夾"
 
 # camel/providers/local/camel-local-store.c:237
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:963
+#: ../camel/providers/imap4/camel-imap4-store.c:1049
 #, fuzzy
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "您無法在「新聞」儲存區重新命名資料夾。"
 
 # camel/providers/local/camel-mbox-summary.c:655
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:994
+#: ../camel/providers/imap4/camel-imap4-store.c:1080
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr "無法將資料夾 `%s' 重新命名為 `%s':無效的信箱名稱"
@@ -3953,27 +4218,27 @@ msgstr "無法將資料夾 `%s' 重新命名為 `%s':無效的信箱名稱"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:999
+#: ../camel/providers/imap4/camel-imap4-store.c:1085
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr "無法將資料夾 `%s' 重新命名為 `%s':錯誤的指令"
 
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:1248
+#: ../camel/providers/imap4/camel-imap4-store.c:1432
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr "無法取得 %s 資訊 (樣式 `%s' 於 IMAP 伺服器 %s):%s"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:1250
+#: ../camel/providers/imap4/camel-imap4-store.c:1434
 msgid "Bad command"
 msgstr "錯誤的指令"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:1288
+#: ../camel/providers/imap4/camel-imap4-store.c:1472
 #, fuzzy
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "無法訂閱資料夾 `%s':錯誤的指令"
@@ -3981,7 +4246,7 @@ msgstr "無法訂閱資料夾 `%s':錯誤的指令"
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:1333
+#: ../camel/providers/imap4/camel-imap4-store.c:1517
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "無法訂閱資料夾 `%s':無效的信箱名稱"
@@ -3989,7 +4254,7 @@ msgstr "無法訂閱資料夾 `%s':無效的信箱名稱"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:1338
+#: ../camel/providers/imap4/camel-imap4-store.c:1522
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "無法訂閱資料夾 `%s':錯誤的指令"
@@ -3997,14 +4262,14 @@ msgstr "無法訂閱資料夾 `%s':錯誤的指令"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:1360
+#: ../camel/providers/imap4/camel-imap4-store.c:1544
 #, fuzzy
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "無法取消訂閱資料夾 `%s':錯誤的指令"
 
 # camel/providers/local/camel-mbox-summary.c:655
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:1405
+#: ../camel/providers/imap4/camel-imap4-store.c:1589
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "無法取消訂閱資料夾 `%s':無效的信箱名稱"
@@ -4012,82 +4277,114 @@ msgstr "無法取消訂閱資料夾 `%s':無效的信箱名稱"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-store.c:1410
+#: ../camel/providers/imap4/camel-imap4-store.c:1594
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "無法取消訂閱資料夾 `%s':錯誤的指令"
 
 # mail/mail-ops.c:992
-#: camel/providers/imap4/camel-imap4-summary.c:1294
+#: ../camel/providers/imap4/camel-imap4-summary.c:1497
 #, fuzzy
 msgid "Fetching envelopes for new messages"
 msgstr "檢查新郵件"
 
 # camel/providers/imap/camel-imap-command.c:232
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-utils.c:368
+#: ../camel/providers/imap4/camel-imap4-utils.c:368
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "IMAP 伺服器 %s 的回應發生意外: "
 
 # ui/evolution-tasks.xml.h:3
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-utils.c:391
+#: ../camel/providers/imap4/camel-imap4-utils.c:391
 msgid "No data"
 msgstr "沒有資料"
 
 # camel/camel-remote-store.c:476
 # Novell Translation
-#: camel/providers/imap4/camel-imap4-utils.c:574
+#: ../camel/providers/imap4/camel-imap4-utils.c:574
 #, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP 伺服器 %s 意外中斷連線:%s"
 
+# camel/providers/pop3/camel-pop3-provider.c:37
+#: ../camel/providers/imapp/camel-imapp-provider.c:40
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "郵件儲存空間"
+
+# camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapp/camel-imapp-provider.c:48
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: ../camel/providers/imapp/camel-imapp-provider.c:50
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/imapp/camel-imapp-store.c:251
+#, fuzzy, c-format
+msgid "Could not connect to %s (port %s): %s"
+msgstr "無法連線至 POP 伺服器 %s (埠號 %d): %s"
+
+# camel/providers/pop3/camel-pop3-store.c:322
+#: ../camel/providers/imapp/camel-imapp-store.c:348
+#, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "無法連線到 POP 伺服器 %s"
+
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: camel/providers/local/camel-local-folder.c:179
+#: ../camel/providers/local/camel-local-folder.c:173
 msgid "Index message body data"
 msgstr "傳送郵件給連絡人"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:391
+#: ../camel/providers/local/camel-local-folder.c:378
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # camel/providers/local/camel-mbox-folder.c:203
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:395
-#: camel/providers/local/camel-local-folder.c:398
+#: ../camel/providers/local/camel-local-folder.c:382
+#: ../camel/providers/local/camel-local-folder.c:385
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: camel/providers/local/camel-local-provider.c:45
+#: ../camel/providers/local/camel-local-provider.c:45
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr "使用“.folders”資料夾摘要檔案 (exmh)"
 
 # camel/providers/local/camel-local-provider.c:39
-#: camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "MH-format mail directories"
 msgstr "MH-format 郵件目錄"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: ../camel/providers/local/camel-local-provider.c:53
 msgid "For storing local mail in MH-like mail directories."
 msgstr "用於儲存本地端郵件至 MH-like 郵件目錄。"
 
 # mail/mail-config.glade.h:76
-#: camel/providers/local/camel-local-provider.c:68
+#: ../camel/providers/local/camel-local-provider.c:68
 msgid "Local delivery"
 msgstr "本地端寄送"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
@@ -4095,31 +4392,31 @@ msgstr ""
 "用於自標準 mbox 格式排程器接收(移動)本地端郵件至 Evolution 管理的資料夾。"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/local/camel-local-provider.c:81
-#: camel/providers/local/camel-local-provider.c:100
+#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "Apply filters to new messages in INBOX"
 msgstr "將過濾器套用於 INBOX 裡的新郵件"
 
 # camel/providers/local/camel-local-provider.c:39
-#: camel/providers/local/camel-local-provider.c:88
+#: ../camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format 郵件目錄"
 
-#: camel/providers/local/camel-local-provider.c:89
+#: ../camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "用於儲存本地端郵件至 maildir 目錄。"
 
-#: camel/providers/local/camel-local-provider.c:101
+#: ../camel/providers/local/camel-local-provider.c:101
 msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr "儲存在 Elm/Pine/Mutt 格式中的狀態檔頭"
 
 # mail/mail-config.glade.h:77
-#: camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "Standard Unix mbox spool or directory"
 msgstr "標準 Unix mbox 排程器或目錄"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/local/camel-local-provider.c:109
+#: ../camel/providers/local/camel-local-provider.c:109
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -4128,106 +4425,95 @@ msgstr ""
 "也可以用來讀 Elm 、 Pine 或 Mutt 形式資料夾的樹狀結構。"
 
 # camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:254
-#: camel/providers/local/camel-mbox-store.c:353
-#: camel/providers/local/camel-spool-store.c:117
+#: ../camel/providers/local/camel-local-store.c:150
+#: ../camel/providers/local/camel-local-store.c:261
+#: ../camel/providers/local/camel-mbox-store.c:342
+#: ../camel/providers/local/camel-spool-store.c:125
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
 # camel/providers/local/camel-local-store.c:134
-#: camel/providers/local/camel-local-store.c:150
+#: ../camel/providers/local/camel-local-store.c:157
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:159
-#: camel/providers/local/camel-local-store.c:167
-#: camel/providers/local/camel-local-store.c:265
+#: ../camel/providers/local/camel-local-store.c:166
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:272
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "不能取得資料夾:%s:%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-local-store.c:225
+#: ../camel/providers/local/camel-local-store.c:232
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-local-store.c:334
+#: ../camel/providers/local/camel-local-store.c:341
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s: %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-local-store.c:399
+#: ../camel/providers/local/camel-local-store.c:406
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "無法重新命名“%s”:%s "
 
 # camel/providers/local/camel-local-store.c:279
-#: camel/providers/local/camel-local-store.c:424
-#: camel/providers/local/camel-mbox-store.c:282
+#: ../camel/providers/local/camel-local-store.c:431
+#: ../camel/providers/local/camel-mbox-store.c:271
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "無法刪除資料夾摘要檔案“%s”: %s"
 
 # camel/providers/local/camel-local-store.c:289
-#: camel/providers/local/camel-local-store.c:434
-#: camel/providers/local/camel-mbox-store.c:294
+#: ../camel/providers/local/camel-local-store.c:441
+#: ../camel/providers/local/camel-mbox-store.c:283
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "無法刪除資料夾索引檔案“%s”: %s"
 
 # camel/providers/local/camel-local-store.c:279
 # Novell Translation
-#: camel/providers/local/camel-local-store.c:457
-#: camel/providers/local/camel-mbox-store.c:318
+#: ../camel/providers/local/camel-local-store.c:464
+#: ../camel/providers/local/camel-mbox-store.c:307
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "無法刪除資料夾中繼檔案`%s':%s"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: camel/providers/local/camel-local-summary.c:406
+#: ../camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "無法儲存摘要: %s: %s"
 
 # camel/providers/local/camel-local-summary.c:404
-#: camel/providers/local/camel-local-summary.c:464
+#: ../camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "無法新增郵件到摘要資訊:不明的原因"
 
-# mail/local-config.glade.h:8
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: camel/providers/local/camel-maildir-folder.c:75
-#: camel/providers/local/camel-maildir-store.c:221
-#: camel/providers/local/camel-maildir-store.c:293
-#: camel/providers/local/camel-maildir-store.c:515
-#: camel/providers/local/camel-maildir-store.c:528
-#: camel/providers/local/camel-spool-store.c:452
-msgid "Inbox"
-msgstr "收件匣"
-
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/providers/local/camel-maildir-folder.c:215
+#: ../camel/providers/local/camel-maildir-folder.c:215
 msgid "Maildir append message cancelled"
 msgstr "Maildir 增添郵件已取消"
 
 # camel/providers/local/camel-maildir-folder.c:150
 # camel/providers/local/camel-maildir-folder.c:158
 # camel/providers/local/camel-maildir-folder.c:169
-#: camel/providers/local/camel-maildir-folder.c:218
+#: ../camel/providers/local/camel-maildir-folder.c:218
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "無法將郵件儲存到 maildir 資料夾: %s: %s"
@@ -4235,16 +4521,16 @@ msgstr "無法將郵件儲存到 maildir 資料夾: %s: %s"
 # camel/providers/local/camel-mbox-folder.c:335
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-maildir-folder.c:244
-#: camel/providers/local/camel-maildir-folder.c:258
-#: camel/providers/local/camel-maildir-folder.c:267
-#: camel/providers/local/camel-mbox-folder.c:402
-#: camel/providers/local/camel-mbox-folder.c:421
-#: camel/providers/local/camel-mbox-folder.c:452
-#: camel/providers/local/camel-mbox-folder.c:460
-#: camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/local/camel-mh-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:222
+#: ../camel/providers/local/camel-maildir-folder.c:244
+#: ../camel/providers/local/camel-maildir-folder.c:258
+#: ../camel/providers/local/camel-maildir-folder.c:267
+#: ../camel/providers/local/camel-mbox-folder.c:339
+#: ../camel/providers/local/camel-mbox-folder.c:358
+#: ../camel/providers/local/camel-mbox-folder.c:389
+#: ../camel/providers/local/camel-mbox-folder.c:397
+#: ../camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/local/camel-mh-folder.c:213
+#: ../camel/providers/local/camel-mh-folder.c:222
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4255,17 +4541,17 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:268
 msgid "Invalid message contents"
 msgstr "無效的郵件內文"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/local/camel-maildir-store.c:148
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-mbox-store.c:182
-#: camel/providers/local/camel-mbox-store.c:194
+#: ../camel/providers/local/camel-maildir-store.c:146
+#: ../camel/providers/local/camel-maildir-store.c:171
+#: ../camel/providers/local/camel-mbox-store.c:171
+#: ../camel/providers/local/camel-mbox-store.c:183
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "無法建立資料夾 `%s':%s"
@@ -4273,9 +4559,9 @@ msgstr "無法建立資料夾 `%s':%s"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/local/camel-maildir-store.c:161
-#: camel/providers/local/camel-mbox-store.c:152
-#: camel/providers/local/camel-mh-store.c:205
+#: ../camel/providers/local/camel-maildir-store.c:159
+#: ../camel/providers/local/camel-mbox-store.c:141
+#: ../camel/providers/local/camel-mh-store.c:205
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "無法取得資料夾 `%s':%s"
@@ -4284,16 +4570,16 @@ msgstr "無法取得資料夾 `%s':%s"
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
 # Novell Translation
-#: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/local/camel-mh-store.c:212
+#: ../camel/providers/local/camel-maildir-store.c:163
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mh-store.c:212
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "無法取得資料夾 `%s':資料夾不存在。"
 
 # camel/providers/local/camel-maildir-store.c:122
 # Novell Translation
-#: camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:187
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "無法取得資料夾 `%s':不是 maildir 目錄。"
@@ -4301,65 +4587,65 @@ msgstr "無法取得資料夾 `%s':不是 maildir 目錄。"
 # camel/providers/local/camel-maildir-store.c:151
 # camel/providers/local/camel-maildir-store.c:188
 # camel/providers/local/camel-mh-store.c:127
-#: camel/providers/local/camel-maildir-store.c:236
-#: camel/providers/local/camel-maildir-store.c:274
-#: camel/providers/local/camel-mh-store.c:261
+#: ../camel/providers/local/camel-maildir-store.c:232
+#: ../camel/providers/local/camel-maildir-store.c:270
+#: ../camel/providers/local/camel-mh-store.c:261
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "無法刪除資料夾“%s”: %s"
 
 # camel/providers/local/camel-maildir-store.c:152
-#: camel/providers/local/camel-maildir-store.c:238
+#: ../camel/providers/local/camel-maildir-store.c:234
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:440
-#: camel/providers/local/camel-spool-store.c:319
-#: camel/providers/local/camel-spool-store.c:333
+#: ../camel/providers/local/camel-maildir-store.c:436
+#: ../camel/providers/local/camel-spool-store.c:327
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "無法掃描資料夾“%s”: %s"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: camel/providers/local/camel-maildir-summary.c:425
-#: camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:425
+#: ../camel/providers/local/camel-maildir-summary.c:556
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "不能開啟 maildir 目錄路徑:%s: %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "檢查資料夾的一致性"
 
 # mail/mail-ops.c:992
-#: camel/providers/local/camel-maildir-summary.c:652
+#: ../camel/providers/local/camel-maildir-summary.c:652
 msgid "Checking for new messages"
 msgstr "檢查新郵件"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: camel/providers/local/camel-maildir-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:416
-#: camel/providers/local/camel-mbox-summary.c:589
-#: camel/providers/local/camel-mbox-summary.c:680
-#: camel/providers/local/camel-spool-summary.c:140
+#: ../camel/providers/local/camel-maildir-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:416
+#: ../camel/providers/local/camel-mbox-summary.c:589
+#: ../camel/providers/local/camel-mbox-summary.c:680
+#: ../camel/providers/local/camel-spool-summary.c:140
 msgid "Storing folder"
 msgstr "儲存資料夾"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-mbox-folder.c:210
-#: camel/providers/local/camel-spool-folder.c:176
+#: ../camel/providers/local/camel-mbox-folder.c:147
+#: ../camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "不能建立資料夾鎖定 %s : %s"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#: camel/providers/local/camel-mbox-folder.c:269
+#: ../camel/providers/local/camel-mbox-folder.c:206
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "不能開啟 mailbox:%s: %s\n"
@@ -4368,47 +4654,47 @@ msgstr "不能開啟 mailbox:%s: %s\n"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:266
 msgid "Mail append cancelled"
 msgstr "郵件增添已取消"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: camel/providers/local/camel-mbox-folder.c:332
+#: ../camel/providers/local/camel-mbox-folder.c:269
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "不能將郵件儲存到 mbox 檔案: %s: %s"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: camel/providers/local/camel-mbox-folder.c:453
+#: ../camel/providers/local/camel-mbox-folder.c:390
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
 # camel/providers/local/camel-mbox-folder.c:381
 # Novell Translation
-#: camel/providers/local/camel-mbox-folder.c:461
-#: camel/providers/local/camel-mh-folder.c:223
+#: ../camel/providers/local/camel-mbox-folder.c:398
+#: ../camel/providers/local/camel-mh-folder.c:223
 msgid "Message construction failed."
 msgstr "訊息結構失敗。"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-mbox-store.c:174
-#: camel/providers/local/camel-mbox-store.c:359
+#: ../camel/providers/local/camel-mbox-store.c:163
+#: ../camel/providers/local/camel-mbox-store.c:348
 msgid "Cannot create a folder by this name."
 msgstr "無法建立以此為名的資料夾"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
 # Novell Translation
-#: camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:193
 #, c-format
 msgid "Cannot get folder `%s': not a regular file."
 msgstr "無法取得資料夾 `%s':不是一般檔案。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/local/camel-mbox-store.c:234
-#: camel/providers/local/camel-mbox-store.c:245
-#: camel/providers/local/camel-mbox-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:223
+#: ../camel/providers/local/camel-mbox-store.c:234
+#: ../camel/providers/local/camel-mbox-store.c:257
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -4419,153 +4705,154 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: camel/providers/local/camel-mbox-store.c:253
+#: ../camel/providers/local/camel-mbox-store.c:242
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "“%s”不是一個合法的檔案。"
 
 # camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:249
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "資料夾“%s”內仍有檔案。所以不刪除。"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/providers/local/camel-mbox-store.c:372
+#: ../camel/providers/local/camel-mbox-store.c:361
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "無法建立目錄 %s: %s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-mbox-store.c:386
+#: ../camel/providers/local/camel-mbox-store.c:375
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "不能取得資料夾:%s:%s"
 
 # Novell Translation
-#: camel/providers/local/camel-mbox-store.c:388
+#: ../camel/providers/local/camel-mbox-store.c:377
 msgid "Folder already exists"
 msgstr "資料夾已存在"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: camel/providers/local/camel-mbox-store.c:470
+#: ../camel/providers/local/camel-mbox-store.c:459
 msgid "The new folder name is illegal."
 msgstr "指定的資料夾名稱不合法: %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
 # Novell Translation
-#: camel/providers/local/camel-mbox-store.c:483
+#: ../camel/providers/local/camel-mbox-store.c:472
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "無法重新命名 `%s':`%s':%s"
 
 # camel/providers/local/camel-local-store.c:237
 # Novell Translation
-#: camel/providers/local/camel-mbox-store.c:558
+#: ../camel/providers/local/camel-mbox-store.c:547
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "無法將 '%s' 重新命名成 %s:%s"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: camel/providers/local/camel-mbox-summary.c:422
+#: ../camel/providers/local/camel-mbox-summary.c:422
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "無法開啟資料夾: %s: %s"
 
 # camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-mbox-summary.c:470
+#: ../camel/providers/local/camel-mbox-summary.c:470
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "靠近 %ld (於資料夾 %s)的位置發生嚴重的郵件分析錯誤"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:526
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "不能檢查資料夾:%s: %s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: camel/providers/local/camel-mbox-summary.c:594
-#: camel/providers/local/camel-mbox-summary.c:685
-#: camel/providers/local/camel-spool-summary.c:145
+#: ../camel/providers/local/camel-mbox-summary.c:594
+#: ../camel/providers/local/camel-mbox-summary.c:685
+#: ../camel/providers/local/camel-spool-summary.c:145
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "無法開啟檔案: %s: %s"
 
 # camel/providers/local/camel-mbox-summary.c:524
-#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-spool-summary.c:165
+#: ../camel/providers/local/camel-mbox-summary.c:606
+#: ../camel/providers/local/camel-spool-summary.c:165
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "不能開啟暫存 mailbox:%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-mbox-summary.c:619
-#: camel/providers/local/camel-mbox-summary.c:783
+#: ../camel/providers/local/camel-mbox-summary.c:619
+#: ../camel/providers/local/camel-mbox-summary.c:793
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "無法關閉來源資料夾 %s : %s"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:628
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "無法關閉暫存資料夾: %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:639
+#: ../camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法重新命名資料夾:%s "
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: ../camel/providers/local/camel-mbox-summary.c:696
+#: ../camel/providers/local/camel-mbox-summary.c:904
+#, c-format
+msgid "Could not store folder: %s"
+msgstr "無法儲存資料夾:%s "
+
 # camel/providers/local/camel-mbox-summary.c:549
 # camel/providers/local/camel-mbox-summary.c:557
 # camel/providers/local/camel-mbox-summary.c:746
 # camel/providers/local/camel-mbox-summary.c:754
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:731
-#: camel/providers/local/camel-mbox-summary.c:925
-#: camel/providers/local/camel-mbox-summary.c:933
+#: ../camel/providers/local/camel-mbox-summary.c:733
+#: ../camel/providers/local/camel-mbox-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:935
+#: ../camel/providers/local/camel-mbox-summary.c:943
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "摘要與資料夾不協調,即使經過同步"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/local/camel-mbox-summary.c:859
-#: camel/providers/local/camel-spool-summary.c:337
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤: %s"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:894
-#, c-format
-msgid "Could not store folder: %s"
-msgstr "無法儲存資料夾:%s "
-
 # camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:988
-#: camel/providers/local/camel-mbox-summary.c:1014
+#: ../camel/providers/local/camel-mbox-summary.c:998
+#: ../camel/providers/local/camel-mbox-summary.c:1024
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "寫入暫存郵箱時發生錯誤:%s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-mbox-summary.c:1005
+#: ../camel/providers/local/camel-mbox-summary.c:1015
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "寫入暫存郵箱失敗: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: ../camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH 增添郵件已取消"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "不能將郵件儲存到 mh 資料夾: %s: %s"
@@ -4573,7 +4860,7 @@ msgstr "不能將郵件儲存到 mh 資料夾: %s: %s"
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
 # Novell Translation
-#: camel/providers/local/camel-mh-store.c:220
+#: ../camel/providers/local/camel-mh-store.c:220
 #, c-format
 msgid "Could not create folder `%s': %s"
 msgstr "無法建立資料夾 `%s':%s"
@@ -4581,24 +4868,24 @@ msgstr "無法建立資料夾 `%s':%s"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 # Novell Translation
-#: camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:232
 #, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "無法取得資料夾 `%s':不是目錄。"
 
 # camel/providers/local/camel-mh-summary.c:218
-#: camel/providers/local/camel-mh-summary.c:247
+#: ../camel/providers/local/camel-mh-summary.c:247
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "不能開啟 MH 目錄路徑: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:123
+#: ../camel/providers/local/camel-spool-store.c:131
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "不能開啟排程器“%s”: %s"
 
 # camel/providers/local/camel-local-store.c:134
-#: camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:143
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "排程器“%s”不是正規的檔案或目錄"
@@ -4606,14 +4893,14 @@ msgstr "排程器“%s”不是正規的檔案或目錄"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: camel/providers/local/camel-spool-store.c:154
+#: ../camel/providers/local/camel-spool-store.c:162
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "資料夾“%s/%s”不存在。"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: camel/providers/local/camel-spool-store.c:164
+#: ../camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -4625,14 +4912,14 @@ 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
-#: camel/providers/local/camel-spool-store.c:168
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "資料夾“%s”不存在。"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:181
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -4643,52 +4930,52 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: camel/providers/local/camel-spool-store.c:181
+#: ../camel/providers/local/camel-spool-store.c:189
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "“%s”不是 mailbox 檔案。"
 
-#: camel/providers/local/camel-spool-store.c:198
+#: ../camel/providers/local/camel-spool-store.c:206
 msgid "Store does not support an INBOX"
 msgstr "儲存並不支援 INBOX"
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:218
 #, c-format
 msgid "Spool mail file %s"
 msgstr "排程郵件檔案 %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:218
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "排程資料夾樹狀結構 %s"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: ../camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be renamed"
 msgstr "排程資料夾不能重新命名"
 
-#: camel/providers/local/camel-spool-store.c:226
+#: ../camel/providers/local/camel-spool-store.c:234
 msgid "Spool folders cannot be deleted"
 msgstr "排程資料夾不能刪除"
 
 # camel/camel-movemail.c:158
-#: camel/providers/local/camel-spool-summary.c:178
-#: camel/providers/local/camel-spool-summary.c:188
-#: camel/providers/local/camel-spool-summary.c:198
+#: ../camel/providers/local/camel-spool-summary.c:178
+#: ../camel/providers/local/camel-spool-summary.c:188
+#: ../camel/providers/local/camel-spool-summary.c:198
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "無法與暫存資料夾同步 %s: %s"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-spool-summary.c:214
+#: ../camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "無法與排程資料夾同步 %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:245
-#: camel/providers/local/camel-spool-summary.c:264
-#: camel/providers/local/camel-spool-summary.c:277
+#: ../camel/providers/local/camel-spool-summary.c:245
+#: ../camel/providers/local/camel-spool-summary.c:264
+#: ../camel/providers/local/camel-spool-summary.c:277
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4697,31 +4984,9 @@ msgstr ""
 "無法同步排程資料夾 %s: %s\n"
 "資料夾可能損毀,複製儲存於“%s”"
 
-# camel/providers/smtp/camel-smtp-transport.c:395
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1156
-#, fuzzy, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%s 請輸入 %s@%s 的 SMTP 密碼"
-
-# Novell Translation
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "伺服器拒絕使用者名稱"
-
-# camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "無法連線至 LDAP 伺服器"
-
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "伺服器拒絕使用者名稱/密碼"
-
-# Novell Translation
-#: camel/providers/nntp/camel-nntp-folder.c:177
-#: camel/providers/nntp/camel-nntp-folder.c:209
+#: ../camel/providers/nntp/camel-nntp-folder.c:177
+#: ../camel/providers/nntp/camel-nntp-folder.c:209
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "內部錯誤:uid 格式無效:%s"
@@ -4731,95 +4996,74 @@ msgstr "內部錯誤:uid 格式無效:%s"
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-folder.c:329
-#: camel/providers/nntp/camel-nntp-folder.c:332
-#: camel/providers/nntp/camel-nntp-folder.c:374
-#: camel/providers/nntp/camel-nntp-folder.c:376
+#: ../camel/providers/nntp/camel-nntp-folder.c:329
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/nntp/camel-nntp-folder.c:374
+#: ../camel/providers/nntp/camel-nntp-folder.c:376
 #, c-format
 msgid "Posting failed: %s"
 msgstr "張貼失敗:%s"
 
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-folder.c:394
+#: ../camel/providers/nntp/camel-nntp-folder.c:394
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "離線工作時無法張貼 NNTP 訊息!"
 
 # camel/providers/local/camel-mbox-summary.c:644
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-folder.c:405
+#: ../camel/providers/nntp/camel-nntp-folder.c:405
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "您無法從 NNTP 資料夾複製訊息!"
 
-# camel/camel-movemail.c:306
-#: camel/providers/nntp/camel-nntp-grouplist.c:44
-msgid "Could not get group list from server."
-msgstr "無法取得群組:%s"
-
-# mail/mail-ops.c:1728
-#: camel/providers/nntp/camel-nntp-grouplist.c:97
-#: camel/providers/nntp/camel-nntp-grouplist.c:106
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"無法建立輸出檔案:%s\n"
-" %s"
-
-# mail/mail-ops.c:1728
-#: camel/providers/nntp/camel-nntp-grouplist.c:157
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"無法建立輸出檔案:%s\n"
-" %s"
-
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "以簡短的表示法顯示資料夾 (例如,c.o.linux 而不是 comp.os.linux)"
 
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription dialog, show relative folder names"
 msgstr "在訂閱對話方塊,顯示相關資料夾名稱"
 
 # camel/providers/nntp/camel-nntp-provider.c:42
-#: camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET 新聞"
 
 # camel/providers/nntp/camel-nntp-provider.c:44
-#: camel/providers/nntp/camel-nntp-provider.c:55
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#, fuzzy
+msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "這是讀取與發信至 USERNET 新聞群組的供應者。"
 
 # camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/nntp/camel-nntp-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "這個選項將會使用純文字的密碼驗證 NNTP 伺服器。"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/nntp/camel-nntp-store.c:234
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "無法讀取 %s 的歡迎辭: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:246
+#: ../camel/providers/nntp/camel-nntp-store.c:246
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 伺服器 %s 傳回錯誤代碼 %d : %s"
 
 # camel/providers/nntp/camel-nntp-store.c:286
-#: camel/providers/nntp/camel-nntp-store.c:422
+#: ../camel/providers/nntp/camel-nntp-store.c:423
 #, c-format
 msgid "USENET News via %s"
 msgstr "經由 %s 的 USENET 新聞"
 
 # mail/mail-ops.c:1755
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-store.c:811
+#: ../camel/providers/nntp/camel-nntp-store.c:813
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4831,7 +5075,7 @@ msgstr ""
 "%s"
 
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-store.c:905
+#: ../camel/providers/nntp/camel-nntp-store.c:907
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4842,7 +5086,7 @@ msgstr ""
 "沒有類似的新聞群組。選取的項目可能是父代資料夾。"
 
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-store.c:937
+#: ../camel/providers/nntp/camel-nntp-store.c:939
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4853,77 +5097,83 @@ msgstr ""
 "新聞群組不存在!"
 
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-store.c:962
+#: ../camel/providers/nntp/camel-nntp-store.c:964
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "您無法在「新聞」儲存區建立資料夾:改以訂閱。"
 
 # camel/providers/local/camel-local-store.c:237
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:972
 msgid "You cannot rename a folder in a News store."
 msgstr "您無法在「新聞」儲存區重新命名資料夾。"
 
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:980
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "您無法在「新聞」儲存區移除資料夾:改以取消訂閱。"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-store.c:1148
+#: ../camel/providers/nntp/camel-nntp-store.c:1150
 #, fuzzy
 msgid "Authentication requested but no username provided"
 msgstr "需要驗證,但未提供使用者名稱"
 
+# camel/providers/smtp/camel-smtp-transport.c:395
+#: ../camel/providers/nntp/camel-nntp-store.c:1158
+#, fuzzy, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%s 請輸入 %s@%s 的 SMTP 密碼"
+
 # camel/providers/pop3/camel-pop3-store.c:199
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-store.c:1160
+#: ../camel/providers/nntp/camel-nntp-store.c:1162
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "無法驗證伺服器:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/nntp/camel-nntp-store.c:1276
+#: ../camel/providers/nntp/camel-nntp-store.c:1278
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP 指令失敗: %s"
 
 # ui/evolution-addressbook.xml.h:17
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-store.c:1332
+#: ../camel/providers/nntp/camel-nntp-store.c:1334
 msgid "Not connected."
 msgstr "未連線。"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/nntp/camel-nntp-store.c:1385
+#: ../camel/providers/nntp/camel-nntp-store.c:1387
 #, c-format
 msgid "No such folder: %s"
 msgstr "沒有這個資料夾: %s"
 
 # mail/mail-ops.c:992
-#: camel/providers/nntp/camel-nntp-summary.c:221
-#: camel/providers/nntp/camel-nntp-summary.c:317
+#: ../camel/providers/nntp/camel-nntp-summary.c:221
+#: ../camel/providers/nntp/camel-nntp-summary.c:317
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s:掃描新郵件"
 
 # camel/providers/imap/camel-imap-command.c:232
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-summary.c:228
+#: ../camel/providers/nntp/camel-nntp-summary.c:228
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover 傳來意外的伺服器回應:%s"
 
 # camel/providers/imap/camel-imap-command.c:232
 # Novell Translation
-#: camel/providers/nntp/camel-nntp-summary.c:331
+#: ../camel/providers/nntp/camel-nntp-summary.c:331
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "標題傳來意外的伺服器回應:%s"
 
 # ui/evolution-mail.xml.h:2
-#: camel/providers/nntp/camel-nntp-summary.c:371
+#: ../camel/providers/nntp/camel-nntp-summary.c:371
 msgid "Use cancel"
 msgstr "使用取消"
 
@@ -4931,30 +5181,30 @@ msgstr "使用取消"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/nntp/camel-nntp-summary.c:373
+#: ../camel/providers/nntp/camel-nntp-summary.c:373
 #, c-format
 msgid "Operation failed: %s"
 msgstr "作業失敗: %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: camel/providers/pop3/camel-pop3-folder.c:247
+#: ../camel/providers/pop3/camel-pop3-folder.c:247
 msgid "Retrieving POP summary"
 msgstr "取回 POP 的摘要"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/pop3/camel-pop3-folder.c:266
+#: ../camel/providers/pop3/camel-pop3-folder.c:266
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "不能取得 POP 摘要: %s"
 
 # mail/message-browser.c:199
-#: camel/providers/pop3/camel-pop3-folder.c:309
+#: ../camel/providers/pop3/camel-pop3-folder.c:309
 msgid "Expunging deleted messages"
 msgstr "清空刪除的郵件"
 
 # camel/providers/pop3/camel-pop3-folder.c:292
-#: camel/providers/pop3/camel-pop3-folder.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:405
 #, c-format
 msgid "No message with uid %s"
 msgstr "沒有郵件具有這個 uid %s"
@@ -4962,50 +5212,45 @@ msgstr "沒有郵件具有這個 uid %s"
 # camel/providers/pop3/camel-pop3-folder.c:296
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:412
+#: ../camel/providers/pop3/camel-pop3-folder.c:412
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
 # camel/camel-sasl-login.c:127
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: ../camel/providers/pop3/camel-pop3-folder.c:502
 msgid "Unknown reason"
 msgstr "不明的原因"
 
-# camel/providers/pop3/camel-pop3-provider.c:37
-#: camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
-msgstr "郵件儲存空間"
-
 # camel/providers/pop3/camel-pop3-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "Leave messages on server"
 msgstr "在伺服器保留郵件備份"
 
 # camel/providers/pop3/camel-pop3-provider.c:41
-#: camel/providers/pop3/camel-pop3-provider.c:44
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "刪除 %s 天後的郵件"
 
 # Novell Translation
-#: camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable support for all POP3 extensions"
 msgstr "停止所有 POP3 延伸的支援"
 
 # camel/providers/pop3/camel-pop3-provider.c:48
 # mail/mail-config.glade.h:51
-#: camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP"
 msgstr "POP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "用於連線到 POP 伺服器並下載郵件。"
 
 # camel/providers/pop3/camel-pop3-provider.c:69
-#: camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -5014,7 +5259,7 @@ msgstr ""
 "方式。"
 
 # camel/providers/pop3/camel-pop3-provider.c:79
-#: camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -5025,67 +5270,67 @@ msgstr ""
 
 # camel/providers/pop3/camel-pop3-store.c:199
 # Novell Translation
-#: camel/providers/pop3/camel-pop3-store.c:204
+#: ../camel/providers/pop3/camel-pop3-store.c:204
 #, fuzzy, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "無法從 POP 伺服器 %s (埠 %d) 讀取有效的問候語"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/pop3/camel-pop3-store.c:218
-#: camel/providers/pop3/camel-pop3-store.c:235
-#: camel/providers/pop3/camel-pop3-store.c:245
-#: camel/providers/pop3/camel-pop3-store.c:251
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:245
+#: ../camel/providers/pop3/camel-pop3-store.c:251
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s: %s"
 
 # shell/e-storage.c:477
-#: camel/providers/pop3/camel-pop3-store.c:219
+#: ../camel/providers/pop3/camel-pop3-store.c:219
 #, fuzzy
 msgid "STLS not supported"
 msgstr "不支援 SSL/TLS 擴充機能。"
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: camel/providers/pop3/camel-pop3-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "無法連線到 POP 伺服器 %s"
 
 # camel/providers/pop3/camel-pop3-store.c:409
-#: camel/providers/pop3/camel-pop3-store.c:404
-#: camel/providers/pop3/camel-pop3-store.c:518
+#: ../camel/providers/pop3/camel-pop3-store.c:404
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "無法連線到 POP 伺服器 %s:不支援所要求的驗證機制。"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: ../camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL “%s”登入失敗於 POP 伺服器 %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "不能登入 POP 伺服器 %s: SASL 通訊協定錯誤"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:451
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "無法驗證 POP 伺服器 %s:%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
 # Novell Translation
-#: camel/providers/pop3/camel-pop3-store.c:477
+#: ../camel/providers/pop3/camel-pop3-store.c:477
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%s請輸入 POP 密碼 (%s 於主機 %s)"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: camel/providers/pop3/camel-pop3-store.c:532
-#: camel/providers/pop3/camel-pop3-store.c:545
+#: ../camel/providers/pop3/camel-pop3-store.c:532
+#: ../camel/providers/pop3/camel-pop3-store.c:545
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5096,7 +5341,7 @@ msgstr ""
 
 # camel/providers/pop3/camel-pop3-store.c:417
 # Novell Translation
-#: camel/providers/pop3/camel-pop3-store.c:539
+#: ../camel/providers/pop3/camel-pop3-store.c:539
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5106,248 +5351,248 @@ msgstr ""
 "傳送使用者名稱發生錯誤:%s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: camel/providers/pop3/camel-pop3-store.c:644
+#: ../camel/providers/pop3/camel-pop3-store.c:645
 #, c-format
 msgid "No such folder `%s'."
 msgstr "沒有這個資料夾“%s”。"
 
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:37
 msgid "Sendmail"
 msgstr "Sendmail"
 
 # camel/providers/sendmail/camel-sendmail-provider.c:39
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "將遞送的郵件交給本地端系統上的“sendmail”程式處理。"
 
 # camel/camel-url.c:289
-#: camel/providers/sendmail/camel-sendmail-transport.c:114
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:114
 msgid "Could not parse recipient list"
 msgstr "無法分析收件人清單"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:107
-#: camel/providers/sendmail/camel-sendmail-transport.c:145
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:145
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "無法建立導管到“sendmail”程式: %s:郵件無法傳送"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:124
-#: camel/providers/sendmail/camel-sendmail-transport.c:166
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:166
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "無法另外再啟動一個 sendmail 行程: %s:郵件無法傳送"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:206
 #, c-format
 msgid "Could not send message: %s"
 msgstr "郵件無法傳送: %s"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail 回傳關閉訊息 %s:郵件無法傳送"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: camel/providers/sendmail/camel-sendmail-transport.c:241
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:241
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "無法執行 %s: 郵件無法傳送。"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail 由於狀況 %d 關閉: 郵件無法傳送。"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:247
-#: camel/providers/sendmail/camel-sendmail-transport.c:260
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:260
 msgid "sendmail"
 msgstr "sendmail"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:249
-#: camel/providers/sendmail/camel-sendmail-transport.c:262
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:262
 msgid "Mail delivery via the sendmail program"
 msgstr "經由 sendmail 程式傳送郵件"
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: camel/providers/smtp/camel-smtp-provider.c:38
+#: ../camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP"
 msgstr "SMTP"
 
 # camel/providers/smtp/camel-smtp-provider.c:40
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "使用 SMTP 連線到遠端 mailhub 來傳送郵件。"
 
 # camel/providers/smtp/camel-smtp-transport.c:168
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "語法錯誤,不認識的指令"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "參數內的語法錯誤"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "指令沒有實作"
 
 # camel/providers/smtp/camel-smtp-transport.c:174
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "指令的參數沒有實作"
 
 # camel/providers/smtp/camel-smtp-transport.c:176
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr "系統狀況,或者是系統的求助說明回應"
 
 # camel/providers/smtp/camel-smtp-transport.c:178
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "求助說明訊息"
 
 # camel/providers/smtp/camel-smtp-transport.c:180
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "服務已就緒"
 
 # camel/providers/smtp/camel-smtp-transport.c:182
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "此服務將傳輸通道關閉"
 
 # camel/providers/smtp/camel-smtp-transport.c:184
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr "此服務仍未可用,傳輸通道關閉"
 
 # camel/providers/smtp/camel-smtp-transport.c:186
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr " 所要求的郵件動作已成功完成"
 
 # camel/providers/smtp/camel-smtp-transport.c:188
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr "不是本地端的使用者;將會轉寄至 <轉寄路徑>"
 
 # camel/providers/smtp/camel-smtp-transport.c:190
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "所要求的郵件動作無法執行:郵箱仍未可用"
 
 # camel/providers/smtp/camel-smtp-transport.c:192
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "所要求的動作無法執行:郵箱仍未可用"
 
 # camel/providers/smtp/camel-smtp-transport.c:194
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "所要求的動作已放棄:正在處理時發生錯誤"
 
 # camel/providers/smtp/camel-smtp-transport.c:196
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr "不是本地端的使用者;請嘗試使用 <轉寄路徑>"
 
 # camel/providers/smtp/camel-smtp-transport.c:198
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr "所要求的動作無法執行:系統的儲存空間不足"
 
 # camel/providers/smtp/camel-smtp-transport.c:200
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "所要求的郵件動作已放棄:超出可供儲存空間的限制"
 
 # camel/providers/smtp/camel-smtp-transport.c:202
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "所要求的動作已放棄:不允許的郵箱名稱"
 
 # camel/providers/smtp/camel-smtp-transport.c:204
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "請開始輸入郵件的資料;<CRLF>.<CRLF> 結束撰寫郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "執行失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:210
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: ../camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr "需要密碼傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:212
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr "驗證機制太弱了"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr "所要求的驗證機制必須要加密處理"
 
 # camel/providers/smtp/camel-smtp-transport.c:216
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr "臨時驗證失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 msgid "Welcome response error"
 msgstr "迎接的回應錯誤"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/smtp/camel-smtp-transport.c:325
-#: camel/providers/smtp/camel-smtp-transport.c:358
-#: camel/providers/smtp/camel-smtp-transport.c:364
+#: ../camel/providers/smtp/camel-smtp-transport.c:325
+#: ../camel/providers/smtp/camel-smtp-transport.c:358
+#: ../camel/providers/smtp/camel-smtp-transport.c:364
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 SMTP 伺服器 %s: %s"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: ../camel/providers/smtp/camel-smtp-transport.c:334
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "STARTTLS 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:349
+#: ../camel/providers/smtp/camel-smtp-transport.c:349
 msgid "STARTTLS command failed"
 msgstr "STARTTLS 指令失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:488
+#: ../camel/providers/smtp/camel-smtp-transport.c:491
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP 伺服器 %s 不支援所要求的驗證類型 %s。"
 
 # camel/providers/smtp/camel-smtp-transport.c:395
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:526
+#: ../camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%s請輸入 SMTP 密碼 (%s 於主機 %s)"
 
 # camel/providers/smtp/camel-smtp-transport.c:418
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: ../camel/providers/smtp/camel-smtp-transport.c:548
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5359,121 +5604,121 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: ../camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 伺服器 %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: camel/providers/smtp/camel-smtp-transport.c:671
+#: ../camel/providers/smtp/camel-smtp-transport.c:674
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:689
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: service not connected."
 msgstr "無法傳送訊息:服務未連線。"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: ../camel/providers/smtp/camel-smtp-transport.c:698
 msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件:寄件者的地址無效。"
 
 # mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:699
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Sending message"
 msgstr "傳送郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: ../camel/providers/smtp/camel-smtp-transport.c:717
 msgid "Cannot send message: no recipients defined."
 msgstr "不能傳送郵件:沒有定義收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "不能傳送郵件:一或多個無效的收件者"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: ../camel/providers/smtp/camel-smtp-transport.c:923
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: ../camel/providers/smtp/camel-smtp-transport.c:940
 msgid "HELO command failed"
 msgstr "HELO 指令失敗"
 
 # mail/mail-config.glade.h:10
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: ../camel/providers/smtp/camel-smtp-transport.c:1006
 msgid "SMTP Authentication"
 msgstr "SMTP 驗證"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: camel/providers/smtp/camel-smtp-transport.c:1009
+#: ../camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "Error creating SASL authentication object."
 msgstr "建立 SASL 驗證物件時發生錯誤。"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1026
-#: camel/providers/smtp/camel-smtp-transport.c:1037
+#: ../camel/providers/smtp/camel-smtp-transport.c:1029
+#: ../camel/providers/smtp/camel-smtp-transport.c:1040
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: ../camel/providers/smtp/camel-smtp-transport.c:1046
 msgid "AUTH command failed"
 msgstr "AUTH 指令失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: ../camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Bad authentication response from server.\n"
 msgstr "從伺服器傳回不正確驗證的回應。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:835
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM 指令失敗:%s:郵件未傳送"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1147
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM 指令失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:879
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: ../camel/providers/smtp/camel-smtp-transport.c:1174
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO 指令失敗:%s:郵件未傳送"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: ../camel/providers/smtp/camel-smtp-transport.c:1193
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> 失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:929
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1229
-#: camel/providers/smtp/camel-smtp-transport.c:1287
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: ../camel/providers/smtp/camel-smtp-transport.c:1232
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1309
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA 指令失敗:%s:郵件未傳送"
@@ -5483,44 +5728,320 @@ msgstr "DATA 指令失敗:%s:郵件未傳送"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1246
-#: camel/providers/smtp/camel-smtp-transport.c:1322
+#: ../camel/providers/smtp/camel-smtp-transport.c:1249
+#: ../camel/providers/smtp/camel-smtp-transport.c:1325
 msgid "DATA command failed"
 msgstr "DATA 指令失敗"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: ../camel/providers/smtp/camel-smtp-transport.c:1348
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1364
 msgid "RSET command failed"
 msgstr "RSET 指令失敗"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: ../camel/providers/smtp/camel-smtp-transport.c:1387
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
 # Novell Translation
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: ../camel/providers/smtp/camel-smtp-transport.c:1401
 msgid "QUIT command failed"
 msgstr "QUIT 指令失敗"
 
+# addressbook/contact-editor/e-contact-editor.c:1243
+# addressbook/contact-editor/e-contact-editor.c:1310
+#: ../libedataserver/e-categories.c:237
+msgid "Business"
+msgstr "商務電話"
+
+# calendar/gui/e-calendar-table.c:152
+#: ../libedataserver/e-categories.c:238
+#, fuzzy
+msgid "Competition"
+msgstr "完成日期"
+
+# addressbook/gui/widgets/e-addressbook-view.c:699
+#: ../libedataserver/e-categories.c:239
+#, fuzzy
+msgid "Favorites"
+msgstr "弗羅勒斯"
+
+#: ../libedataserver/e-categories.c:240
+msgid "Gifts"
+msgstr ""
+
+#: ../libedataserver/e-categories.c:241
+msgid "Goals/Objectives"
+msgstr ""
+
+#: ../libedataserver/e-categories.c:242
+#, fuzzy
+msgid "Holiday"
+msgstr "荷迭達"
+
+#: ../libedataserver/e-categories.c:243
+#, fuzzy
+msgid "Holiday Cards"
+msgstr "海瓦德"
+
+# ui/evolution-addressbook.xml.h:17
+#: ../libedataserver/e-categories.c:244
+#, fuzzy
+msgid "Hot Contacts"
+msgstr "連絡人"
+
+#: ../libedataserver/e-categories.c:245
+#, fuzzy
+msgid "Ideas"
+msgstr "雅夕"
+
+#: ../libedataserver/e-categories.c:246
+#, fuzzy
+msgid "International"
+msgstr "國際佛斯"
+
+# ui/evolution-event-editor.xml.h:15
+# ui/evolution-task-editor-dialog.xml.h:16
+#: ../libedataserver/e-categories.c:247
+#, fuzzy
+msgid "Key Customer"
+msgstr "刻斯特"
+
+#: ../libedataserver/e-categories.c:248
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "McClellan"
+
+#: ../libedataserver/e-categories.c:249
+msgid "Personal"
+msgstr "個人"
+
+# calendar/gui/e-meeting-dialog.glade.h:21
+#: ../libedataserver/e-categories.c:250
+#, fuzzy
+msgid "Phone Calls"
+msgstr "達拉斯"
+
+# calendar/gui/e-meeting-dialog.glade.h:23
+# mail/message-list.c:1081
+#: ../libedataserver/e-categories.c:251
+msgid "Status"
+msgstr "狀況"
+
 # calendar/gui/e-calendar-table.c:150
-#: libedataserverui/e-categories-dialog.c:90
+#: ../libedataserver/e-categories.c:252
 #, fuzzy
-msgid "Category Icon"
-msgstr "類別為"
+msgid "Strategies"
+msgstr "類別"
+
+# mail/folder-browser.c:727
+#: ../libedataserver/e-categories.c:253
+#, fuzzy
+msgid "Suppliers"
+msgstr "套用過濾器(_Y)"
+
+# addressbook/backend/ebook/e-card.c:3434
+#: ../libedataserver/e-categories.c:254
+#, fuzzy
+msgid "Time & Expenses"
+msgstr "時區"
+
+#: ../libedataserver/e-categories.c:255
+msgid "VIP"
+msgstr ""
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: ../libedataserver/e-categories.c:256
+#, fuzzy
+msgid "Waiting"
+msgstr "正在等待..."
+
+# calendar/gui/calendar-model.c:797
+# e-util/e-time-utils.c:287
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:179 ../libedataserver/e-time-utils.c:422
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+# calendar/gui/calendar-model.c:794
+# e-util/e-time-utils.c:278
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:184 ../libedataserver/e-time-utils.c:413
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+# e-util/e-time-utils.c:283
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:189 ../libedataserver/e-time-utils.c:418
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %m/%d/%Y %I:%M %p"
+
+# e-util/e-time-utils.c:274
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:194 ../libedataserver/e-time-utils.c:409
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %m/%d/%Y %H:%M"
+
+# e-util/e-time-utils.c:283
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:199
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%a %m/%d/%Y %I %p"
+
+# e-util/e-time-utils.c:274
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:204
+msgid "%a %m/%d/%Y %H"
+msgstr "%a %m/%d/%Y %H"
+
+# e-util/e-time-utils.c:269
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: ../libedataserver/e-time-utils.c:207 ../libedataserver/e-time-utils.c:300
+#: ../libedataserver/e-time-utils.c:404
+msgid "%a %m/%d/%Y"
+msgstr "%a %m/%d/%Y"
+
+# calendar/gui/calendar-model.c:797
+# e-util/e-time-utils.c:287
+#. strptime format of a date and a time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:215
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%m/%d/%Y %I:%M:%S %p"
+
+# calendar/gui/calendar-model.c:794
+# e-util/e-time-utils.c:278
+#. strptime format of a date and a time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:219
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%m/%d/%Y %H:%M:%S"
+
+# e-util/e-time-utils.c:283
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: ../libedataserver/e-time-utils.c:224
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%m/%d/%Y %I:%M %p"
 
-#: libedataserverui/e-categories-dialog.c:236
+# e-util/e-time-utils.c:274
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: ../libedataserver/e-time-utils.c:229
+msgid "%m/%d/%Y %H:%M"
+msgstr "%m/%d/%Y %H:%M"
+
+# e-util/e-time-utils.c:283
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:234
+msgid "%m/%d/%Y %I %p"
+msgstr "%m/%d/%Y %I %p"
+
+# e-util/e-time-utils.c:69
+# e-util/e-time-utils.c:117
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+# widgets/misc/e-dateedit.c:1284
+# widgets/misc/e-dateedit.c:1465
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:239
+msgid "%m/%d/%Y %H"
+msgstr "%m/%d/%Y %H"
+
+# e-util/e-time-utils.c:69
+# e-util/e-time-utils.c:117
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+# widgets/misc/e-dateedit.c:1284
+# widgets/misc/e-dateedit.c:1465
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#: ../libedataserver/e-time-utils.c:242 ../libedataserver/e-time-utils.c:303
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
+# e-util/e-time-utils.c:323
+#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
+#: ../libedataserver/e-time-utils.c:348 ../libedataserver/e-time-utils.c:467
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+# e-util/e-time-utils.c:315
+#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
+#: ../libedataserver/e-time-utils.c:352 ../libedataserver/e-time-utils.c:459
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+# e-util/e-time-utils.c:320
+# widgets/misc/e-dateedit.c:1262
+# widgets/misc/e-dateedit.c:1321
+# widgets/misc/e-dateedit.c:1500
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: ../libedataserver/e-time-utils.c:357 ../libedataserver/e-time-utils.c:464
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+# e-util/e-time-utils.c:312
+# widgets/misc/e-dateedit.c:1259
+# widgets/misc/e-dateedit.c:1318
+# widgets/misc/e-dateedit.c:1497
+#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: ../libedataserver/e-time-utils.c:361 ../libedataserver/e-time-utils.c:456
+msgid "%H:%M"
+msgstr "%H:%M"
+
+# e-util/e-time-utils.c:320
+# widgets/misc/e-dateedit.c:1262
+# widgets/misc/e-dateedit.c:1321
+# widgets/misc/e-dateedit.c:1500
+#. strptime format for hour and AM/PM, 12-hour format.
+#: ../libedataserver/e-time-utils.c:365
+msgid "%I %p"
+msgstr "%I %p"
+
+#: ../libedataserverui/e-book-auth-util.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "正以匿名方式存取 LDAP 伺服器"
+
+#: ../libedataserverui/e-book-auth-util.c:185
+msgid "Failed to authenticate.\n"
+msgstr "驗證憑證失敗。\n"
+
+#: ../libedataserverui/e-categories-dialog.c:259
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
@@ -5528,45 +6049,51 @@ msgid ""
 msgstr ""
 
 # calendar/gui/e-tasks.c:155
-#: libedataserverui/e-categories-dialog.c:391
+#: ../libedataserverui/e-categories-dialog.c:423
 #, fuzzy
 msgid "Category"
 msgstr "類別(_C):"
 
+# calendar/gui/e-calendar-table.c:150
+#: ../libedataserverui/e-categories-dialog.glade.h:1
+#, fuzzy
+msgid "Category Icon"
+msgstr "類別為"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-categories-dialog.glade.h:2
 #, fuzzy
 msgid "Category Properties"
 msgstr "iCalendar 錯誤"
 
 # calendar/gui/e-calendar-table.c:150
-#: libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.glade.h:3
 #, fuzzy
 msgid "Category _Color"
 msgstr "類別為"
 
 # calendar/gui/e-calendar-table.c:150
-#: libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.glade.h:4
 #, fuzzy
 msgid "Category _Icon"
 msgstr "類別為"
 
 # calendar/gui/e-calendar-table.c:150
-#: libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.glade.h:5
 #, fuzzy
 msgid "Category _Name"
 msgstr "類別為"
 
 # addressbook/contact-editor/e-contact-editor.c:603
-#: libedataserverui/e-categories-dialog.glade.h:5
+#: ../libedataserverui/e-categories-dialog.glade.h:6
 #, fuzzy
 msgid "Item(s) belong to these _categories:"
 msgstr "此連絡人屬於這些類別:"
 
 # calendar/gui/e-calendar-table.c:150
 # Novell Translation
-#: libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.glade.h:7
 #, fuzzy
 msgid "_Available Categories:"
 msgstr "類別(_C)"
@@ -5577,99 +6104,252 @@ msgstr "類別(_C)"
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.glade.h:8
 msgid "_Edit"
 msgstr "編輯 (_E)"
 
 # calendar/gui/e-calendar-table.c:150
-#: libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.glade.h:9
 #, fuzzy
 msgid "categories"
 msgstr "類別"
 
 # Novell Translation
-#: libedataserverui/e-name-selector-dialog.c:184
+#: ../libedataserverui/e-name-selector-dialog.c:200
 msgid "Select Contacts from Address Book"
 msgstr "從通訊錄選取連絡人"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+msgid "\t\t\t\t\t\t"
+msgstr ""
+
+#: ../libedataserverui/e-name-selector-dialog.glade.h:2
 msgid "*"
 msgstr "*"
 
+# ui/evolution-addressbook.xml.h:17
+# Novell Translation
+#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+msgid "<b>Show Contacts</b>"
+msgstr "<b>顯示連絡人</b>"
+
 # Novell Translation
-#: libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Contacts</b>"
+#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#, fuzzy
+msgid "<b>_Contacts</b>"
 msgstr "<b>連絡人</b>"
 
-# ui/evolution-addressbook.xml.h:17
+# importers/pine-importer.c:661
 # Novell Translation
-#: libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>顯示連絡人</b>"
+#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#, fuzzy
+msgid "Address Book"
+msgstr "通訊錄(_B):"
 
 # importers/pine-importer.c:661
 # Novell Translation
-#: libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Address _Book:"
 msgstr "通訊錄(_B):"
 
+# ui/evolution-addressbook.xml.h:17
+#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+msgid "Contacts"
+msgstr "連絡人"
+
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#: ../libedataserverui/e-name-selector-dialog.glade.h:8
+msgid "Search"
+msgstr "搜尋"
+
 # mail/mail-search-dialogue.c:113
 # Novell Translation
-#: libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.glade.h:9
 msgid "_Search:"
 msgstr "搜尋(_S):"
 
+# addressbook/gui/component/addressbook-config.c:352
+# mail/mail-config.glade.h:60
+#: ../libedataserverui/e-passwords.c:471
+msgid "_Remember this password"
+msgstr "記住這個密碼(_R)"
+
+#: ../libedataserverui/e-passwords.c:472
+msgid "_Remember this password for the remainder of this session"
+msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
+
 # shell/e-shell-importer.c:602
 # Novell Translation
 #. prepare the dialog
-#: libedataserverui/e-source-selector-dialog.c:101
+#: ../libedataserverui/e-source-selector-dialog.c:101
 msgid "Select destination"
 msgstr "選取目的地"
 
 # ui/evolution.xml.h:47
 # Novell Translation
-#: libedataserverui/e-source-selector-dialog.c:154
+#: ../libedataserverui/e-source-selector-dialog.c:154
 msgid "_Destination"
 msgstr "目的地(_D)"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
 # Novell Translation
-#: servers/groupwise/e-gw-connection.c:152
+#: ../servers/groupwise/e-gw-connection.c:158
 msgid "Invalid connection"
 msgstr "無效的連線"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
 # Novell Translation
-#: servers/groupwise/e-gw-connection.c:156
+#: ../servers/groupwise/e-gw-connection.c:162
 msgid "Invalid response from server"
 msgstr "無效的伺服器回應"
 
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:433
+# Novell Translation
+#: ../servers/groupwise/e-gw-connection.c:164
+#, fuzzy
+msgid "No response from the server"
+msgstr "無效的伺服器回應"
+
 # Novell Translation
-#: servers/groupwise/e-gw-connection.c:162
+#: ../servers/groupwise/e-gw-connection.c:170
 msgid "Bad parameter"
 msgstr "錯誤的參數"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 # Novell Translation
-#: src/GNOME_Evolution_DataServer.server.in.in.h:1
+#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
 msgid "Evolution Addressbook file backend"
 msgstr "Evolution 通訊錄檔案後端"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 # Novell Translation
-#: src/GNOME_Evolution_DataServer.server.in.in.h:2
+#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
 msgid "Evolution Calendar file and webcal backend"
 msgstr "Evolution 行事曆檔案及 webcal 後端"
 
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Data Server interface check service"
+msgstr "聲音提醒服務的元件工廠"
+
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Data Server logging service"
+msgstr "聲音提醒服務的元件工廠"
+
 # Novell Translation
 #. dialog display isn't working out
-#: src/server.c:101
+#: ../src/server.c:101
 #, c-format
 msgid "Multiple segmentation faults occurred; can't display error dialog\n"
 msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+# Novell Translation
+#~ msgid "e_book_open: cancelled"
+#~ msgstr "e_book_open:已取消"
+
+# Novell Translation
+#~ msgid "e_book_load_uri: no factories available for uri `%s'"
+#~ msgstr "e_book_load_uri:uri `%s' 沒有可用的製造廠"
+
+# addressbook/gui/widgets/e-addressbook-view.c:699
+#~ msgid "File As"
+#~ msgstr "歸檔為"
+
+# shell/e-shell-view-menu.c:602
+# shell/e-shell-view-menu.c:614
+# Novell Translation
+#, fuzzy
+#~ msgid "Repository is Offline"
+#~ msgstr "容器已離線"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#, fuzzy
+#~ msgid ""
+#~ "Failed to GPG %s: %s\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法 GPG %s: %s\n"
+#~ "\n"
+#~ "%.*s"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#~ msgid "Failed to GPG %s: %s\n"
+#~ msgstr "無法 GPG %s: %s\n"
+
+# importers/pine-importer.c:661
+# Novell Translation
+#~ msgid "Address Book and Calendar"
+#~ msgstr "通訊錄和行事曆"
+
+# Novell Translation
+#~ msgid "Post Office Agent:"
+#~ msgstr "郵局代辦:"
+
+# mail/mail-config.glade.h:79
+# Novell Translation
+#~ msgid "Use Secure Connection (SSL)"
+#~ msgstr "使用安全連線 (SSL)"
+
+# Novell Translation
+#, fuzzy
+#~ msgid "Groupwise server %s"
+#~ msgstr "Groupwise Id 清單"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#~ msgid "Tasks"
+#~ msgstr "工作"
+
+#~ msgid "Checklist"
+#~ msgstr "濃靄"
+
+# camel/camel-smime-context.c:194
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
+
+# Novell Translation
+#~ msgid "Server rejected username"
+#~ msgstr "伺服器拒絕使用者名稱"
+
+# camel/providers/imap/camel-imap-store.c:531
+#~ msgid "Failed to send username to server"
+#~ msgstr "無法連線至 LDAP 伺服器"
+
+# Novell Translation
+#~ msgid "Server rejected username/password"
+#~ msgstr "伺服器拒絕使用者名稱/密碼"
+
+# camel/camel-movemail.c:306
+#~ msgid "Could not get group list from server."
+#~ msgstr "無法取得群組:%s"
+
+# mail/mail-ops.c:1728
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr ""
+#~ "無法建立輸出檔案:%s\n"
+#~ " %s"
+
+# mail/mail-ops.c:1728
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr ""
+#~ "無法建立輸出檔案:%s\n"
+#~ " %s"
+
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 # Novell Translation
 #~ msgid "Evolution Addressbook file and LDAP backend"
@@ -5842,9 +6522,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Unable to open addressbook"
 #~ msgstr "無法開啟目錄服務"
 
-#~ msgid "Accessing LDAP Server anonymously"
-#~ msgstr "正以匿名方式存取 LDAP 伺服器"
-
 #~ msgid "Name begins with"
 #~ msgstr "名稱開始於"
 
@@ -5903,10 +6580,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Configure access to LDAP directory servers here"
 #~ msgstr "在這裡設定對 LDAP 目錄的存取"
 
-# ui/evolution-addressbook.xml.h:17
-#~ msgid "Contacts"
-#~ msgstr "連絡人"
-
 #~ msgid "Directory Servers"
 #~ msgstr "目錄伺服器"
 
@@ -7369,11 +8042,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ "您確定要刪除\n"
 #~ "這個連絡人?"
 
-# addressbook/contact-editor/e-contact-editor.c:1243
-# addressbook/contact-editor/e-contact-editor.c:1310
-#~ msgid "Business"
-#~ msgstr "商務電話"
-
 # addressbook/contact-editor/e-contact-editor.c:1249
 # addressbook/contact-editor/e-contact-editor.c:1311
 #~ msgid "Home"
@@ -8352,10 +9020,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Do not ask me about this program again."
 #~ msgstr "不要再詢問我關於這個程式。"
 
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-#~ msgid "Evolution Calendar alarm notification service"
-#~ msgstr "聲音提醒服務的元件工廠"
-
 # addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 # addressbook/backend/ebook/load-pine-addressbook.c:22
 # addressbook/backend/ebook/test-client-list.c:23
@@ -8448,9 +9112,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "New Calendar"
 #~ msgstr "新喀里多尼亞島"
 
-#~ msgid "Personal"
-#~ msgstr "個人"
-
 #~ msgid "Work"
 #~ msgstr "工作"
 
@@ -8695,11 +9356,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Show week _numbers in date navigator"
 #~ msgstr "在日期導覽顯示週數(_N)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-# calendar/gui/event-editor.c:481
-#~ msgid "Sunday"
-#~ msgstr "星期日"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #~ msgid "T_asks due today:"
 #~ msgstr "今天到期的工作(_A):"
@@ -9168,11 +9824,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "RSVP"
 #~ msgstr "RSVP"
 
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
-#~ msgid "Status"
-#~ msgstr "狀況"
-
 # calendar/gui/e-itip-control.glade.h:9
 #~ msgid "Organizer:"
 #~ msgstr "會議召集人:"
@@ -9790,10 +10441,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Alarms"
 #~ msgstr "提醒"
 
-# calendar/gui/e-calendar-table.c:152
-#~ msgid "Completion Date"
-#~ msgstr "完成日期"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
 #~ msgid "Due Date"
@@ -9818,16 +10465,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "URL"
 #~ msgstr "網址 URL"
 
-# calendar/gui/calendar-model.c:794
-# e-util/e-time-utils.c:278
-#~ msgid "%a %m/%d/%Y %H:%M:%S"
-#~ msgstr "%a %m/%d/%Y %H:%M:%S"
-
-# calendar/gui/calendar-model.c:797
-# e-util/e-time-utils.c:287
-#~ msgid "%a %m/%d/%Y %I:%M:%S %p"
-#~ msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
 # calendar/gui/calendar-model.c:802
 #~ msgid ""
 #~ "The date must be entered in the format: \n"
@@ -10291,20 +10928,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "%A, %B %d, %Y"
 #~ msgstr "%A, %B %d, %Y"
 
-# e-util/e-time-utils.c:269
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-#~ msgid "%a %m/%d/%Y"
-#~ msgstr "%a %m/%d/%Y"
-
-# e-util/e-time-utils.c:69
-# e-util/e-time-utils.c:117
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-# widgets/misc/e-dateedit.c:1284
-# widgets/misc/e-dateedit.c:1465
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%m/%d/%Y"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
 #~ msgid "Out of Office"
 #~ msgstr "不在辦公室"
@@ -11991,14 +12614,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ "\""
 #~ msgstr "資料夾名稱“%s”無效,因為它包含字元“%c”"
 
-# camel/providers/imap/camel-imap-provider.c:63
-#~ msgid "IMAP+"
-#~ msgstr "IMAP"
-
-# camel/providers/pop3/camel-pop3-store.c:322
-#~ msgid "Could not connect to POP server on %s"
-#~ msgstr "無法連線到 POP 伺服器 %s"
-
 # camel/providers/local/camel-maildir-store.c:122
 #~ msgid "`%s' is not a maildir directory."
 #~ msgstr "“%s”不是一個 maildir 目錄。"
@@ -12039,11 +12654,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "不明的伺服器回應: %s"
 
-# camel/camel-remote-store.c:255
-# camel/providers/smtp/camel-smtp-transport.c:269
-#~ msgid "Could not connect to POP server %s (port %d): %s"
-#~ msgstr "無法連線至 POP 伺服器 %s (埠號 %d): %s"
-
 # camel/providers/smtp/camel-smtp-provider.c:40
 #~ msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 #~ msgstr "使用 SMTP 通訊協定連線到遠端的 mailhub 來傳送郵件。\n"
@@ -12171,10 +12781,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Attachment Properties"
 #~ msgstr "附件內容"
 
-# composer/e-msg-composer-attachment.glade.h:4
-#~ msgid "File name:"
-#~ msgstr "檔案名稱:"
-
 # composer/e-msg-composer-attachment.glade.h:6
 #~ msgid "MIME type:"
 #~ msgstr "MIME 類型:"
@@ -12476,81 +13082,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Sync Categories:"
 #~ msgstr "同步類別:"
 
-# e-util/e-time-utils.c:283
-#~ msgid "%a %m/%d/%Y %I:%M %p"
-#~ msgstr "%a %m/%d/%Y %I:%M %p"
-
-# e-util/e-time-utils.c:274
-#~ msgid "%a %m/%d/%Y %H:%M"
-#~ msgstr "%a %m/%d/%Y %H:%M"
-
-# e-util/e-time-utils.c:283
-#~ msgid "%a %m/%d/%Y %I %p"
-#~ msgstr "%a %m/%d/%Y %I %p"
-
-# e-util/e-time-utils.c:274
-#~ msgid "%a %m/%d/%Y %H"
-#~ msgstr "%a %m/%d/%Y %H"
-
-# calendar/gui/calendar-model.c:797
-# e-util/e-time-utils.c:287
-#~ msgid "%m/%d/%Y %I:%M:%S %p"
-#~ msgstr "%m/%d/%Y %I:%M:%S %p"
-
-# calendar/gui/calendar-model.c:794
-# e-util/e-time-utils.c:278
-#~ msgid "%m/%d/%Y %H:%M:%S"
-#~ msgstr "%m/%d/%Y %H:%M:%S"
-
-# e-util/e-time-utils.c:283
-#~ msgid "%m/%d/%Y %I:%M %p"
-#~ msgstr "%m/%d/%Y %I:%M %p"
-
-# e-util/e-time-utils.c:274
-#~ msgid "%m/%d/%Y %H:%M"
-#~ msgstr "%m/%d/%Y %H:%M"
-
-# e-util/e-time-utils.c:283
-#~ msgid "%m/%d/%Y %I %p"
-#~ msgstr "%m/%d/%Y %I %p"
-
-# e-util/e-time-utils.c:69
-# e-util/e-time-utils.c:117
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-# widgets/misc/e-dateedit.c:1284
-# widgets/misc/e-dateedit.c:1465
-#~ msgid "%m/%d/%Y %H"
-#~ msgstr "%m/%d/%Y %H"
-
-# e-util/e-time-utils.c:323
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-# e-util/e-time-utils.c:315
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-# e-util/e-time-utils.c:320
-# widgets/misc/e-dateedit.c:1262
-# widgets/misc/e-dateedit.c:1321
-# widgets/misc/e-dateedit.c:1500
-#~ msgid "%I:%M %p"
-#~ msgstr "%I:%M %p"
-
-# e-util/e-time-utils.c:312
-# widgets/misc/e-dateedit.c:1259
-# widgets/misc/e-dateedit.c:1318
-# widgets/misc/e-dateedit.c:1497
-#~ msgid "%H:%M"
-#~ msgstr "%H:%M"
-
-# e-util/e-time-utils.c:320
-# widgets/misc/e-dateedit.c:1262
-# widgets/misc/e-dateedit.c:1321
-# widgets/misc/e-dateedit.c:1500
-#~ msgid "%I %p"
-#~ msgstr "%I %p"
-
 # calendar/gui/event-editor.c:1565
 #~ msgid "1 second ago"
 #~ msgstr "1 秒"
@@ -13189,10 +13720,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Add Sender to Address_book"
 #~ msgstr "新增寄件者到目錄服務(_B)"
 
-# mail/folder-browser.c:727
-#~ msgid "Appl_y Filters"
-#~ msgstr "套用過濾器(_Y)"
-
 # mail/folder-browser.c:731
 #~ msgid "Crea_te Rule From Message"
 #~ msgstr "從郵件建立規則(_T)"
@@ -13641,11 +14168,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Starting import"
 #~ msgstr "開始匯入"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#~ msgid "Settings"
-#~ msgstr "設定"
-
 #~ msgid "Mail Filters"
 #~ msgstr "郵件規則"
 
@@ -14460,11 +14982,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "_Receiving Mail"
 #~ msgstr "接收郵件(_R)"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
-#~ msgid "_Reply style:"
-#~ msgstr "回覆方式(_R):"
-
 #~ msgid "_Restore defaults"
 #~ msgstr "還原預設值(_R)"
 
@@ -14655,10 +15172,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ "不能建立輸出檔案:%s:\n"
 #~ " %s"
 
-# mail/mail-ops.c:1872
-#~ msgid "Could not write data: %s"
-#~ msgstr "無法寫入資料:%s"
-
 # mail/mail-ops.c:1939
 #~ msgid "Disconnecting from %s"
 #~ msgstr "中斷與 %s 的連線"
@@ -14679,11 +15192,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Find:"
 #~ msgstr "尋找:"
 
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
-#~ msgid "Search"
-#~ msgstr "搜尋"
-
 # mail/mail-send-recv.c:138
 #~ msgid "Cancelling..."
 #~ msgstr "正在取消..."
@@ -14711,11 +15219,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Updating..."
 #~ msgstr "正在更新..."
 
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
-#~ msgid "Waiting..."
-#~ msgstr "正在等待..."
-
 # mail/mail-session.c:161
 #~ msgid "User canceled operation."
 #~ msgstr "使用者取消動作。"
@@ -14733,14 +15236,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Enter Password"
 #~ msgstr "輸入密碼"
 
-# addressbook/gui/component/addressbook-config.c:352
-# mail/mail-config.glade.h:60
-#~ msgid "_Remember this password"
-#~ msgstr "記住這個密碼(_R)"
-
-#~ msgid "_Remember this password for the remainder of this session"
-#~ msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
-
 # mail/mail-crypto.c:59
 #~ msgid "Could not save signature file: %s"
 #~ msgstr "無法儲存簽名檔: %s"
@@ -17570,10 +18065,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Select a Time Zone"
 #~ msgstr "選擇一個時區"
 
-# addressbook/backend/ebook/e-card.c:3434
-#~ msgid "Time Zones"
-#~ msgstr "時區"
-
 #~ msgid ""
 #~ "Use the left mouse button to zoom in on an area of the map and select a "
 #~ "time zone.\n"
@@ -17744,11 +18235,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Text"
 #~ msgstr "文字"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#~ msgid "Clear"
-#~ msgstr "清除"
-
 # addressbook/gui/component/addressbook-config.c:349
 #~ msgid "Find Now"
 #~ msgstr "立即搜尋"
@@ -20046,10 +20532,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Cocos Island"
 #~ msgstr "可可斯群島"
 
-# addressbook/printing/e-contact-print.glade.h:4
-#~ msgid "Cody"
-#~ msgstr "科第"
-
 #~ msgid "Coeur d'Alene"
 #~ msgstr "科達恩"
 
@@ -20254,11 +20736,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Curitiba Apt"
 #~ msgstr "古里提巴 Apt"
 
-# ui/evolution-event-editor.xml.h:15
-# ui/evolution-task-editor-dialog.xml.h:16
-#~ msgid "Custer"
-#~ msgstr "刻斯特"
-
 #~ msgid "Cut Bank"
 #~ msgstr "刻特班"
 
@@ -20802,11 +21279,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Farmville"
 #~ msgstr "法姆維"
 
-# mail/mail-format.c:756
-# mail/message-list.c:1082
-#~ msgid "Faro"
-#~ msgstr "法洛"
-
 #~ msgid "Fayetteville"
 #~ msgstr "費頁特維"
 
@@ -20858,10 +21330,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Florennes"
 #~ msgstr "弗羅倫內斯"
 
-# addressbook/gui/widgets/e-addressbook-view.c:699
-#~ msgid "Flores"
-#~ msgstr "弗羅勒斯"
-
 #~ msgid "Florianopolis"
 #~ msgstr "弗羅略拿坡里"
 
@@ -21519,9 +21987,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Hays"
 #~ msgstr "海伊斯"
 
-#~ msgid "Hayward"
-#~ msgstr "海瓦德"
-
 #~ msgid "Healy River"
 #~ msgstr "Healy River"
 
@@ -21577,9 +22042,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Ho Chi Minh"
 #~ msgstr "胡志明市"
 
-#~ msgid "Hodeidah"
-#~ msgstr "荷迭達"
-
 #~ msgid "Hof"
 #~ msgstr "荷夫"
 
@@ -21702,9 +22164,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Hyeres-Le Palyvestre"
 #~ msgstr "耶爾-Le Palyvestre"
 
-#~ msgid "Iasi"
-#~ msgstr "雅夕"
-
 #~ msgid "Ibiza"
 #~ msgstr "伊比札"
 
@@ -21757,9 +22216,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Innsbruck"
 #~ msgstr "印斯布魯克"
 
-#~ msgid "International Falls"
-#~ msgstr "國際佛斯"
-
 #~ msgid "Intracoastal"
 #~ msgstr "Intracoastal"
 
@@ -22909,9 +23365,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "McCarthy"
 #~ msgstr "McCarthy"
 
-#~ msgid "McClellan"
-#~ msgstr "McClellan"
-
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
@@ -25230,10 +25683,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Sedalia"
 #~ msgstr "塞達里亞"
 
-# mail/message-list.c:678
-#~ msgid "Seeb"
-#~ msgstr "Seeb"
-
 #~ msgid "Selanik"
 #~ msgstr "Selanik"
 
@@ -25880,10 +26329,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Texas"
 #~ msgstr "德克薩斯"
 
-# calendar/gui/e-meeting-dialog.glade.h:21
-#~ msgid "The Dalles"
-#~ msgstr "達拉斯"
-
 #~ msgid "Thessaloniki"
 #~ msgstr "塞薩羅尼基"
 
@@ -26625,9 +27070,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Windsor Locks"
 #~ msgstr "Windsor Locks"
 
-#~ msgid "Wink"
-#~ msgstr "文克"
-
 #~ msgid "Winnemucca"
 #~ msgstr "溫尼木卡"
 
@@ -26921,10 +27363,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "There was an error downloading data for"
 #~ msgstr "下載此資料時發生錯誤"
 
-# calendar/gui/event-editor-dialog.glade.h:33
-#~ msgid "Weather"
-#~ msgstr "天氣"
-
 #~ msgid "KBOS"
 #~ msgstr "RCSS:VHHH"
 
@@ -27048,9 +27486,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "North - Northwest"
 #~ msgstr "北北西"
 
-#~ msgid "Drizzle"
-#~ msgstr "毛毛雨"
-
 #~ msgid "Drizzle in the vicinity"
 #~ msgstr "附近地區有毛毛雨"
 
@@ -27072,9 +27507,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Partial drizzle"
 #~ msgstr "局部毛毛雨"
 
-#~ msgid "Thunderstorm"
-#~ msgstr "雷暴"
-
 #~ msgid "Windy drizzle"
 #~ msgstr "有風的毛毛雨"
 
@@ -27085,14 +27517,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Drifting drizzle"
 #~ msgstr "漂毛毛雨"
 
-#~ msgid "Freezing drizzle"
-#~ msgstr "凍毛毛雨"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#~ msgid "Rain"
-#~ msgstr "下雨"
-
 #~ msgid "Rain in the vicinity"
 #~ msgstr "附近地區有雨"
 
@@ -27117,20 +27541,10 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Blowing rainfall"
 #~ msgstr "吹降雨"
 
-#~ msgid "Rain showers"
-#~ msgstr "陣雨"
-
 # calendar/gui/gnome-cal.c:235
 #~ msgid "Drifting rain"
 #~ msgstr "漂雨"
 
-# ui/evolution-task-editor-dialog.xml.h:24
-#~ msgid "Freezing rain"
-#~ msgstr "凍雨"
-
-#~ msgid "Snow"
-#~ msgstr "下雪"
-
 #~ msgid "Snow in the vicinity"
 #~ msgstr "附近地區下雪"
 
@@ -27155,15 +27569,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Snowstorm"
 #~ msgstr "暴風雪"
 
-#~ msgid "Blowing snowfall"
-#~ msgstr "吹降雪"
-
-#~ msgid "Snow showers"
-#~ msgstr "陣雪"
-
-#~ msgid "Drifting snow"
-#~ msgstr "漂雪"
-
 #~ msgid "Freezing snow"
 #~ msgstr "凍雪"
 
@@ -27375,9 +27780,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Shallow precipitation"
 #~ msgstr "淺降水"
 
-#~ msgid "Patches of precipitation"
-#~ msgstr "小塊的降水"
-
 #~ msgid "Partial precipitation"
 #~ msgstr "局部降水"
 
@@ -27431,9 +27833,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Freezing mist"
 #~ msgstr "凍靄"
 
-#~ msgid "Fog"
-#~ msgstr "霧"
-
 #~ msgid "Fog in the vicinity"
 #~ msgstr "附近地區有霧"
 
@@ -27465,9 +27864,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Freezing fog"
 #~ msgstr "凍霧"
 
-#~ msgid "Smoke"
-#~ msgstr "煙"
-
 #~ msgid "Smoke in the vicinity"
 #~ msgstr "附近地區有煙"
 
@@ -27563,10 +27959,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Drifting sand"
 #~ msgstr "漂沙塵"
 
-# addressbook/printing/e-contact-print.glade.h:11
-#~ msgid "Haze"
-#~ msgstr "霾"
-
 #~ msgid "Haze in the vicinity"
 #~ msgstr "附近地區有霾"
 
@@ -27630,10 +28022,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Freezing spray"
 #~ msgstr "凍飛沫"
 
-# calendar/gui/goto-dialog.glade.h:2
-#~ msgid "Dust"
-#~ msgstr "微塵"
-
 #~ msgid "Dust in the vicinity"
 #~ msgstr "附近地區有微塵"
 
@@ -27775,9 +28163,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Patches of funnel clouds"
 #~ msgstr "小塊的漏斗雲"
 
-#~ msgid "Partial funnel clouds"
-#~ msgstr "局部有漏斗雲"
-
 #~ msgid "Funnel cloud w/ wind"
 #~ msgstr "有風的漏斗雲"
 
@@ -27888,11 +28273,6 @@ msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
 #~ msgid "Tasks "
 #~ msgstr "工作 "
 
-# ui/evolution-event-editor.xml.h:9
-# ui/evolution-task-editor-dialog.xml.h:10
-#~ msgid "Weather Settings"
-#~ msgstr "天氣設定"
-
 #~ msgid "_Delete Feed"
 #~ msgstr "已刪除"