aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_TW.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-10-29 06:50:05 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-10-29 06:50:05 +0800
commita67d38de266a4009a949138e632e720df00631f6 (patch)
tree94d905e58b9badbd56d529fab0cf9489a7214687 /po/zh_TW.po
parent3a11574695e84d795dd0e5e7cf133d92f0f23dfa (diff)
downloadgsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.gz
gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.zst
gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.zip
Sync for 1.1.90.
svn path=/trunk/; revision=18465
Diffstat (limited to 'po/zh_TW.po')
-rw-r--r--po/zh_TW.po2174
1 files changed, 1121 insertions, 1053 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6f9a71f647..779b85d761 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.16.99\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\n"
"PO-Revision-Date: 2001-09-10 09:55+0800\n"
"Last-Translator: Joe Man <trmetal@yahoo.com.hk>\n"
"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -38,25 +38,26 @@ msgstr "¶×¤J VCard Àɮרì Evolution¡C"
# addressbook/gui/widgets/e-addressbook-view.c:699
#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
msgid "File As"
msgstr "ÂkÀɬ°"
# addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
msgid "Name"
msgstr "¦WºÙ"
# addressbook/gui/widgets/e-addressbook-view.c:701
#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
msgid "Email"
msgstr "¹q¤l¶l¥ó"
# addressbook/contact-editor/e-contact-editor.c:1257
#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
msgid "Primary"
msgstr "­º­nªº"
@@ -69,8 +70,8 @@ msgstr "­º­nªº"
# addressbook/gui/widgets/e-addressbook-view.c:733
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant"
msgstr "§U²z"
@@ -79,8 +80,8 @@ msgstr "§U²z"
#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/backend/ebook/e-card-simple.c:70
#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
msgid "Business"
msgstr "°Ó°È¹q¸Ü"
@@ -92,13 +93,13 @@ msgstr "°Ó°È¹q¸Ü"
# addressbook/contact-editor/e-contact-editor.c:1246
#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
msgid "Callback"
msgstr "¦^¼·¹q¸Ü"
# addressbook/contact-editor/e-contact-editor.c:1248
#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
msgid "Company"
msgstr "¤½¥q¹q¸Ü"
@@ -114,14 +115,14 @@ msgstr "¤½¥q¹q¸Ü"
#: addressbook/backend/ebook/e-card-simple.c:68
#: addressbook/backend/ebook/e-card-simple.c:71
#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
msgid "Home"
msgstr "¦í®a¹q¸Ü"
# addressbook/gui/widgets/e-addressbook-view.c:708
#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Organization"
msgstr "¹ÎÅé"
@@ -133,13 +134,13 @@ msgstr "¹ÎÅé"
# addressbook/contact-editor/e-contact-editor.c:1253
#: addressbook/backend/ebook/e-card-simple.c:72
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
msgid "Mobile"
msgstr "¦æ°Ê¹q¸Ü"
# addressbook/contact-editor/e-contact-editor.c:1247
#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
msgid "Car"
msgstr "¨T¨®¹q¸Ü"
@@ -147,8 +148,8 @@ msgstr "¨T¨®¹q¸Ü"
# addressbook/gui/widgets/e-addressbook-view.c:713
#: addressbook/backend/ebook/e-card-simple.c:74
#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
msgid "Business Fax"
msgstr "°Ó°È³Å¯u"
@@ -161,14 +162,14 @@ msgstr "°Ó°È³Å¯u"
# addressbook/contact-editor/e-contact-editor.c:1251
# addressbook/gui/widgets/e-addressbook-view.c:714
#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
msgid "Home Fax"
msgstr "¦í®a¶Ç¯u"
# addressbook/contact-editor/e-contact-editor.c:1244
#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
msgid "Business 2"
msgstr "°Ó°È¹q¸Ü 2"
@@ -179,15 +180,15 @@ msgstr "°Ó°È¹q¸Ü 2"
# addressbook/contact-editor/e-contact-editor.c:1250
#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
msgid "Home 2"
msgstr "¦í®a¹q¸Ü 2"
# addressbook/contact-editor/e-contact-editor.c:1252
# addressbook/gui/widgets/e-addressbook-view.c:717
#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
-#: addressbook/gui/widgets/e-addressbook-view.c:374
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
msgid "ISDN"
msgstr "ISDN"
@@ -195,46 +196,46 @@ msgstr "ISDN"
# addressbook/contact-editor/e-contact-editor.c:1312
#: addressbook/backend/ebook/e-card-simple.c:79
#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
msgid "Other"
msgstr "¨ä¥¦¹q¸Ü"
# addressbook/contact-editor/e-contact-editor.c:1255
# addressbook/gui/widgets/e-addressbook-view.c:719
#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
-#: addressbook/gui/widgets/e-addressbook-view.c:376
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
msgid "Other Fax"
msgstr "¨ä¥¦¶Ç¯u"
# addressbook/contact-editor/e-contact-editor.c:1256
# addressbook/gui/widgets/e-addressbook-view.c:720
#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
msgid "Pager"
msgstr "©I¥s¾¹"
# addressbook/contact-editor/e-contact-editor.c:1258
# addressbook/gui/widgets/e-addressbook-view.c:721
#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
msgid "Radio"
msgstr "µL½u¹q¹q¸Ü"
# addressbook/contact-editor/e-contact-editor.c:1259
# addressbook/gui/widgets/e-addressbook-view.c:722
#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
msgid "Telex"
msgstr "¹q³ø"
# addressbook/gui/widgets/e-addressbook-view.c:723
#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
msgid "TTY"
msgstr "TTY"
@@ -242,8 +243,8 @@ msgstr "TTY"
# addressbook/gui/widgets/e-addressbook-view.c:725
#: addressbook/backend/ebook/e-card-simple.c:86
#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Email 2"
msgstr "¹q¤l¶l¥ó 2"
@@ -251,14 +252,14 @@ msgstr "¹q¤l¶l¥ó 2"
# addressbook/gui/widgets/e-addressbook-view.c:726
#: addressbook/backend/ebook/e-card-simple.c:87
#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "Email 3"
msgstr "¹q¤l¶l¥ó 3"
# addressbook/gui/widgets/e-addressbook-view.c:727
#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
msgid "Web Site"
msgstr "ºô§}"
@@ -268,7 +269,7 @@ msgstr "Url"
# addressbook/gui/widgets/e-addressbook-view.c:728
#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
msgid "Department"
msgstr "³¡ªù"
@@ -278,7 +279,7 @@ msgstr "³¡ªù"
# addressbook/gui/widgets/e-addressbook-view.c:729
#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Office"
msgstr "¿ì¤½«Ç"
@@ -289,13 +290,13 @@ msgstr "¿ì¤½«Ç"
# addressbook/gui/widgets/e-addressbook-view.c:730
#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
msgid "Title"
msgstr "ÀY»Î"
# addressbook/gui/widgets/e-addressbook-view.c:731
#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
msgid "Profession"
msgstr "±M·~"
@@ -305,7 +306,7 @@ msgstr "±M·~"
# addressbook/gui/widgets/e-addressbook-view.c:732
#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
msgid "Manager"
msgstr "¥DºÞ"
@@ -320,7 +321,7 @@ msgstr "§U²z"
# addressbook/gui/widgets/e-addressbook-view.c:734
#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
msgid "Nickname"
msgstr "¼ÊºÙ"
@@ -331,13 +332,13 @@ msgstr "¼ÊºÙ"
# addressbook/gui/widgets/e-addressbook-view.c:735
#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
msgid "Spouse"
msgstr "°t°¸"
# addressbook/gui/widgets/e-addressbook-view.c:736
#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
msgid "Note"
msgstr "³Æµù"
@@ -354,7 +355,7 @@ msgstr ""
# addressbook/gui/widgets/e-addressbook-view.c:737
#: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
msgid "Free-busy URL"
msgstr "ªÅ¶¢-¦£¸L URL"
@@ -402,12 +403,12 @@ msgid "Unnamed List"
msgstr "¥¼©R¦Wªº³sµ¸¤H"
# addressbook/backend/ebook/e-card.c:3745
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
msgid "Multiple VCards"
msgstr "¦h­« VCard"
# addressbook/backend/ebook/e-card.c:3753
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
#, c-format
msgid "VCard for %s"
msgstr "µ¹ %s ªº VCard"
@@ -711,11 +712,21 @@ msgstr ""
msgid "Server did not respond with valid schema information"
msgstr "IMAP ¦øªA¾¹ªº¦^À³¨S¦³¥]§t %s ¸ê°T"
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
#, fuzzy
msgid "LDAP was not enabled in this build of Evolution"
msgstr "(¦¹¤@ª©¥»ªº evolution ¨Ã¤£¤ä´© SSL)"
+# mail/mail-config.glade.h:3
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "±b¸¹"
+
+# addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "¦øªA¾¹¦WºÙ"
+
# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
# addressbook/backend/ebook/load-pine-addressbook.c:22
# addressbook/backend/ebook/test-client-list.c:23
@@ -892,7 +903,7 @@ msgstr "(¨S¦³)"
# addressbook/contact-editor/e-contact-editor.c:1284
#: addressbook/gui/component/e-address-popup.c:474
#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
msgid "Primary Email"
msgstr "¥D­n¹q¤l¶l¥ó"
@@ -1021,7 +1032,7 @@ msgstr "¥Ø¿ýªA°È¨Ó·½"
# calendar/gui/e-calendar-table.c:162
#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
#, fuzzy
msgid "Always"
msgstr "´£¿ô"
@@ -1141,7 +1152,7 @@ msgstr "̊ƒ"
# calendar/gui/event-editor-dialog.glade.h:10
#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
#, fuzzy
msgid "Never"
msgstr "¨C"
@@ -1203,8 +1214,8 @@ msgstr "´M§ä½d³ò(_C)¡G"
# mail/mail-search.c:242
#. No time range is set, so don't start a query
#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
#, fuzzy
msgid "Searching"
msgstr "´M§ä"
@@ -1252,46 +1263,53 @@ msgstr ""
msgid ""
"Selecting this option will let you change Evolution's default settings for "
"LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:66
msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
"Specifying a display name is the last required step in configuring an LDAP "
"server."
msgstr ""
# widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
#, fuzzy
msgid "Step 1: Server Information"
msgstr "¨Ó·½¸ê°T"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
#, fuzzy
msgid "Step 2: Connecting to Server"
msgstr "¥¿¦b³s½u¦Ü¦øªA¾¹..."
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid "Step 3: Searching the Directory"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid "Step 4: Display Name"
msgstr ""
# calendar/gui/print.c:362
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid "Sub"
msgstr "¤é"
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
msgid "Supported Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
"The first step in configuring an LDAP server is to provide its name, and "
"your log in\n"
@@ -1299,7 +1317,7 @@ msgid ""
"information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -1308,7 +1326,7 @@ msgid ""
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -1316,7 +1334,7 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -1326,7 +1344,7 @@ msgid ""
"your base."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
msgid ""
"This assistant will help you to access online directory services\n"
"using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1336,27 +1354,27 @@ msgid ""
"need help finding this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
"too large will slow down your addressbook."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
"server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
#, fuzzy
msgid ""
"This is the name for this server that will appear in your Evolution folder "
@@ -1364,7 +1382,7 @@ msgid ""
"It is for display purposes only. "
msgstr "¦¹¦WºÙ±N¥Î©óÃѧO±zªº±b¸¹.¶È°µ¬°Åã¥Ü¤§¥Î¡C"
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -1372,11 +1390,11 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
msgid "This option controls how long a search will be run."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
msgid ""
"To add an attribute to the DN, select it from the list and click the \"Add "
"Attribute\" button.\n"
@@ -1385,54 +1403,54 @@ msgid ""
"that you add to the directory on the LDAP server. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
msgid "U_se SSL/TLS:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
msgid "Using distinguished name (DN)"
msgstr ""
# addressbook/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
#, fuzzy
msgid "Using email address"
msgstr "³o¬O¶l±H¦a§} (_T)"
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
msgid "Whenever Possible"
msgstr ""
# addressbook/contact-editor/contact-editor.glade.h:17
# mail/mail-config.glade.h:84
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
#: addressbook/gui/contact-editor/contact-editor.glade.h:30
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
msgid "_Add"
msgstr "·s¼W (_A)"
# addressbook/contact-editor/contact-editor.glade.h:17
# mail/mail-config.glade.h:84
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
#, fuzzy
msgid "_Add ->"
msgstr "·s¼W (_A)"
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
#, fuzzy
msgid "_Add Mapping"
msgstr "·s¼W°Ê§@"
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
#, fuzzy
msgid "_Add to DN"
msgstr "·s¼W°Ê§@"
# calendar/gui/e-calendar-table.c:162
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
#, fuzzy
msgid "_Always"
msgstr "´£¿ô"
@@ -1444,27 +1462,27 @@ msgstr "´£¿ô"
# ui/evolution-mail.xml.h:103
# ui/evolution-task-editor-dialog.xml.h:69
# ui/evolution.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
#, fuzzy
msgid "_Delete Mapping"
msgstr "¥þ³¡§R°£(_D)"
# calendar/gui/calendar-summary.c:622
# mail/mail-config.glade.h:24
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
#, fuzzy
msgid "_Display name:"
msgstr "Åã¥Ü(_D)"
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
msgid "_Distinguished Name (DN):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
msgid "_Don't use SSL/TLS"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
msgid "_Download limit:"
msgstr ""
@@ -1474,8 +1492,8 @@ msgstr ""
# ui/evolution-subscribe.xml.h:10
# ui/evolution-task-editor-dialog.xml.h:70
# ui/evolution.xml.h:48
-#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
#: ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:41
@@ -1485,7 +1503,7 @@ msgid "_Edit"
msgstr "½s¿è (_E)"
# calendar/gui/dialogs/alarm-notify.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
#, fuzzy
msgid "_Edit Mapping"
msgstr "½s¿è¬ù·|(_E)"
@@ -1493,68 +1511,68 @@ msgstr "½s¿è¬ù·|(_E)"
# composer/e-msg-composer.c:935
# data/evolution.desktop.in.h:1
# shell/e-shell-view-menu.c:228
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
#, fuzzy
msgid "_Evolution attribute:"
msgstr "Evolution"
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
msgid "_If necessary "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
msgid "_LDAP attribute:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
msgid "_LDAP attributes:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
msgid "_Log in method:"
msgstr ""
# widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
#, fuzzy
msgid "_More Options >>"
msgstr "¿ï¶µ(_O)"
# addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
#, fuzzy
msgid "_Port number:"
msgstr "³q°T°ð(_P)¡G"
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
msgid "_Restore Defaults"
msgstr ""
# addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
#, fuzzy
msgid "_Search base:"
msgstr "´M§ä°_ÂI(_B)¡G"
# calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
msgid "_Server name:"
msgstr "¦øªA¾¹¦WºÙ(_S)¡G"
# calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
#, fuzzy
msgid "_Timeout (minutes):"
msgstr "©µ¿ð®É¶¡ (¤ÀÄÁ)"
# mail/mail-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
#, fuzzy
msgid "account-druid"
msgstr "±b¸¹"
# addressbook/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
#, fuzzy
msgid "account-editor"
msgstr "³sµ¸¤H²M³æ½s¿è¾¹"
@@ -1563,43 +1581,43 @@ msgstr "³sµ¸¤H²M³æ½s¿è¾¹"
# calendar/gui/calendar-model.c:1176
# calendar/gui/dialogs/task-editor-dialog.glade.h:14
# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
#, fuzzy
msgid "cards"
msgstr "¨S¦³¦W¤ù"
# mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
#, fuzzy
msgid "connecting-tab"
msgstr "¤¤Â_»P %s ªº³s½u"
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
msgid "dn-customization-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
msgid "edit_server_window_simple"
msgstr ""
# addressbook/contact-editor/contact-editor.glade.h:10
# executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
#, fuzzy
msgid "general-tab"
msgstr "¤@¯ë"
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
msgid "mappings-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
msgid "objectclasses-tab"
msgstr ""
# addressbook/gui/search/e-addressbook-search-dialog.c:158
# mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
#, fuzzy
msgid "searching-tab"
msgstr "´M§ä"
@@ -1620,9 +1638,9 @@ msgstr "¥Ø¿ýªA°È¦WºÙ¿ï¾Ü¤¶­±¤u¼t"
# shell/e-shortcuts-view.c:388
#. Fixme: Ditto
#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:712
-#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
#: shell/e-shortcuts-view.c:178
msgid "Remove"
msgstr "²¾°£"
@@ -1659,12 +1677,12 @@ msgstr ""
msgid "Unnamed Contact"
msgstr "¥¼©R¦Wªº³sµ¸¤H"
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
msgid "Select Contacts from Addressbook"
msgstr "±q¥Ø¿ýªA°È¿ï¾Ü³sµ¸¤H"
# addressbook/gui/component/addressbook.c:619
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
#, fuzzy
msgid "Find contact in"
msgstr "±H¥óªÌ¥]§t"
@@ -1843,9 +1861,9 @@ msgstr "¤¹³\±µ¦¬ HTML ®æ¦¡ªº¹q¤l¶l¥ó"
#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -3045,12 +3063,12 @@ msgid "Save Contact as VCard"
msgstr "Àx¦s¦¨ VCard Àɮ׮榡"
# addressbook/contact-editor/e-contact-editor.c:1260
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
msgid "TTY/TDD"
msgstr "TTY/TDD"
# camel/providers/local/camel-local-store.c:279
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "¤£¯à§ä¨ìÄæ¦ì `%s' ¤§¬É­±¤u¨ã"
@@ -3068,7 +3086,7 @@ msgstr "½s¿è¥þ³¡"
# addressbook/contact-editor/e-contact-quick-add.c:276
# addressbook/gui/widgets/e-addressbook-view.c:700
#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
msgid "Full Name"
msgstr "¥þ¦W"
@@ -3078,17 +3096,17 @@ msgid "E-mail"
msgstr "¹q¤l¶l¥ó"
#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
msgid "card.vcf"
msgstr ""
# addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
#, fuzzy
msgid "list"
msgstr "ÆG"
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
#, c-format
msgid ""
"%s already exists\n"
@@ -3284,6 +3302,12 @@ msgstr "³sµ¸¤H²M³æ½s¿è¾¹"
msgid "Save List as VCard"
msgstr "Àx¦s¦¨ VCard Àɮ׮榡"
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "³sµ¸¤H"
+
#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
msgid "Add Anyway"
msgstr "¤£ºÞ«ç¼Ë³£·s¼W"
@@ -3350,23 +3374,23 @@ msgstr "´M§ä"
# calendar/gui/calendar-model.c:1176
# calendar/gui/dialogs/task-editor-dialog.glade.h:14
# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
msgid "No cards"
msgstr "¨S¦³¦W¤ù"
# ui/evolution-calendar.xml.h:25
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
msgid "1 card"
msgstr "1 ±i¦W¤ù"
# calendar/gui/event-editor.c:1563
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
#, c-format
msgid "%d cards"
msgstr " %d ±i¦W¤ù"
# shell/e-shell-importer.c:384
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
#, fuzzy
msgid "Error getting book view"
msgstr "±Ò°Ê %s ®Éµo¥Í¿ù»~"
@@ -3388,8 +3412,8 @@ msgstr "¦¨¥\"
#: addressbook/gui/widgets/e-addressbook-util.c:36
#: camel/providers/imap/camel-imap-command.c:309
#: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
-#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
msgid "Unknown error"
msgstr "¤£©úªº¿ù»~"
@@ -3400,7 +3424,7 @@ msgid "Repository offline"
msgstr "¸ê®Æ®wÂ÷½u"
# shell/e-storage.c:475
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
#: shell/evolution-shell-component.c:1171
msgid "Permission denied"
msgstr "Åv­­¤£¨¬"
@@ -3426,11 +3450,13 @@ msgstr "³q°T¨ó©w¤£¤ä´©"
# camel/camel-service.c:544
# camel/camel-service.c:580
#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
#: camel/camel-service.c:739 camel/camel-service.c:779
#: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
msgid "Cancelled"
msgstr "¤w¨ú®ø"
@@ -3494,7 +3520,7 @@ msgstr "²¾°£²M³æ®Éµo¥Í¿ù»~"
# executive-summary/component/e-summary.c:940
#: addressbook/gui/widgets/e-addressbook-util.c:101
#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
msgid "Error removing card"
msgstr "²¾°£¦W¤ù®Éµo¥Í¿ù»~"
@@ -3549,83 +3575,8 @@ msgstr "¨S¦³¦W¤ù"
msgid "Copy cards to"
msgstr "¨S¦³¦W¤ù"
-# addressbook/gui/widgets/e-addressbook-view.c:698
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* «ö³oùØ·s¼W³sµ¸¤H *"
-
-# addressbook/gui/widgets/e-addressbook-view.c:702
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "¥D­n¹q¸Ü"
-
-# addressbook/gui/widgets/e-addressbook-view.c:703
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "§U²z¹q¸Ü"
-
-# addressbook/gui/widgets/e-addressbook-view.c:704
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "°Ó°È¹q¸Ü"
-
-# addressbook/gui/widgets/e-addressbook-view.c:705
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "¦^¼·¹q¸Ü"
-
-# addressbook/gui/widgets/e-addressbook-view.c:706
-#: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "¤½¥q¹q¸Ü"
-
-# addressbook/gui/widgets/e-addressbook-view.c:707
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "¦í®a¹q¸Ü"
-
-# addressbook/gui/widgets/e-addressbook-view.c:709
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "°Ó°È¦a§}"
-
-# addressbook/gui/widgets/e-addressbook-view.c:710
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "¦í®a¦a§}"
-
-# addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "¦æ°Ê¹q¸Ü"
-
-# addressbook/gui/widgets/e-addressbook-view.c:712
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "¨T¨®¹q¸Ü"
-
-# addressbook/gui/widgets/e-addressbook-view.c:715
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "°Ó°È¹q¸Ü 2"
-
-# addressbook/gui/widgets/e-addressbook-view.c:716
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "¦í®a¹q¸Ü 2"
-
-# addressbook/gui/widgets/e-addressbook-view.c:718
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "¨ä¥¦¹q¸Ü"
-
-# addressbook/gui/widgets/e-addressbook-view.c:724
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "¨ä¥¦¦a§}"
-
# importers/pine-importer.c:661
-#: addressbook/gui/widgets/e-addressbook-view.c:461
+#: addressbook/gui/widgets/e-addressbook-view.c:363
#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
msgid "Addressbook"
msgstr "¥Ø¿ýªA°È"
@@ -3634,64 +3585,64 @@ msgstr "¥Ø¿ýªA°È"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
# addressbook/gui/widgets/e-addressbook-view.c:551
# addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "Àx¦s¦¨ VCard Àɮ׮榡"
# ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
#, fuzzy
msgid "New Contact..."
msgstr "·s¼W³sµ¸¤H"
# ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
#, fuzzy
msgid "New Contact List..."
msgstr "·s¼W³sµ¸¤H²M³æ"
# ui/evolution.xml.h:52
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
#, fuzzy
msgid "Go to Folder..."
msgstr "²¾¦Ü¸ê®Æ§¨(_G)..."
# shell/e-shell-importer.c:363
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
#, fuzzy
msgid "Import..."
msgstr "¶×¤J..."
# ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
#, fuzzy
msgid "Search for Contacts..."
msgstr "´M§ä³sµ¸¤H(_S)"
# ui/evolution-addressbook.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
#, fuzzy
msgid "Addressbook Sources..."
msgstr "¥Ø¿ýªA°È¨Ó·½(_A)..."
# ui/evolution-mail.xml.h:110
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
#, fuzzy
msgid "Pilot Settings..."
msgstr "¶l¥ó³]©w(_M)..."
# ui/evolution-mail.xml.h:35
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "³sµ¸¤HÂà±H"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
# addressbook/gui/widgets/e-addressbook-view.c:613
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
msgid "Send Message to Contact"
msgstr "¶Ç°e¶l¥óµ¹³sµ¸¤H"
@@ -3702,7 +3653,7 @@ msgstr "¶Ç°e¶l¥óµ¹³sµ¸¤H"
# ui/evolution-calendar.xml.h:23
# ui/evolution-mail.xml.h:65
# ui/evolution-tasks.xml.h:4
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
#: ui/my-evolution.xml.h:1
@@ -3711,25 +3662,25 @@ msgstr "¦C¦L"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
# addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
msgid "Print Envelope"
msgstr "¦C¦L«H«Ê"
# mail/folder-browser.c:713
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
#, fuzzy
msgid "Copy to folder..."
msgstr "´_»s¦Ü¸ê®Æ§¨(_C)..."
# mail/folder-browser.c:711
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
#, fuzzy
msgid "Move to folder..."
msgstr "²¾¦Ü¸ê®Æ§¨(_M)..."
# ui/evolution-event-editor.xml.h:15
# ui/evolution-task-editor-dialog.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "°Å¤U"
@@ -3737,7 +3688,7 @@ msgstr "°Å¤U"
# ui/evolution-event-editor.xml.h:13
# ui/evolution-mail.xml.h:8
# ui/evolution-task-editor-dialog.xml.h:14
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
@@ -3745,7 +3696,7 @@ msgstr "½Æ»s"
# ui/evolution-event-editor.xml.h:30
# ui/evolution-task-editor-dialog.xml.h:33
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
msgid "Paste"
msgstr "¶K¤W"
@@ -3761,7 +3712,7 @@ msgstr "¶K¤W"
# ui/evolution-event-editor.xml.h:17
# ui/evolution-mail.xml.h:22
# ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
#: ui/evolution-contact-editor.xml.h:2
@@ -3770,8 +3721,8 @@ msgid "Delete"
msgstr "§R°£"
# widgets/menus/gal-view-menus.c:176
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
#, fuzzy
msgid "Current View"
msgstr "¥Ø«eÀ˵ø(_C)"
@@ -3780,7 +3731,7 @@ msgstr "¥Ø«eÀ˵ø(_C)"
#. Translators: put here a list of labels you want to see on buttons in
#. addressbook. You may use any character to separate labels but it must
#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
@@ -3788,11 +3739,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
#. in addressbook. You may use any character to separate labels but it
#. must also be placed at the begining ot the string.
#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-#: addressbook/gui/widgets/e-addressbook-view.c:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -3800,6 +3751,81 @@ msgid ""
"has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
+# addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* «ö³oùØ·s¼W³sµ¸¤H *"
+
+# addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "§U²z¹q¸Ü"
+
+# addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "°Ó°È¦a§}"
+
+# addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "°Ó°È¹q¸Ü"
+
+# addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "°Ó°È¹q¸Ü 2"
+
+# addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "¦^¼·¹q¸Ü"
+
+# addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "¨T¨®¹q¸Ü"
+
+# addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "¤½¥q¹q¸Ü"
+
+# addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "¦í®a¦a§}"
+
+# addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "¦í®a¹q¸Ü"
+
+# addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "¦í®a¹q¸Ü 2"
+
+# addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "¦æ°Ê¹q¸Ü"
+
+# addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "¨ä¥¦¦a§}"
+
+# addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "¨ä¥¦¹q¸Ü"
+
+# addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "¥D­n¹q¸Ü"
+
#: addressbook/gui/widgets/e-minicard-control.c:185
#, c-format
msgid "and %d other cards."
@@ -4107,7 +4133,7 @@ msgstr "°ª"
# calendar/gui/e-calendar-table.c:346
# mail/message-list.c:688
#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1721
#: calendar/gui/dialogs/task-details-page.glade.h:10
#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
msgid "Normal"
@@ -4312,7 +4338,7 @@ msgstr ""
# widgets/misc/e-messagebox.c:159
#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "ĵ§i"
@@ -4379,7 +4405,7 @@ msgstr "%A %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
msgid "%a %d %b"
msgstr "%a %d %b"
@@ -4415,7 +4441,7 @@ msgstr "¤£¯à«Ø¥ß¦æ¨Æ¾äÀ˵ø¡C ½ÐÀˬd ORBit ©M OAF ªº³]©w¡C"
# calendar/gui/calendar-model.c:363
# calendar/gui/calendar-model.c:900
# calendar/gui/e-calendar-table.c:324
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
#: calendar/gui/e-calendar-table.c:397
msgid "Private"
msgstr "¨p¤H"
@@ -4423,7 +4449,7 @@ msgstr "¨p¤H"
# calendar/gui/calendar-model.c:366
# calendar/gui/calendar-model.c:902
# calendar/gui/e-calendar-table.c:325
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
#: calendar/gui/e-calendar-table.c:398
msgid "Confidential"
msgstr "¾÷±K"
@@ -4431,38 +4457,38 @@ msgstr "¾÷±K"
# calendar/gui/calendar-model.c:360
# calendar/gui/calendar-model.c:898
# calendar/gui/e-calendar-table.c:323
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
msgid "Public"
msgstr "¤½¶}"
# calendar/gui/calendar-model.c:457
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
msgid "N"
msgstr "N"
# calendar/gui/calendar-model.c:457
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
msgid "S"
msgstr "S"
# calendar/gui/calendar-model.c:459
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
msgid "E"
msgstr "E"
# calendar/gui/calendar-model.c:459
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
msgid "W"
msgstr "W"
# ui/evolution-calendar.xml.h:36
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
#: calendar/gui/e-calendar-table.c:470
msgid "Free"
msgstr "ªÅ¶¢"
# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
#: calendar/gui/e-meeting-time-sel.c:438
#: shell/evolution-shell-component.c:1165
msgid "Busy"
@@ -4472,7 +4498,7 @@ msgstr "¦£¸L"
# calendar/gui/calendar-model.c:1176
# calendar/gui/dialogs/task-editor-dialog.glade.h:14
# calendar/gui/e-calendar-table.c:419
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
#: calendar/gui/dialogs/task-details-page.glade.h:11
#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
msgid "Not Started"
@@ -4482,7 +4508,7 @@ msgstr "¥¼¶}©l"
# calendar/gui/calendar-model.c:1178
# calendar/gui/dialogs/task-editor-dialog.glade.h:11
# calendar/gui/e-calendar-table.c:420
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
msgid "In Progress"
@@ -4492,7 +4518,7 @@ msgstr "¶i¦æ¤¤"
# calendar/gui/calendar-model.c:1180
# calendar/gui/dialogs/task-editor-dialog.glade.h:6
# calendar/gui/e-calendar-table.c:421
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -4500,7 +4526,7 @@ msgid "Completed"
msgstr "¤w§¹¦¨"
# calendar/gui/calendar-model.c:970
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -4525,11 +4551,11 @@ msgstr ""
# widgets/misc/e-dateedit.c:1341
# widgets/misc/e-dateedit.c:1456
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
@@ -4537,24 +4563,24 @@ msgid "None"
msgstr "µL"
# calendar/gui/calendar-model.c:1576
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
msgid "Recurring"
msgstr "´`Àô¼Ò¦¡"
# calendar/gui/calendar-model.c:1578
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
msgid "Assigned"
msgstr "¤w«ü©w"
# calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
#: calendar/gui/e-meeting-model.c:862
msgid "Yes"
msgstr "¬O"
# calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
#: calendar/gui/e-meeting-model.c:863
msgid "No"
msgstr "§_"
@@ -4581,7 +4607,7 @@ msgstr "¤ëÀ˵ø"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
# ui/evolution-calendar.xml.h:3
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
msgid "Calendar"
@@ -4608,8 +4634,8 @@ msgstr "¸ê®Æ§¨¥]§t¬ù·|»P¨Æ¥ó"
#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:311
-#: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
#: shell/e-shortcuts.c:1063
msgid "Tasks"
msgstr "¤u§@"
@@ -4633,74 +4659,74 @@ msgstr "¸ê®Æ§¨¥]§t«Ý¿ì¨Æ¶µ"
# calendar/gui/e-day-view.c:3146
# ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
#, fuzzy
msgid "New appointment"
msgstr "·s¼W¬ù·|"
# calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
#, fuzzy
msgid "_Appointment"
msgstr "¬ù·|"
# ui/evolution-calendar.xml.h:5
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
msgid "Create a new appointment"
msgstr "«Ø¥ß¤@­Ó·sªº¬ù·|"
# importers/netscape-importer.c:790
# importers/pine-importer.c:656
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
#, fuzzy
msgid "New meeting"
msgstr "·s»Dµo°e¦øªA¾¹³]©w"
# importers/netscape-importer.c:790
# importers/pine-importer.c:656
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
#, fuzzy
msgid "_Meeting"
msgstr "·|ij"
# ui/evolution-tasks.xml.h:2
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
#, fuzzy
msgid "Create a new meeting request"
msgstr "«Ø¥ß¤@­Ó·sªº¤u§@"
# ui/evolution-tasks.xml.h:3
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
#, fuzzy
msgid "New task"
msgstr "·s¼W¤u§@"
# ui/evolution-tasks.xml.h:9
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
msgid "_Task"
msgstr "¤u§@(_T)"
# ui/evolution-tasks.xml.h:2
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
msgid "Create a new task"
msgstr "«Ø¥ß¤@­Ó·sªº¤u§@"
# calendar/gui/e-day-view.c:3146
# ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
#, fuzzy
msgid "New All Day Appointment"
msgstr "·s¼W¬ù·|"
# calendar/gui/e-day-view.c:3146
# ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
#, fuzzy
msgid "All _Day Appointment"
msgstr "·s¼W¬ù·|(_A)"
# ui/evolution-calendar.xml.h:5
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
#, fuzzy
msgid "Create a new all-day appointment"
msgstr "«Ø¥ß¤@­Ó·sªº¬ù·|"
@@ -4951,7 +4977,7 @@ msgstr "´£¿ô"
# calendar/gui/e-itip-control.glade.h:11
#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "ºK­n¡G"
@@ -4988,7 +5014,7 @@ msgstr "®É"
# calendar/gui/event-editor-dialog.glade.h:42
# mail/mail-config.glade.h:87
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
msgid "minute(s)"
msgstr "¤À"
@@ -5023,7 +5049,7 @@ msgid "60 minutes"
msgstr "60 ¤À"
# calendar/gui/e-calendar-table.c:162
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
#, fuzzy
msgid "Alerts"
msgstr "´£¿ô"
@@ -5053,7 +5079,7 @@ msgstr "¤Ñ"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
# calendar/gui/event-editor.c:479
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
msgid "Friday"
msgstr "¬P´Á¤­"
@@ -5069,7 +5095,7 @@ msgstr "¤À"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
# calendar/gui/event-editor.c:475
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
msgid "Monday"
msgstr "¬P´Á¤@"
@@ -5082,7 +5108,7 @@ msgstr "¶g¤é(_N)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
# calendar/gui/event-editor.c:480
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
msgid "Saturday"
msgstr "¬P´Á¤»"
@@ -5098,7 +5124,7 @@ msgstr "¦b¤é´Á¾ÉÄýÅã¥Ü¶g¼Æ(_N)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
# calendar/gui/event-editor.c:481
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
msgid "Sunday"
msgstr "¬P´Á¤é"
@@ -5124,7 +5150,7 @@ msgstr "¤u§@²M³æ(_T)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
# calendar/gui/event-editor.c:478
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
msgid "Thursday"
msgstr "¬P´Á¥|"
@@ -5146,7 +5172,7 @@ msgstr "®É¶¡®æ¦¡¡G"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
# calendar/gui/event-editor.c:476
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
msgid "Tuesday"
msgstr "¬P´Á¤G"
@@ -5157,7 +5183,7 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
# calendar/gui/event-editor.c:477
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
msgid "Wednesday"
msgstr "¬P´Á¤T"
@@ -5210,7 +5236,7 @@ msgstr "¶g¤­(_F)"
# addressbook/contact-editor/contact-editor.glade.h:10
# executive-summary/component/executive-summary-config.glade.h:3
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
msgid "_General"
msgstr "¤@¯ë(_G)"
@@ -5374,32 +5400,32 @@ msgid "Due "
msgstr "´Á­­"
# shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
#, fuzzy
msgid "Could not update invalid object"
msgstr "¤£¯à¥¿½T¦a§ó·sÀÉ®×"
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
msgid "Object not found, not updated"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
msgid "You don't have permissions to update this object"
msgstr ""
# shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
#, fuzzy
msgid "Could not update object"
msgstr "¤£¯à¥¿½T¦a§ó·sÀÉ®×"
# calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
msgid "Edit Appointment"
msgstr "½s¿è¬ù·|"
# calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
#, c-format
msgid "Appointment - %s"
msgstr "¬ù·| - %s"
@@ -5407,36 +5433,36 @@ msgstr "¬ù·| - %s"
# calendar/gui/calendar-summary.c:275
# calendar/gui/print.c:948
# views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
#, c-format
msgid "Task - %s"
msgstr "¤u§@ - %s"
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
#, c-format
msgid "Journal entry - %s"
msgstr "¤é»x¶µ¥Ø - %s"
# calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
msgid "No summary"
msgstr "¨S¦³ºK­n"
# composer/e-msg-composer.c:774
-#: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
-#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
msgid "Save as..."
msgstr "¥t¦s·sÀÉ..."
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
msgid ""
"Changes made to this item may be discarded if an update arrives via email"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
msgid "Unable to obtain current version!"
msgstr "µLªk¨ú±o¥Ø«eªºª©¥»¡I"
@@ -5692,7 +5718,7 @@ msgid "Member"
msgstr "·|­û"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -5706,7 +5732,7 @@ msgstr "¨¤¦â"
# mail/message-list.c:1081
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
#: mail/message-list.etspec.h:12
msgid "Status"
msgstr "ª¬ªp"
@@ -5791,58 +5817,62 @@ msgstr " "
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "Evolution µLªk½s¿è³o­Ó¶g´Á©Ê¬ù·|¡C"
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
# calendar/gui/event-editor.c:449
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:1007
msgid "on"
msgstr "©ó"
# addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
#, fuzzy
msgid "first"
msgstr "ÆG"
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
msgid "second"
msgstr "’"
# addressbook/contact-editor/e-contact-editor.c:1247
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
#, fuzzy
msgid "third"
msgstr "¥D®u"
# addressbook/gui/widgets/e-addressbook-view.c:736
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
#, fuzzy
msgid "fourth"
msgstr "¥_"
# addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
#, fuzzy
msgid "last"
msgstr "ÆG"
# addressbook/contact-editor/e-contact-editor.c:1255
# addressbook/gui/widgets/e-addressbook-view.c:719
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
#, fuzzy
msgid "Other Date"
msgstr "¨ä¥¦¶Ç¯u"
# calendar/gui/event-editor.c:474
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
msgid "day"
msgstr "¨C¤Ñ"
# calendar/gui/event-editor.c:601
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
msgid "on the"
msgstr "¦b²Ä"
# calendar/gui/event-editor.c:754
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
msgid "occurrences"
msgstr "¥X²{"
@@ -5970,7 +6000,7 @@ msgstr "¶i«×"
# calendar/gui/dialogs/task-editor-dialog.glade.h:21
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
msgid "URL:"
msgstr "ºô§}¡G"
@@ -5998,9 +6028,9 @@ msgstr "«ü¬£¤u§@"
# addressbook/gui/component/addressbook-config.c:689
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
msgid "Description:"
msgstr "´y­z¡G"
@@ -6081,15 +6111,15 @@ msgid "100%"
msgstr "100%"
# calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
#, fuzzy
msgid "Deleting selected objects"
msgstr "§R°£¿ï©wªº³sµ¸¤H"
# mail/folder-browser.c:686
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr "¶}±Ò(_O)"
@@ -6103,8 +6133,8 @@ msgstr "¥t¦s·sÀÉ..."
# ui/evolution-addressbook.xml.h:18
# ui/evolution-calendar.xml.h:42
# ui/evolution-contact-editor.xml.h:15
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
-#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
@@ -6113,16 +6143,16 @@ msgstr "¦C¦L(_P)..."
# ui/evolution-event-editor.xml.h:6
# ui/evolution-task-editor-dialog.xml.h:7
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "°Å¤U(_U)"
# ui/evolution-event-editor.xml.h:55
# ui/evolution-task-editor-dialog.xml.h:67
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:15
msgid "_Copy"
@@ -6130,9 +6160,9 @@ msgstr "½Æ»s(_C)"
# ui/evolution-event-editor.xml.h:68
# ui/evolution-task-editor-dialog.xml.h:81
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
-#: calendar/gui/e-week-view.c:3557 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:19
msgid "_Paste"
@@ -6167,8 +6197,8 @@ msgstr "¼Ð¥Ü¬°¤w§¹¦¨ªº¤u§@(_M)"
msgid "_Delete Selected Tasks"
msgstr "§R°£¿ï©wªº¤u§@(_D)"
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
msgid "Updating objects"
msgstr ""
@@ -6186,7 +6216,7 @@ msgstr "´£¿ô"
# camel/camel-filter-driver.c:694
# camel/camel-filter-driver.c:793
#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
msgid "Complete"
msgstr "§¹¦¨"
@@ -6280,7 +6310,7 @@ msgstr "¶¡¹j %02i ¤ÀÄÁ"
# calendar/gui/e-week-view-main-item.c:325
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
msgid "%A %d %B"
msgstr "%A %d %B"
@@ -6290,7 +6320,7 @@ msgstr "%A %d %B"
# calendar/gui/e-week-view-main-item.c:348
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
#: calendar/gui/e-week-view-main-item.c:347
msgid "%d %b"
msgstr "%d %b"
@@ -6299,7 +6329,7 @@ msgstr "%d %b"
# calendar/gui/e-week-view.c:300
# calendar/gui/print.c:617
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
#: calendar/gui/print.c:791
msgid "am"
msgstr "¤W¤È"
@@ -6308,128 +6338,111 @@ msgstr "¤W¤È"
# calendar/gui/e-week-view.c:303
# calendar/gui/print.c:616
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
#: calendar/gui/print.c:793
msgid "pm"
msgstr "¤U¤È"
# calendar/gui/e-day-view.c:3146
# ui/evolution-calendar.xml.h:16
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
msgid "New _Appointment"
msgstr "·s¼W¬ù·|(_A)"
# calendar/gui/e-day-view.c:3148
# calendar/gui/e-week-view.c:3279
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
msgid "New All Day _Event"
msgstr "·s¼W¥þ¤Ñ­n¨Æ(_E)"
# importers/netscape-importer.c:790
# importers/pine-importer.c:656
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
#, fuzzy
msgid "New Meeting"
msgstr "·|ij"
# ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
msgid "New Task"
msgstr "·s¼W¤u§@"
# ui/evolution-contact-editor.xml.h:7
# ui/evolution-event-editor.xml.h:38
# ui/evolution-task-editor-dialog.xml.h:41
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr "¦C¦L..."
# ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
msgstr "¤µ¤é(_T)"
# calendar/gui/e-day-view.c:3155
# calendar/gui/e-week-view.c:3286
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
msgid "_Go to Date..."
msgstr "¨ì«ü©w¤é´Á(_G)..."
# mail/mail-config.glade.h:61
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
#: ui/evolution-calendar.xml.h:31
msgid "_Publish Free/Busy Information"
msgstr "µo§G ªÅ¶¢/¦£¸L ¸ê°T(_P)"
-# mail/mail-config.glade.h:40
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "¶l¥ó³]©w"
-
-# mail/mail-config.glade.h:40
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
#, fuzzy
-msgid "_Configure Pilot..."
-msgstr "¶l¥ó³]©w"
+msgid "_Settings..."
+msgstr "¶l¥ó³]©w(_M)..."
# mail/folder-browser.c:690
# ui/evolution-calendar.xml.h:43
# ui/evolution-mail.xml.h:118
# ui/evolution-tasks.xml.h:8
-#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
-#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
msgid "_Save As..."
msgstr "¥t¦s·sÀÉ(_S)..."
# ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
#, fuzzy
msgid "_Schedule Meeting..."
msgstr "·|ij±Æµ{(_M)"
# calendar/gui/calendar-summary.c:721
# calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
#, fuzzy
msgid "_Forward as iCalendar..."
msgstr "¥H i_Calendar Âà±H"
# calendar/gui/e-day-view.c:3175
# calendar/gui/e-week-view.c:3309
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
msgid "Make this Occurrence _Movable"
msgstr "±N³o­Ó¨Æ¥ó¼Ð¥Ü¦¨¥i²¾°Ê(_M)"
# calendar/gui/e-day-view.c:3177
# calendar/gui/e-week-view.c:3311
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
msgid "Delete this _Occurrence"
msgstr "§R°£³o­Ó¨Æ¥ó(_O)"
# calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
msgid "Delete _All Occurrences"
msgstr "§R°£¥þ³¡¨Æ¥ó(_A)"
-#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
-#: shell/e-shell-view-menu.c:94
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-# camel/camel-filter-driver.c:871
-#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
-#: shell/e-shell-view-menu.c:102
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr "°õ¦æ¹LÂo¾¹µo¥Í¿ù»~¡G %s: %s"
-
-#: calendar/gui/e-itip-control.c:590
+#: calendar/gui/e-itip-control.c:615
msgid "<b>Starts:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
msgid "<b>Ends:</b> "
msgstr ""
@@ -6437,17 +6450,17 @@ msgstr ""
# calendar/gui/calendar-model.c:1180
# calendar/gui/dialogs/task-editor-dialog.glade.h:6
# calendar/gui/e-calendar-table.c:421
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
#, fuzzy
msgid "<b>Completed:</b> "
msgstr "¤w§¹¦¨"
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
msgid "<b>Due:</b> "
msgstr ""
# data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
#, fuzzy
msgid "iCalendar Information"
msgstr "¦æ¨Æ¾ä¸ê°T"
@@ -6455,31 +6468,32 @@ msgstr "¦æ¨Æ¾ä¸ê°T"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
# ui/evolution-calendar.xml.h:3
#. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
#, fuzzy
msgid "iCalendar Error"
msgstr "¦æ¨Æ¾ä"
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
#, fuzzy
msgid "An unknown person"
msgstr "¤£©úªº±H¥óªÌ"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr ""
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
msgid "<i>None</i>"
msgstr ""
# addressbook/backend/ebook/e-card.c:3442
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
#, fuzzy
msgid "Location:"
msgstr ""
@@ -6487,26 +6501,26 @@ msgstr ""
"¸g½n¡G"
# calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
#, fuzzy
msgid "Status:"
msgstr "ª¬ºA(_S)¡G"
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
msgid "Accepted"
msgstr "±µ¨ü"
# widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
#, fuzzy
msgid "Tentatively Accepted"
msgstr "¼È­q"
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
msgid "Declined"
msgstr "°û©Ú"
@@ -6514,7 +6528,7 @@ msgstr "°û©Ú"
# calendar/gui/event-editor.c:1601
# calendar/gui/event-editor.c:1628
# camel/providers/smtp/camel-smtp-transport.c:221
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -6527,331 +6541,341 @@ msgstr "¤£©ú"
# shell/e-shell-importer.c:545
# shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
-#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
#, fuzzy
msgid "Choose an action:"
msgstr "¿ï¾Ü¤@­Ó°Ê§@"
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
#, fuzzy
msgid "Update"
msgstr "¤u§@§ó·s"
# widgets/misc/e-cell-date-edit.c:245
-#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
-#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
-#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
msgid "OK"
msgstr "½T»{"
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
#, fuzzy
msgid "Accept"
msgstr "±µ¨ü"
# widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
#, fuzzy
msgid "Tentatively accept"
msgstr "¼È­q"
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
#, fuzzy
msgid "Decline"
msgstr "°û©Ú"
# mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
#, fuzzy
msgid "Send Free/Busy Information"
msgstr "ªÅ¶¢/¦£¸L ¸ê°T"
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
msgid "Update respondent status"
msgstr ""
# widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
#, fuzzy
msgid "Send Latest Information"
msgstr "¤u§@¸ê°T"
# ui/evolution-mail.xml.h:2
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "¨ú®ø"
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> ¤w¸gµo§G·|ij¸ê°T¡C"
# data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
msgid "Meeting Information"
msgstr "·|ij¸ê°T"
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> ½Ð¨D±z¥X®u¦¹¦¸·|ij¡C"
+
+#: calendar/gui/e-itip-control.c:1109
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> ½Ð¨D±z¥X®u¦¹¦¸·|ij¡C"
# importers/netscape-importer.c:790
# importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
msgid "Meeting Proposal"
msgstr "·|ij´£®×"
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> §Æ±æ¥[¤J¤@­Ó¬J¦sªº·|ij¡C"
# widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
msgid "Meeting Update"
msgstr "·|ij§ó·s"
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> §Æ±æ¦¬¨ì³Ì·sªº·|ij¸ê°T¡C"
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
msgid "Meeting Update Request"
msgstr "·|ij§ó·s½Ð¨D"
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> ¤w¸gµªÂФF·|ij½Ð¨D¡C"
# importers/netscape-importer.c:790
# importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
msgid "Meeting Reply"
msgstr "·|ijµªÂÐ"
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> ¤w¸g®ø¨ú·|ij¡C"
# shell/e-shell-importer.c:545
# shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
msgid "Meeting Cancellation"
msgstr "·|ij¨ú®ø"
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> ¶Ç°e¤F¤@­ÓÃø¥H²z¸Ñªº°T®§¡C"
# mail/mail-search.c:268
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
msgid "Bad Meeting Message"
msgstr "¤£¥¿½Tªº·|ij°T®§"
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> ¤w¸gµo§G¤F¤u§@¸ê°T¡C"
# widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
msgid "Task Information"
msgstr "¤u§@¸ê°T"
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> ­n¨D±z¶i¦æ¤u§@¡C"
+
+#: calendar/gui/e-itip-control.c:1176
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> ­n¨D±z¶i¦æ¤u§@¡C"
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
msgid "Task Proposal"
msgstr "¤u§@­pµe"
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> §Æ±æ¥[¤J¤@¶µ¬J¦sªº¤u§@¡C"
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
msgid "Task Update"
msgstr "¤u§@§ó·s"
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> §Æ±æ¦¬¨ì³Ì·sªº¤u§@¸ê°T¡C"
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
msgid "Task Update Request"
msgstr "¤u§@§ó·s½Ð¨D"
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> ¤w¸g¦^ÂЫü¬£ªº¤u§@¡C"
# mail/message-browser.c:188
# ui/evolution-mail.xml.h:70
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
msgid "Task Reply"
msgstr "¤u§@¦^ÂÐ"
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> ¤w¸g¨ú®ø¤u§@¡C"
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
msgid "Task Cancellation"
msgstr "¤u§@¨ú®ø"
# calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
msgid "Bad Task Message"
msgstr "¤£¥¿½Tªº¤u§@°T®§"
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> ¤w¸gµo§G ªÅ¶¢/¦£¸L ¸ê°T¡C"
# mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
msgid "Free/Busy Information"
msgstr "ªÅ¶¢/¦£¸L ¸ê°T"
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> ½Ð¨D±zªº ªÅ¶¢/¦£¸L ¸ê°T¡C"
# addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
msgid "Free/Busy Request"
msgstr "ªÅ¶¢/¦£¸L ½Ð¨D"
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> ¤w¸gµªÂÐ ªÅ¶¢/¦£¸L ½Ð¨D¡C"
# addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
msgid "Free/Busy Reply"
msgstr "ªÅ¶¢/¦£¸L ¦^ÂÐ"
# mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
msgid "Bad Free/Busy Message"
msgstr "¤£¥¿½Tªº ªÅ¶¢/¦£¸L °T®§"
# camel/providers/local/camel-mbox-folder.c:368
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
#, fuzzy
msgid "The message does not appear to be properly formed"
msgstr "¸ê®Æ§¨¦n¹³¤w¸g·l·´¨Ã¥B¤£¯à´_­ì¡C"
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
#, fuzzy
msgid "The message contains only unsupported requests."
msgstr "³o­Ó¶l¥ó¥u¥]§t±K¥ó°Æ¥»¦¬¥óªÌ¡C"
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
msgid "The attachment does not contain a valid calendar message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
msgid "The attachment has no viewable calendar items"
msgstr ""
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
#, fuzzy
msgid "There was an error on the CORBA system\n"
msgstr "¤U¸ü·s»Dµo°e¦øªA¾¹®Éµo¥Í¿ù»~"
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
#, fuzzy
msgid "Object could not be found\n"
msgstr "¤£¯à¶Ç°e³o­Ó¶µ¥Ø¡I\n"
# calendar/gui/gnome-cal.c:840
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
#, fuzzy
msgid "You do not have the right permissions to update the calendar\n"
msgstr "¤£¯à¶}±Ò `%s' ¤ºªº¸ê®Æ§¨"
# calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
msgid "Update complete\n"
msgstr "§ó·s§¹¦¨\n"
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
#, fuzzy
msgid "Calendar file could not be updated!\n"
msgstr "¤£¯à¶Ç°e³o­Ó¶µ¥Ø¡I\n"
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
# calendar/gui/gnome-cal.c:840
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
#, fuzzy
msgid "You don't have the right permissions to update the calendar\n"
msgstr "¤£¯à¶}±Ò `%s' ¤ºªº¸ê®Æ§¨"
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
msgid "Attendee status updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
#, fuzzy
msgid "Attendee status could not be updated!\n"
msgstr "¤£¯à¶Ç°e³o­Ó¶µ¥Ø¡I\n"
# calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
msgid "Removal Complete"
msgstr "²¾°£§¹¦¨"
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
msgid "Item sent!\n"
msgstr "¶µ¥Ø¶Ç°e¡I\n"
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
msgid "The item could not be sent!\n"
msgstr "¤£¯à¶Ç°e³o­Ó¶µ¥Ø¡I\n"
# mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
#, fuzzy
msgid "Select Calendar Folder"
msgstr "¿ï¾Ü¸ê®Æ§¨"
# mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
#, fuzzy
msgid "Select Tasks Folder"
msgstr "¿ï¾Ü¸ê®Æ§¨"
@@ -7094,8 +7118,8 @@ msgid "Meeting _end time:"
msgstr "·|ijµ²§ô®É¶¡(_E)¡G"
# mail/mail-ops.c:1262
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
#, fuzzy, c-format
msgid "Opening tasks at %s"
msgstr "¶}±Ò¶JÂÃ %s"
@@ -7113,13 +7137,13 @@ msgid "The method required to load `%s' is not supported"
msgstr "¤£¤ä´©¥Î§@¸ü¤J `%s' ¥²¶·ªº¤èªk"
# calendar/gui/gnome-cal.c:840
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
#, fuzzy, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "¤£¯à¶}±Ò `%s' ¤ºªº¸ê®Æ§¨"
# shell/e-shell-importer.c:384
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
#, fuzzy, c-format
msgid ""
"Error on %s:\n"
@@ -7146,30 +7170,30 @@ msgstr "§R°£¸ê®Æ§¨"
# calendar/gui/e-week-view.c:3277
# calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
msgid "New _Appointment..."
msgstr "·s¼W¬ù·|(_A)..."
# calendar/gui/gnome-cal.c:840
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "¤£¯à¶}±Ò `%s' ¤ºªº¸ê®Æ§¨"
# calendar/gui/gnome-cal.c:851
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "¤£¤ä´©¥Î§@¶}±Ò `%s' ¥²¶·ªº¤èªk"
# calendar/gui/e-calendar-table.c:162
#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
#, fuzzy, c-format
msgid "Adding alarms for %s"
msgstr "´£¿ô"
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
#, c-format
msgid ""
"The calendar backend for\n"
@@ -7177,7 +7201,7 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
#, c-format
msgid ""
"The task backend for\n"
@@ -7187,14 +7211,14 @@ msgstr ""
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
#, fuzzy, c-format
msgid "Opening calendar at %s"
msgstr "¶}±Ò¸ê®Æ§¨ %s"
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
#, fuzzy
msgid "Opening default tasks folder"
msgstr "¶}±Ò¸ê®Æ§¨ %s"
@@ -7269,72 +7293,72 @@ msgstr "10¤ë"
msgid "September"
msgstr "9¤ë"
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
msgid "An organizer must be set."
msgstr "¥²¶·«ü©w¤@­Ó¥l¶°¤H¡C"
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
msgid "At least one attendee is necessary"
msgstr ""
# data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
#, fuzzy
msgid "Event information"
msgstr "¦æ¨Æ¾ä¸ê°T"
# widgets/misc/e-messagebox.c:152
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
#, fuzzy
msgid "Task information"
msgstr "¤u§@¸ê°T"
# mail/mail-config.glade.h:47
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
#, fuzzy
msgid "Journal information"
msgstr "¿ï¥Îªº¸ê°T"
# mail/mail-config.glade.h:61
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
#, fuzzy
msgid "Free/Busy information"
msgstr "ªÅ¶¢/¦£¸L ¸ê°T"
# data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
#, fuzzy
msgid "Calendar information"
msgstr "¦æ¨Æ¾ä¸ê°T"
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
#, fuzzy
msgid "Updated"
msgstr "¤u§@§ó·s"
# ui/evolution-subscribe.xml.h:4
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
#, fuzzy
msgid "Refresh"
msgstr "­«¾ã²M³æ"
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
msgid "Counter-proposal"
msgstr ""
# mail/mail-config.glade.h:61
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
#, fuzzy, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "ªÅ¶¢/¦£¸L ¸ê°T"
# data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
#, fuzzy
msgid "iCalendar information"
msgstr "¦æ¨Æ¾ä¸ê°T"
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
msgid "You must be an attendee of the event."
msgstr ""
@@ -7648,8 +7672,8 @@ msgstr "¦C¦L¦æ¨Æ¾ä"
# ui/evolution-addressbook.xml.h:10
# ui/evolution-calendar.xml.h:24
#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
msgid "Print Preview"
msgstr "¹wÄý¦C¦L"
@@ -7694,8 +7718,8 @@ msgstr ""
# importers/elm-importer.c:528
# importers/netscape-importer.c:807
# importers/pine-importer.c:668
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
msgid "Do not ask me again."
msgstr "¤£­n¦AÅã¥Ü³o­Ó°T®§¡C"
@@ -9665,13 +9689,13 @@ msgid "Syncing folders"
msgstr "¦P¨B³B²z¸ê®Æ§¨"
# camel/camel-filter-driver.c:866
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "¤ÀªR¹LÂo¾¹µo¥Í¿ù»~¡G %s: %s"
# camel/camel-filter-driver.c:871
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "°õ¦æ¹LÂo¾¹µo¥Í¿ù»~¡G %s: %s"
@@ -9706,19 +9730,19 @@ msgstr "¦b²Ä %d «Ê¶l¥óµo¥Í¿ù»~"
# camel/camel-filter-driver.c:690
# camel/camel-filter-driver.c:788
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
msgid "Syncing folder"
msgstr "¦P¨B³B²z¸ê®Æ§¨"
# camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
#, c-format
msgid "Getting message %d of %d"
msgstr "¥¿¦b±µ¦¬²Ä %d / %d «Ê¶l¥ó"
# camel/camel-filter-driver.c:753
# camel/camel-filter-driver.c:771
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
#, c-format
msgid "Failed at message %d of %d"
msgstr "¦b²Ä %d / %d «Ê¶l¥ó¥¢±Ñ"
@@ -9827,7 +9851,7 @@ msgstr "±N¶l¥ó²¾¨ì %s"
msgid "Copying messages"
msgstr "±N¶l¥ó½Æ»s¨ì %s"
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -9835,15 +9859,15 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -9851,37 +9875,37 @@ msgid ""
msgstr ""
# mail/mail-send-recv.c:471
-#: camel/camel-gpg-context.c:769 camel/camel-gpg-context.c:1228
-#: camel/camel-gpg-context.c:1336 camel/camel-gpg-context.c:1411
-#: camel/camel-gpg-context.c:1469 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
msgid "Cancelled."
msgstr "¤w¨ú®ø¡C"
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
# camel/providers/imap/camel-imap-command.c:232
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
#, fuzzy, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "±q IMAP ¦øªA¾¹¶Ç¦^¤£·íªº¦^À³¡G %s"
# camel/camel-pgp-context.c:1073
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
#, fuzzy
msgid "No data provided"
msgstr "¨S¦³«ü©w¸ê®Æ§¨¦WºÙ¡C"
# camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
#, fuzzy
msgid "Failed to encrypt: No valid recipients specified."
msgstr "µLªk¶Ç°e¶l¥ó¡G¨S¦³´£¨Ñ¦¬¥óªÌ¡C"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
#, fuzzy, c-format
msgid ""
"Failed to GPG %s message: %s\n"
@@ -9891,29 +9915,29 @@ msgstr "¸Ñ±K¶l¥ó¥¢±Ñ¡C"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
#, fuzzy, c-format
msgid "Failed to GPG %s message: %s\n"
msgstr "¸Ñ±K¶l¥ó¥¢±Ñ¡C"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
#, fuzzy, c-format
msgid "Failed to execute gpg: %s"
msgstr "¸Ñ±K¶l¥ó¥¢±Ñ¡C"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1249 camel/camel-gpg-context.c:1328
-#: camel/camel-gpg-context.c:1402 camel/camel-gpg-context.c:1432
-#: camel/camel-gpg-context.c:1460 camel/camel-gpg-context.c:1490
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
#, fuzzy
msgid "Failed to execute gpg."
msgstr "¸Ñ±K¶l¥ó¥¢±Ñ¡C"
# camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
#, fuzzy, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "¤£¯à«Ø¥ß¼È¦sÀɮסG%s"
@@ -10201,7 +10225,7 @@ msgstr ""
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:433
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
msgid "Bad authentication response from server."
msgstr "¨Ó¦Û¦øªA¾¹ªº¤£¨}³\¥i¦^À³¡C"
@@ -10539,7 +10563,7 @@ msgstr ""
msgid "Error in application verification"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
#, c-format
msgid ""
"Issuer: %s\n"
@@ -10548,11 +10572,11 @@ msgid ""
"Signature: %s"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
msgid "GOOD"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
msgid "BAD"
msgstr ""
@@ -10578,7 +10602,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:535
+#: camel/camel-tcp-stream-ssl.c:690
#, fuzzy, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -10593,6 +10617,34 @@ msgstr ""
"\n"
"±zµL½×¦p¦ó³£­n±µ¨ü¶Ü¡H"
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "ÃÒ®Ñ ID¡G"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "ÃÒ®Ñ ID¡G"
+
# camel/camel-url.c:289
#: camel/camel-url.c:288
#, c-format
@@ -10654,13 +10706,13 @@ msgstr "¤£¯à±N¸ê®Æ§¨ %s ­«·s©R¦W¬° %s¡G %s"
#: camel/providers/imap/camel-imap-command.c:224
#: camel/providers/imap/camel-imap-command.c:263
#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
msgid "Operation cancelled"
msgstr "¦æ°Ê¤w¨ú®ø"
# camel/camel-remote-store.c:476
#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
#, fuzzy, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "¦øªA¾¹¬ðµM¤¤Â_³s½u"
@@ -10819,7 +10871,7 @@ msgstr "Àˬd©Ò¦³¸ê®Æ§¨¸Ìªº·s¶l¥ó"
# camel/providers/imap/camel-imap-provider.c:48
# shell/e-shell-view.c:552
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
msgid "Folders"
msgstr "¸ê®Æ§¨"
@@ -10924,34 +10976,34 @@ msgid "SSL negotiations failed"
msgstr "Åçµý¥¢±Ñ¡C"
# camel/providers/imap/camel-imap-store.c:456
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP ¦øªA¾¹ %s ¤£¤ä´©©Ò­n¨DªºÅçÃÒÃþ§O %s"
# camel/providers/imap/camel-imap-store.c:466
# camel/providers/smtp/camel-smtp-transport.c:366
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
#: camel/providers/smtp/camel-smtp-transport.c:482
#, c-format
msgid "No support for authentication type %s"
msgstr "¤£¤ä´©ÅçÃÒÃþ§O %s"
# camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/imap/camel-imap-store.c:1121
+#: camel/providers/imap/camel-imap-store.c:1116
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s ½Ð¿é¤J %s@%s ªº IMAP ±K½X"
# camel/providers/imap/camel-imap-store.c:505
# camel/providers/smtp/camel-smtp-transport.c:410
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
#: camel/providers/smtp/camel-smtp-transport.c:523
msgid "You didn't enter a password."
msgstr "±z¨S¦³¿é¤J±K½X¡C"
# camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10964,25 +11016,25 @@ msgstr ""
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
#, c-format
msgid "No such folder %s"
msgstr "¨S¦³³o­Ó¸ê®Æ§¨ %s"
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
#, fuzzy, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
msgstr "¸ê®Æ§¨¦WºÙ¤£¯à¥]§t´«¦æ¦r¤¸¡C"
# camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
#, fuzzy, c-format
msgid "Unknown parent folder: %s"
msgstr "¤£©úªº¿ù»~¡G%s"
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
msgid "The parent folder is not allowed to contain subfolders"
msgstr "¥À¸ê®Æ§¨¨Ã¤£¤¹³\¥]§t¤l¸ê®Æ§¨"
@@ -11767,7 +11819,7 @@ msgstr "¤£¯à°÷³s½u¨ì %s ¤Wªº POP ¦øªA¾¹¡C"
# camel/providers/pop3/camel-pop3-store.c:409
#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
#, fuzzy, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -11788,20 +11840,20 @@ msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr ""
# camel/providers/pop3/camel-pop3-store.c:199
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
#, fuzzy, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "µLªkÅçÃÒµn¤J KPOP ¦øªA¾¹¡G%s"
# camel/providers/pop3/camel-pop3-store.c:361
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
#, fuzzy, c-format
msgid "%sPlease enter the POP password for %s@%s"
msgstr "%s ½Ð¿é¤Jµ¹ %s@%s ªº POP3 ±K½X"
# camel/providers/pop3/camel-pop3-store.c:417
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
#, fuzzy, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -11811,7 +11863,7 @@ msgstr ""
"¶Ç°e±K½X®Éµo¥Í¿ù»~¡G%s"
# camel/providers/pop3/camel-pop3-store.c:484
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
#, c-format
msgid "No such folder `%s'."
msgstr "¨S¦³³o­Ó¸ê®Æ§¨ `%s'¡C"
@@ -11819,7 +11871,7 @@ msgstr "¨S¦³³o­Ó¸ê®Æ§¨ `%s'¡C"
# camel/providers/sendmail/camel-sendmail-provider.c:37
# mail/mail-config.glade.h:67
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
msgid "Sendmail"
msgstr "Sendmail"
@@ -12258,17 +12310,17 @@ msgid "attachment"
msgstr "ªþ¥ó"
# composer/e-msg-composer-attachment-bar.c:469
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
msgid "Remove selected items from the attachment list"
msgstr "²¾°£¤w¿ï¾Üªºªþ¥[ÀÉ®×"
# composer/e-msg-composer-attachment-bar.c:500
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
msgid "Add attachment..."
msgstr "·s¼Wªþ¥ó..."
# composer/e-msg-composer-attachment-bar.c:501
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
msgid "Attach a file to the message"
msgstr "ªþ¥[Àɮצܶl¥ó"
@@ -12308,7 +12360,7 @@ msgid "Suggest automatic display of attachment"
msgstr "«Øij¦Û°ÊÅã¥Üªþ¥ó"
# composer/e-msg-composer-hdrs.c:324
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
msgid "Click here for the address book"
msgstr "«ö³o¸Ì·s¼W¥Ø¿ýªA°È"
@@ -12320,7 +12372,7 @@ msgstr "«ö³o¸Ì·s¼W¥Ø¿ýªA°È"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:400
msgid "Reply-To:"
msgstr "¦^ÂЦa§}¡G"
@@ -12328,7 +12380,7 @@ msgstr "¦^ÂЦa§}¡G"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
msgid "From:"
msgstr "±H¥óªÌ¡G"
@@ -12336,37 +12388,37 @@ msgstr "±H¥óªÌ¡G"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
msgid "Subject:"
msgstr "¥D¦®¡G"
# composer/e-msg-composer-hdrs.c:386
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
msgid "To:"
msgstr "¦¬¥óªÌ¡G"
# composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
msgid "Enter the recipients of the message"
msgstr "¿é¤J¶l¥óªº¦¬¥óªÌ"
# composer/e-msg-composer-hdrs.c:390
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
msgid "Cc:"
msgstr "°Æ¥»¡G"
# composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "¿é¤J¶l¥ó°Æ¥»ªº¦¬¥óªÌ"
# composer/e-msg-composer-hdrs.c:394
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
msgid "Bcc:"
msgstr "±K¥ó°Æ¥»¡G"
# composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -12376,7 +12428,7 @@ msgstr "¿é¤J¶l¥ó±K¥ó°Æ¥»ªº¦¬¥óªÌ"
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
#, fuzzy
msgid "Post To:"
msgstr "³q°T°ð(_P)¡G"
@@ -12384,14 +12436,14 @@ msgstr "³q°T°ð(_P)¡G"
# addressbook/gui/component/addressbook-config.c:689
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:3
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
#, fuzzy
msgid "Posting destination"
msgstr "´y­z"
# composer/e-msg-composer-attachment-bar.c:421
# ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
#: ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr "ªþ¥[ÀÉ®×"
@@ -12630,7 +12682,7 @@ msgstr "¥D¦®¤£¥]§t"
# mail/mail-callbacks.c:1144
# mail/mail-display.c:96
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
#: mail/mail-display.c:192
msgid ""
"A file by that name already exists.\n"
@@ -12784,7 +12836,7 @@ msgid "%I %p"
msgstr "%I %p"
#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
msgid "seconds"
msgstr "’"
@@ -12901,8 +12953,8 @@ msgstr ""
"¥¿³Wªí¥Ü¦¡¤º¦³¿ù»~ '%s'¡G\n"
"%s"
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
msgid "Important"
msgstr "­«­n"
@@ -12910,29 +12962,29 @@ msgstr "­«­n"
# mail/mail-mt.c:545
# mail/mail-mt.c:880
#. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
#, fuzzy
msgid "Work"
msgstr "¥¿¦b¤u§@"
#. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
msgid "Personal"
msgstr ""
# mail/mail-format.c:762
# mail/message-list.c:1083
#. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
#, fuzzy
msgid "To Do"
msgstr "¦h­ô"
# calendar/gui/event-editor-dialog.glade.h:33
#. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
#, fuzzy
msgid "Later"
msgstr "¤§«á"
@@ -13097,241 +13149,237 @@ msgid "Beep"
msgstr "¨©¨½´µ"
#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "¥]§t"
+
+#: filter/libfilter-i18n.h:8
msgid "Copy to Folder"
msgstr "½Æ»s¦Ü¸ê®Æ§¨"
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
msgid "Date received"
msgstr "¦¬¥ó¤é´Á"
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
msgid "Date sent"
msgstr "°e¥ó¤é´Á"
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
msgid "Deleted"
msgstr "¤w§R°£"
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "¤£¥]§t"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "¤£¬O¥H¦¹²×µ²"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "¤£¦s¦b"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "¤£¦s¦b"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "¤£Ãþ¦ü"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "¤£¬O¥H¦¹¶}©l"
+
+#: filter/libfilter-i18n.h:19
msgid "Do Not Exist"
msgstr "¤£¦s¦b"
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
msgid "Draft"
msgstr "¯ó½Z"
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "¥H¦¹²×µ²"
+
+#: filter/libfilter-i18n.h:22
msgid "Exist"
msgstr "¦s¦b"
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "¦s¦b"
+
+#: filter/libfilter-i18n.h:24
msgid "Expression"
msgstr "恝y"
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
msgid "Follow Up"
msgstr ""
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "¬O"
+
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "¬O¤§«áªº"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "¬O¤§«eªº"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "¦³¼Ð¼mªº"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "¤j©ó"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "¤p©ó"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "¤£¬O"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "¦³¼Ð¼mªº"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
msgid "Label"
msgstr ""
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
msgid "Mailing list"
msgstr "¶l¥ó¦Cªí"
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
msgid "Message Body"
msgstr "¶l¥ó¤º®e"
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
msgid "Message Header"
msgstr "¶l¥óÀÉÀY"
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
msgid "Move to Folder"
msgstr "²¾¦Ü¸ê®Æ§¨"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
# addressbook/gui/widgets/e-addressbook-view.c:613
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
#, fuzzy
msgid "Pipe Message to Shell Command"
msgstr "¶Ç°e¶l¥óµ¹³sµ¸¤H"
# calendar/gui/event-editor-dialog.glade.h:14
# calendar/gui/event-editor.c:1588
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
#, fuzzy
msgid "Play Sound"
msgstr "¼½©ñ­µ®Ä¡G"
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
msgid "Read"
msgstr "¾\Ū"
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
msgid "Recipients"
msgstr "¦¬¥óªÌ"
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
msgid "Regex Match"
msgstr "¥¿³Wªí¥Ü¦¡¬Û°t"
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
msgid "Replied to"
msgstr "¦^ÂÐ"
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "°Ó°È¹q¸Ü"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "¤j©ó"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "¤p©ó"
# mail/message-list.c:1081
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
#: mail/message-list.etspec.h:10
msgid "Score"
msgstr "¥Ø¼Ð"
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
msgid "Sender"
msgstr "±H¥óªÌ"
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
msgid "Set Status"
msgstr "³]©wª¬ºA"
# addressbook/contact-editor/e-contact-editor.c:1248
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
#, fuzzy
msgid "Shell Command"
msgstr "¤½¥q¹q¸Ü"
# addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
msgid "Size (kB)"
msgstr "¤j¤p (kB)"
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "Ãþ¦ü"
+
+#: filter/libfilter-i18n.h:55
msgid "Source Account"
msgstr "¨Ó·½±b¸¹"
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
msgid "Specific header"
msgstr "«ü©wÀÉÀY"
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "¥H¦¹¶}©l"
+
+#: filter/libfilter-i18n.h:59
msgid "Stop Processing"
msgstr "°±¤î³B²z"
# mail/mail-format.c:767
# mail/message-list.c:1082
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
msgid "Subject"
msgstr "¥D¦®"
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
#, fuzzy
msgid "Unset Status"
msgstr "³]©wª¬ºA"
-#: filter/libfilter-i18n.h:41
-msgid "contains"
-msgstr "¥]§t"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not contain"
-msgstr "¤£¥]§t"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not end with"
-msgstr "¤£¬O¥H¦¹²×µ²"
-
-#: filter/libfilter-i18n.h:44
-msgid "does not exist"
-msgstr "¤£¦s¦b"
-
-#: filter/libfilter-i18n.h:45
-#, fuzzy
-msgid "does not return"
-msgstr "¤£¦s¦b"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not sound like"
-msgstr "¤£Ãþ¦ü"
-
-#: filter/libfilter-i18n.h:47
-msgid "does not start with"
-msgstr "¤£¬O¥H¦¹¶}©l"
-
-#: filter/libfilter-i18n.h:48
-msgid "ends with"
-msgstr "¥H¦¹²×µ²"
-
-#: filter/libfilter-i18n.h:49
-msgid "exists"
-msgstr "¦s¦b"
-
-#: filter/libfilter-i18n.h:50
-#, fuzzy
-msgid "is Flagged"
-msgstr "¦³¼Ð¼mªº"
-
-#: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "is after"
-msgstr "¬O¤§«áªº"
-
-#: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "is before"
-msgstr "¬O¤§«eªº"
-
-#: filter/libfilter-i18n.h:53
-msgid "is greater than"
-msgstr "¤j©ó"
-
-#: filter/libfilter-i18n.h:54
-msgid "is less than"
-msgstr "¤p©ó"
-
-#: filter/libfilter-i18n.h:55
-#, fuzzy
-msgid "is not Flagged"
-msgstr "¦³¼Ð¼mªº"
-
-#: filter/libfilter-i18n.h:56
-msgid "is not"
-msgstr "¤£¬O"
-
-#: filter/libfilter-i18n.h:57
-msgid "is"
-msgstr "¬O"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns greater than"
-msgstr "¤j©ó"
-
-#: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns less than"
-msgstr "¤p©ó"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: filter/libfilter-i18n.h:60
-#, fuzzy
-msgid "returns"
-msgstr "°Ó°È¹q¸Ü"
-
-#: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr "Ãþ¦ü"
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
-msgstr "¥H¦¹¶}©l"
-
#: filter/rule-editor.c:180
msgid "Rules"
msgstr "³W«h"
@@ -13635,7 +13683,7 @@ msgstr "«D¶g´Á©Ê¬ù·|(_N)"
msgid "Mail Accounts"
msgstr "±b¸¹"
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
msgid "Mail Preferences"
msgstr ""
@@ -13764,13 +13812,13 @@ msgstr "¤£¯àªì©l¤Æ Evolution ªº mail ¤¸¥ó¡C"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
#, fuzzy
msgid "Connecting..."
msgstr "¥¿¦b³s½u¦Ü¦øªA¾¹..."
# mail/component-factory.c:410
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
msgid "Cannot register storage with shell"
msgstr "¤£¯à¥H¦¹ shell µù¥UÀx¦sªÅ¶¡"
@@ -13837,53 +13885,53 @@ msgid "%d total"
msgstr "%d ¥þ³¡"
# ui/evolution-mail.xml.h:10
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
#, fuzzy
msgid "Create _Virtual Folder From Search..."
msgstr "±q¶l¥ó«Ø¥ßµêÀÀ¸ê®Æ§¨(_V)"
# mail/folder-browser.c:653
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
msgid "VFolder on _Subject"
msgstr "±q¥D¦®«Ø¥ßµêÀÀ¸ê®Æ§¨(_S)"
# mail/folder-browser.c:656
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
msgid "VFolder on Se_nder"
msgstr "±q±H¥óªÌ«Ø¥ßµêÀÀ¸ê®Æ§¨(_N)"
# mail/folder-browser.c:659
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
msgid "VFolder on _Recipients"
msgstr "±q¦¬¥óªÌ«Ø¥ßµêÀÀ¸ê®Æ§¨(_R)"
# mail/folder-browser.c:662
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
msgid "VFolder on Mailing _List"
msgstr "±q¶l¥ó²M³æ«Ø¥ßµêÀÀ¸ê®Æ§¨(_L)"
# mail/folder-browser.c:668
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
msgid "Filter on Sub_ject"
msgstr "±q¥D¦®«Ø¥ß³W«h(_J)"
# mail/folder-browser.c:671
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
msgid "Filter on Sen_der"
msgstr "±q±H¥óªÌ«Ø¥ß³W«h(_D)"
# mail/folder-browser.c:674
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
msgid "Filter on Re_cipients"
msgstr "¦¬¥óªÌ³W«h(_C)"
# mail/folder-browser.c:677
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
msgid "Filter on _Mailing List"
msgstr "±q¶l¥ó²M³æ«Ø¥ß³W«h(_M)"
# ui/evolution-mail.xml.h:66
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
msgid "_Edit as New Message..."
msgstr "½s¿è¬°·s¶l¥ó(_E)..."
@@ -13891,34 +13939,34 @@ msgstr "½s¿è¬°·s¶l¥ó(_E)..."
# ui/evolution-event-editor.xml.h:69
# ui/evolution-task-editor-dialog.xml.h:82
# ui/evolution-tasks.xml.h:7
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
msgid "_Print"
msgstr "¦C¦L(_P)"
# mail/folder-browser.c:697
# ui/evolution-mail.xml.h:117
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
msgid "_Reply to Sender"
msgstr "¦^ÂбH¥óªÌ(_R)"
# mail/folder-browser.c:699
# ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
msgid "Reply to _List"
msgstr "¦^ÂЦܲM³æ(_A)"
# mail/folder-browser.c:699
# ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
msgid "Reply to _All"
msgstr "¦^ÂЩҦ³¤H(_A)"
# mail/folder-browser.c:701
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
msgid "_Forward"
msgstr "Âà±H(_F)"
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
msgid "Follo_w Up..."
msgstr ""
@@ -13926,97 +13974,97 @@ msgstr ""
# calendar/gui/calendar-model.c:1180
# calendar/gui/dialogs/task-editor-dialog.glade.h:6
# calendar/gui/e-calendar-table.c:421
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
#, fuzzy
msgid "Fla_g Completed"
msgstr "¤w§¹¦¨"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
# ui/evolution-calendar.xml.h:3
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
#, fuzzy
msgid "Cl_ear Flag"
msgstr "²M°£"
# mail/folder-browser.c:704
#. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
msgid "Mar_k as Read"
msgstr "¼Ð¥Ü¦¨¤w¾\Ū(_K)"
# mail/folder-browser.c:706
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
#, fuzzy
msgid "Mark as _Unread"
msgstr "¼Ð¥Ü¦¨¥¼¾\Ū(_n)"
# mail/folder-browser.c:706
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
msgid "Mark as _Important"
msgstr "¼Ð¥Ü¦¨­«­n(_I)"
# mail/folder-browser.c:706
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
#, fuzzy
msgid "_Mark as Unimportant"
msgstr "¼Ð¥Ü¦¨¤£­«­n(_O)"
# mail/folder-browser.c:717
# ui/evolution-mail.xml.h:121
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
#, fuzzy
msgid "U_ndelete"
msgstr "´_­ì(_U)"
# mail/folder-browser.c:711
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
#, fuzzy
msgid "Mo_ve to Folder..."
msgstr "²¾¦Ü¸ê®Æ§¨(_M)..."
# mail/folder-browser.c:713
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr "´_»s¦Ü¸ê®Æ§¨(_C)..."
# addressbook/gui/component/addressbook-config.c:662
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
#, fuzzy
msgid "Add Sender to Address_book"
msgstr "·s¼W¶Ç°eªÌ¨ì¥Ø¿ýªA°È"
# mail/folder-browser.c:727
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
#, fuzzy
msgid "Appl_y Filters"
msgstr "®M¥Î¹LÂo¾¹"
# mail/folder-browser.c:731
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
#, fuzzy
msgid "Crea_te Rule From Message"
msgstr "±q¶l¥ó«Ø¥ß³W«h(_L)"
# mail/folder-browser.c:871
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
#, fuzzy
msgid "VFolder on M_ailing List"
msgstr "¶l¥ó²M³æªºµêÀÀ¸ê®Æ§¨"
# mail/folder-browser.c:873
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
#, fuzzy, c-format
msgid "Filter on _Mailing List (%s)"
msgstr "¶l¥ó²M³æªº¹LÂo¾¹ (%s)"
# mail/folder-browser.c:874
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
#, fuzzy, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr "¶l¥ó²M³æªºµêÀÀ¸ê®Æ§¨ (%s)"
# mail/mail-config.glade.h:21
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
#, fuzzy
msgid "Default"
msgstr "¹w³]­È(_F)"
@@ -14100,19 +14148,19 @@ msgstr "Evolution ±b¸¹½s¿è¾¹"
# addressbook/gui/component/addressbook-config.c:401
# mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
msgid "_Host:"
msgstr "¥D¾÷(_H)¡G"
# mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
#, fuzzy
msgid "User_name:"
msgstr "¨Ï¥ÎªÌ¦WºÙ(_U)¡G"
# addressbook/gui/component/addressbook-config.c:520
# mail/mail-config.glade.h:53
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
msgid "_Path:"
msgstr "¸ô®|(_P)¡G"
@@ -14138,23 +14186,23 @@ msgstr "½T©w§R°£±b¸¹¡H"
# mail/mail-accounts.c:197
#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
msgid "Disable"
msgstr "°±¥Î"
# mail/mail-accounts.c:199
# mail/mail-config.glade.h:30
#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
msgid "Enable"
msgstr "±Ò¥Î"
# mail/mail-accounts.c:199
# mail/mail-config.glade.h:30
#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
msgid "Enabled"
msgstr "¤w±Ò¥Î"
@@ -14301,32 +14349,32 @@ msgstr ""
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
msgid "an unknown sender"
msgstr "¤£©úªº±H¥óªÌ"
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr "¦b %a, %Y-%m-%d %H:%M, %%s ¼g¹D¡G"
# mail/mail-callbacks.c:850
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
msgid "Move message(s) to"
msgstr "±N¶l¥ó²¾¦Ü"
# mail/mail-callbacks.c:852
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
msgid "Copy message(s) to"
msgstr "±N¶l¥ó½Æ»s¨ì"
# mail/mail-callbacks.c:1017
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "±z½T©w­n½s¿è¥þ³¡ %d «Ê¶l¥ó¡H"
# mail/mail-callbacks.c:1039
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -14335,7 +14383,7 @@ msgstr ""
"¯ó½Z¸ê®Æ§¨¤ºªº¶l¥ó¡C"
# mail/mail-callbacks.c:1073
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -14344,45 +14392,45 @@ msgstr ""
"¤ºªº¶l¥ó­«¶Ç¡C"
# mail/mail-callbacks.c:1085
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "±z½T©w­n­«·s¶Ç°e¥þ³¡ %d «Ê¶l¥ó¡H"
# mail/mail-callbacks.c:1106
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
msgid "No Message Selected"
msgstr "¨S¦³¿ï©w¶l¥ó"
# mail/mail-callbacks.c:1140
# mail/mail-display.c:92
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
msgid "Overwrite file?"
msgstr "Âл\ÀɮסH"
# mail/mail-callbacks.c:1188
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
msgid "Save Message As..."
msgstr "¥t¦s¶l¥ó..."
# mail/mail-callbacks.c:1190
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
msgid "Save Messages As..."
msgstr "¥t¦s¶l¥ó..."
# ui/evolution-mail.xml.h:23
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
#, fuzzy
msgid "Go to next folder with unread messages?"
msgstr "Åã¥Ü¤U¤@«Ê¥¼¾\Ūªº¶l¥ó"
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
msgid ""
"There are no more new messages in this folder.\n"
"Would you like to go to the next folder?"
msgstr ""
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -14395,7 +14443,7 @@ msgstr ""
"½T©w²M°£³o¨Ç¶l¥ó¡H"
# mail/mail-callbacks.c:1349
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -14406,32 +14454,32 @@ msgstr ""
# importers/netscape-importer.c:795
# mail/mail-callbacks.c:1359
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
msgid "Filters"
msgstr "¹LÂo¾¹"
# camel/camel-filter-driver.c:748
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
#, fuzzy, c-format
msgid "Page %d of %d"
msgstr "¥¿¦b±µ¦¬²Ä %d / %d «Ê¶l¥ó"
# mail/mail-callbacks.c:1407
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
msgid "Print Message"
msgstr "¦C¦L¶l¥ó"
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
msgid "US-Letter"
msgstr ""
# mail/mail-callbacks.c:1454
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
msgid "Printing of message failed"
msgstr "¦C¦L¶l¥ó¥¢±Ñ"
# mail/mail-callbacks.c:1549
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "±z½T©w­n¥Î·sµøµ¡¶}±Ò¥þ³¡ %d «Ê¶l¥ó¡H"
@@ -14445,35 +14493,29 @@ msgstr ""
# addressbook/gui/component/addressbook-config.c:689
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
-#: mail/mail-composer-prefs.c:413
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
#, fuzzy
msgid " [script]"
msgstr "´y­z"
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
msgid "Please specify a valid script name"
msgstr ""
# addressbook/gui/component/addressbook-storage.c:99
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
#, fuzzy
msgid "Unnamed"
msgstr "¥¼©R¦Wªº³sµ¸¤H"
-# ui/evolution-message-composer.xml.h:26
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "¶Ç°e"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
#, fuzzy
msgid "Add script signature"
msgstr "·s¼W±ø¥ó"
# mail/mail-config.glade.h:74
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
#, fuzzy
msgid "Add Signature"
msgstr "_HTML ñ¦WÀÉ¡G"
@@ -14530,106 +14572,101 @@ msgstr ""
# mail/mail-config-druid.c:445
#. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
msgid "Evolution Account Assistant"
msgstr "Evolution ±b¸¹§U²z"
# mail/mail-config.glade.h:3
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
#, fuzzy, c-format
msgid "Account %d"
msgstr "±b¸¹"
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
msgid "Checking Service"
msgstr "ÀˬdªA°È"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
msgid "Connecting to server..."
msgstr "¥¿¦b³s½u¦Ü¦øªA¾¹..."
-#: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
# mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:1
#, fuzzy
msgid " _Check for supported types "
msgstr " Àˬd¥i¤ä´©ªºÃþ§O(_C)"
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
#, fuzzy
msgid "(SSL is not supported in this build of Evolution)"
msgstr "(¦¹¤@ª©¥»ªº evolution ¨Ã¤£¤ä´© SSL)"
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
msgid "(SSL is not supported in this build of evolution)"
msgstr "(¦¹¤@ª©¥»ªº evolution ¨Ã¤£¤ä´© SSL)"
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
#, fuzzy
msgid "A_lways encrypt to myself when sending encrypted mail"
msgstr "·í¶Ç°e¥[±K¶l¥ó®É¥Ã»·¦Û§Ú¥[±K"
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
msgstr ""
# mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
#, fuzzy
msgid "Account Editor"
msgstr "±b¸¹"
# mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
msgid "Account Information"
msgstr "±b¸¹¸ê°T"
# mail/mail-config.glade.h:5
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr "±b¸¹Á`ºÞ"
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
#, fuzzy
msgid "Add Sc_ript"
msgstr "·s¼W±ø¥ó"
# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
#, fuzzy
msgid "Add new signature..."
msgstr "Àx¦sñ¦WÀÉ"
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
#, fuzzy
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr "·í¶Ç°e¥[±K¶l¥ó®É¥Ã»·¦Û§Ú¥[±K"
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
#, fuzzy
msgid "Alwa_ys sign outgoing messages when using this account"
msgstr "·í¨Ï¥Î³o­Ó±b¸¹®É¥Ã»·¦b±H°eªº¶l¥ó¤W¥[ñ"
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
msgid "Always _blind carbon-copy (Bcc) to:"
msgstr ""
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
msgid "Always _carbon-copy (Cc) to:"
msgstr ""
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
msgid "Always _trust keys in my keyring when encrypting"
msgstr ""
# composer/e-msg-composer-attachment-bar.c:501
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
#, fuzzy
msgid "Attach original message"
msgstr "ªþ¥[Àɮצܶl¥ó"
@@ -14637,31 +14674,31 @@ msgstr "ªþ¥[Àɮצܶl¥ó"
# composer/e-msg-composer-attachment.glade.h:1
# mail/mail-config.glade.h:9
# mail/message-list.c:1081
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "ªþ¥ó"
# mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
msgid "Authentication"
msgstr "ÅçÃÒ"
# mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
#, fuzzy
msgid "Automatically _detect links"
msgstr "¦Û°ÊÀˬd·s¶l¥ó¨C¹j(_A)"
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
msgid "Baltic (ISO-8859-4)"
msgstr ""
# mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
#, fuzzy
msgid "C_haracter set:"
msgstr "¤£©úªº½s½X¡G%s"
@@ -14673,42 +14710,42 @@ msgstr "¤£©úªº½s½X¡G%s"
# ui/evolution-subscribe.xml.h:2
# ui/evolution-task-editor-dialog.xml.h:11
# ui/evolution.xml.h:5
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
#, fuzzy
msgid "C_olors"
msgstr "Ãö³¬ (_L)"
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
msgid "Check spelling while I _type"
msgstr ""
# camel/providers/imap/camel-imap-provider.c:43
# mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
#, fuzzy
msgid "Checking for New Mail"
msgstr "Àˬd·s¶l¥ó"
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
#, fuzzy
msgid "Color for _misspelled words:"
msgstr "¤µ¤Ñ¨ì´Áªº¤u§@¦â±m"
# composer/e-msg-composer.c:1526
# composer/e-msg-composer.c:1871
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
#, fuzzy
msgid "Composing Messages"
msgstr "½s¿è¶l¥ó"
# mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
#, fuzzy
msgid "Configuration"
msgstr "¶l¥ó³]©w"
# mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -14725,87 +14762,87 @@ msgstr ""
"½Ð«ö \"§¹¦¨\" ¨ÓÀx¦s±zªº³]©w¡C"
# mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
msgid "De_fault"
msgstr "¹w³]­È(_F)"
# mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
#, fuzzy
msgid "Default Behavior"
msgstr "¹w³]­È(_F)"
# mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
#, fuzzy
msgid "Default character _encoding:"
msgstr "¹w³]½s½X¡G"
# mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
#, fuzzy
msgid "Deleting Mail"
msgstr "±µ¦¬¶l¥ó"
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
msgid "Digital IDs..."
msgstr "¼Æ¦ì ID..."
# camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
#, fuzzy
msgid "Do not quote original message"
msgstr "¤£¯à¶}±Ò¶l¥ó"
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr ""
# mail/mail-config.glade.h:25
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
msgstr "§¹¦¨"
# mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
#, fuzzy
msgid "Drafts _folder:"
msgstr "¯ó½Z§X¡G"
# mail/mail-accounts.c:199
# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
msgid "E_nable"
msgstr "±Ò¥Î(_E)"
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
#, fuzzy
msgid "Emacs"
msgstr "ªF"
# addressbook/gui/component/addressbook.c:620
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
#, fuzzy
msgid "Email Accounts"
msgstr "¹q¶l¦a§}¥]§t"
# mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
#, fuzzy
msgid "Email _address:"
msgstr "¹q¤l¶l¥ó¦a§}¡G"
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
#, fuzzy
msgid "Empty _trash folders on exit"
msgstr "Â÷¶}®É²MªÅ©U§£±í¸ê®Æ§¨(_E)"
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
#, fuzzy
msgid "Execute Command..."
msgstr "°õ¦æ°Ê§@"
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
#, fuzzy
msgid "Fi_xed -width:"
msgstr "¥H¦¹²×µ²"
@@ -14813,93 +14850,99 @@ msgstr "¥H¦¹²×µ²"
# mail/folder-browser-factory.c:198
# ui/evolution-event-editor.xml.h:39
# ui/evolution-task-editor-dialog.xml.h:42
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
#, fuzzy
msgid "Font Properties"
msgstr "¤º®e"
# mail/mail-ops.c:1154
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
#, fuzzy
msgid "Format messages in _HTML"
msgstr "¤wÂà±Hªº¶l¥ó"
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
msgid "Get Digital ID..."
msgstr "¨ú±o¼Æ¦ì ID..."
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
#, fuzzy
msgid "Highlight _quotations with"
msgstr "±j½Õ¤Þ¤å(_H)"
# mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
msgid "IMAPv4 "
msgstr "IMAPv4 "
# mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr "¨­¥÷"
# mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
msgid "Inline"
msgstr "¥¿±`"
# mail/mail-config.glade.h:38
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
msgid "Kerberos "
msgstr "Kerberos "
# ui/evolution-contact-editor.xml.h:9
# ui/evolution-event-editor.xml.h:42
# ui/evolution-task-editor-dialog.xml.h:52
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
#, fuzzy
msgid "Labels and Colors"
msgstr "Àx¦s«áÃö³¬"
# ui/evolution-mail.xml.h:46
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
#, fuzzy
msgid "Loading Images"
msgstr "¸ü¤J¹Ï¤ù(_I)"
# mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
msgid "Mail Configuration"
msgstr "¶l¥ó³]©w"
# mail/local-config.glade.h:2
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
msgid "Mailbox location"
msgstr "«H½c¦ì¸m"
# views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
#, fuzzy
msgid "Message Composer"
msgstr "¶l¥ó"
# views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
#, fuzzy
msgid "Message Display"
msgstr "À˵ø¶l¥ó(_M)"
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
#, fuzzy
msgid "Microsoft"
msgstr "±K§Jù¥§¦è¨È"
# mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
#, fuzzy
msgid "New Mail Notification"
msgstr "¶l¥ó³]©w"
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
#: mail/mail-config.glade.h:79
msgid "On Screen fonts"
msgstr ""
@@ -15028,110 +15071,92 @@ msgstr ""
msgid "Select HTML variable width font for printing"
msgstr ""
-# mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "¿ï¾Ü PGP ¤G¤¸ÀÉ"
-
# mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr "¶Ç°e¶l¥ó"
# mail/mail-config.glade.h:70
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
#, fuzzy
msgid "Sent _messages folder:"
msgstr "¶Ç°e¶l¥ó¸ê®Æ§¨¡G"
# mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
msgid "Sent and Draft Messages"
msgstr "¶Ç°e»P¯ó½Z¶l¥ó"
# mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
#, fuzzy
msgid "Ser_ver requires authentication"
msgstr "¦øªA¾¹­n¨DÅçÃÒ(_A)"
# mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
msgid "Server Configuration"
msgstr "¦øªA¾¹³]©w"
# mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
#, fuzzy
msgid "Server _Type: "
msgstr "¦øªA¾¹Ãþ§O¡G"
# ui/evolution.xml.h:62
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
#, fuzzy
msgid "Shortcuts _type:"
msgstr "¥\¯à"
-# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "ñ¦WÀÉ¡G"
-
-# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "ñ¦WÀÉ¡G"
-
# addressbook/printing/e-contact-print.glade.h:38
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
#, fuzzy
msgid "Specify _filename:"
msgstr "¼Ë¦¡¦WºÙ¡G"
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
msgid "Spell Checking Language"
msgstr ""
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
msgid "Spell _Checking"
msgstr ""
# mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
msgid "Standard Unix mbox"
msgstr "¼Ð·Ç Unix mbox"
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
"for display purposes only. "
msgstr ""
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
msgid ""
"This page allows you to configure spell checking behavior and language. The "
"list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
msgstr ""
# mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
#, fuzzy
msgid "V_ariable-width:"
msgstr "ÅܼÆ"
# mail/mail-config.glade.h:81
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -15141,229 +15166,219 @@ msgstr ""
"\n"
"«ö \"¤U¤@¨B\" ¶}©l¡C"
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
#, fuzzy
msgid "XEmacs"
msgstr "ªF"
# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
#, fuzzy
msgid "_Add Signature"
msgstr "_HTML ñ¦WÀÉ¡G"
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
msgid "_Always load images off the net"
msgstr "¥Ã»·¦Ûºô¸ô¤U¸ü¹Ï¤ù(_A)"
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
#, fuzzy
msgid "_Always sign outgoing messages when using this account"
msgstr "·í¨Ï¥Î³o­Ó±b¸¹®É¥Ã»·¦b±H°eªº¶l¥ó¤W¥[ñ"
# mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
#, fuzzy
msgid "_Authentication Type: "
msgstr "ÅçÃÒÃþ§O¡G"
# mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
#, fuzzy
msgid "_Authentication type: "
msgstr "ÅçÃÒÃþ§O¡G"
# mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
#, fuzzy
msgid "_Automatically check for new mail"
msgstr "¦Û°ÊÀˬd·s¶l¥ó¨C¹j(_A)"
# mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
#, fuzzy
msgid "_Automatically insert smiley images"
msgstr "¦Û°ÊÀˬd·s¶l¥ó¨C¹j(_A)"
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
msgid "_Beep when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
#, fuzzy
msgid "_Certificate ID:"
msgstr "ÃÒ®Ñ ID¡G"
# mail/mail-ops.c:1449
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
#, fuzzy
msgid "_Confirm when expunging a folder"
msgstr "§R°£¸ê®Æ§¨"
# calendar/gui/e-day-view.c:3179
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
#, fuzzy
msgid "_Default signature:"
msgstr "§R°£Ã±¦WÀÉ¥H¥~ªº¥þ³¡¨Æ¥ó"
# mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
#, fuzzy
msgid "_Defaults"
msgstr "¹w³]­È(_F)"
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
msgid "_Do not notify me when new mail arrives"
msgstr ""
# mail/mail-accounts.c:199
# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
#, fuzzy
msgid "_Enable"
msgstr "±Ò¥Î"
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
msgid "_Fixed-width:"
msgstr ""
# ui/evolution-mail.xml.h:34
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
#, fuzzy
msgid "_Forward style:"
msgstr "Âà±H¤è¦¡"
# mail/mail-config.glade.h:31
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
#, fuzzy
msgid "_Full name:"
msgstr "¥þ¦W(_F)¡G"
# mail/mail-config.glade.h:36
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
#, fuzzy
msgid "_HTML Mail"
msgstr "HTML ®æ¦¡¶l¥ó"
# mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
#, fuzzy
msgid "_Identity"
msgstr "¨­¥÷"
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
msgid "_Load images if sender is in addressbook"
msgstr "¦pªG±H¥óªÌ¦b¥Ø¿ýªA°È¤¤´N¸ü¤J¹Ï¤ù(_L)"
# mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
#, fuzzy
msgid "_Make this my default account"
msgstr "³]¬°¹w³]±b¸¹(_D)"
# ui/evolution-mail.xml.h:51
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
#, fuzzy
msgid "_Mark messages as read after"
msgstr "¼Ð¥Ü¶l¥ó¬°¤w¾\Ū(_M)"
# addressbook/gui/component/addressbook-config.c:686
# mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
msgid "_Name:"
msgstr "¦WºÙ(_N)¡G"
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
msgid "_Never load images off the net"
msgstr "¥Ã»·¤£¦Ûºô¸ô¤U¸ü¹Ï¤ù(_N)"
-# mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP ¤G¤¸½X¸ô®|¡G"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
msgid "_Play sound file when new mail arrives"
msgstr ""
# ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
#, fuzzy
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "·í¶Ç°e¨S¦³¥D¦®ªº¶l¥ó®ÉÅã¥Ü´£¥Ü(_E)"
# ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
#, fuzzy
msgid "_Prompt when sending messages with an empty subject line"
msgstr "·í¶Ç°e¨S¦³¥D¦®ªº¶l¥ó®ÉÅã¥Ü´£¥Ü(_E)"
# mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
#, fuzzy
msgid "_Receiving Mail"
msgstr "±µ¦¬¶l¥ó"
# mail/message-browser.c:191
# ui/evolution-mail.xml.h:71
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
#, fuzzy
msgid "_Reply style:"
msgstr "¥þ³¡¦^ÂÐ"
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
msgid "_Restore defaults"
msgstr ""
# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
#, fuzzy
msgid "_Script:"
msgstr "¦w¥þ(_S)"
-# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "¦w¥þ(_S)"
-
# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
#, fuzzy
msgid "_Sending Mail"
msgstr "¶Ç°e¶l¥ó"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
#, fuzzy
msgid "_Show animated images"
msgstr "Åã¥Ü®É¶¡¬°"
# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
#, fuzzy
msgid "_Signatures"
msgstr "ñ¦WÀÉ(_S)¡G"
# mail/mail-config.glade.h:79
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
#, fuzzy
msgid "_Use secure connection (SSL):"
msgstr "¨Ï¥Î¦w¥þ³sµ² (_SSL)"
# mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
#, fuzzy
msgid "_Variable-width:"
msgstr "ÅܼÆ"
# calendar/gui/event-editor-dialog.glade.h:10
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
#, fuzzy
msgid "_every"
msgstr "¨C"
# mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
#, fuzzy
msgid "color"
msgstr " ¦â±m"
@@ -15371,14 +15386,10 @@ msgstr " ¦â±m"
# addressbook/gui/component/addressbook-config.c:689
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
msgid "description"
msgstr "´y­z"
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
# mail/mail-crypto.c:169
#: mail/mail-crypto.c:84
msgid "Could not create a S/MIME signature context."
@@ -15455,40 +15466,40 @@ msgid "Downloading images"
msgstr "¸ü¤J¹Ï¤ù(_I)"
# mail/mail-display.c:962
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
msgid "Loading message content"
msgstr "¥¿¦b¸ü¤J¶l¥ó¤º¤å"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
#, fuzzy
msgid "Overdue:"
msgstr "¹L´Áªº¤u§@(_V)¡G"
# mail/message-list.c:977
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
#, fuzzy
msgid "by %B %d, %Y, %l:%M %P"
msgstr "%b %d %l:%M %p"
# mail/mail-display.c:1256
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
msgid "Open Link in Browser"
msgstr "¦bÂsÄý¾¹¤º¶}±Ò³sµ²"
# ui/evolution-event-editor.xml.h:14
# ui/evolution-task-editor-dialog.xml.h:15
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
msgid "Copy Link Location"
msgstr "½Æ»s³sµ²¦ì§}"
# ui/evolution-message-composer.xml.h:21
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
msgid "Save Link as (FIXME)"
msgstr "¥t¦s¥Ø¼Ð(FIXME)"
# mail/mail-callbacks.c:1188
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
msgid "Save Image as..."
msgstr "¥t¦s¹Ï¤ù..."
@@ -15499,58 +15510,59 @@ msgid "Pinging %s"
msgstr "±½´y %s"
# mail/mail-format.c:527
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
#, c-format
msgid "%s attachment"
msgstr "%s ªþ¥[ÀÉ®×"
# mail/mail-format.c:573
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
msgid "Could not parse MIME message. Displaying as source."
msgstr "¤£¯à¸ÑªR MIME ®æ¦¡ªº¶l¥ó¡C¥u¦nÅã¥Ü­ì©lÀÉ¡C"
# mail/mail-format.c:640
# mail/message-list.c:1082
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
msgid "Date"
msgstr "¤é´Á"
# mail/mail-config.glade.h:29
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
msgid "Bad Address"
msgstr "¤£¥¿½Tªº¹q¶l¦a§}"
# mail/mail-format.c:756
# mail/message-list.c:1082
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
#: mail/message-tags.glade.h:3
msgid "From"
msgstr "±H¥óªÌ"
# mail/mail-format.c:759
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
msgid "Reply-To"
msgstr "¦^ÂÐ"
# mail/mail-format.c:762
# mail/message-list.c:1083
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
msgid "To"
msgstr "¦¬¥óªÌ"
# mail/mail-format.c:765
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
msgid "Cc"
msgstr "°Æ¥»"
# composer/e-msg-composer-hdrs.c:394
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
#, fuzzy
msgid "Bcc"
msgstr "±K¥ó°Æ¥»¡G"
# addressbook/backend/ebook/e-card.c:3428
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
#, fuzzy
msgid "Mailer"
msgstr ""
@@ -15558,59 +15570,59 @@ msgstr ""
"±H¥óªÌ: "
# mail/mail-format.c:1153
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
#, fuzzy
msgid ""
"This message is digitally signed. Click the lock icon for more information."
msgstr "³o«Ê¬O¥[¤J¤F¼Æ¦ìñ¦Wªº¶l¥ó¡A¤wµý¹êµL³_"
# mail/mail-crypto.c:84
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
#, fuzzy
msgid "Could not create a PGP verfication context"
msgstr "µLªk«Ø¥ß¤@­Ó PGP ¬dµý¤å¥»¡C"
# mail/mail-format.c:1153
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
msgid "This message is digitally signed and has been found to be authentic."
msgstr "³o«Ê¬O¥[¤J¤F¼Æ¦ìñ¦Wªº¶l¥ó¡A¤wµý¹êµL³_"
# mail/mail-format.c:1161
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "³o«Ê¬O¥[¤J¤F¼Æ¦ìñ¦Wªº¶l¥ó¡A¦ý¤£¯àµý¹êµL³_"
# mail/mail-format.c:1787
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "FTP ¯¸«ü¥Ü (%s)"
# mail/mail-format.c:1799
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "¥»¦aºÝÀÉ®× (%s) ©ó \"%s\" ¦³®Äªº«ü¥Ü"
# mail/mail-format.c:1803
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
#, c-format
msgid "Pointer to local file (%s)"
msgstr "¥»¦aÀɮ׫ü¥Ü (%s)"
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "»·ºÝ¸ê®Æ«ü¥Ü (%s)"
# mail/mail-format.c:1837
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "¤£©úªº¥~³¡Àɮ׫ü¥Ü (\"%s\" Ãþ«¬)"
# mail/mail-format.c:1842
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
msgid "Malformed external-body part."
msgstr "ÅܧΪº¥~¥[¥»¤å³¡¤À¡C"
@@ -15879,7 +15891,7 @@ msgid "Reconnecting to %s"
msgstr "¤¤Â_»P %s ªº³s½u"
# mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
msgid "_Search"
msgstr "´M§ä(_S)"
@@ -16021,13 +16033,18 @@ msgstr ""
"\n"
"±z¬O§_­nÀx¦sÅܧó¡H"
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "·s¼W±ø¥ó"
+
#: mail/mail-signature-editor.c:372
msgid "Enter a name for this signature."
msgstr ""
# addressbook/gui/component/addressbook-config.c:686
# mail/mail-config.glade.h:43
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
msgid "Name:"
msgstr "¦WºÙ¡G"
@@ -16043,7 +16060,7 @@ msgid "Forwarded message"
msgstr "Âà±Hªº¶l¥ó"
# mail/mail-ops.c:1154
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
msgid "Forwarded Message"
msgstr "Âà±Hªº¶l¥ó"
@@ -16071,7 +16088,7 @@ msgstr ""
# camel/providers/imap/camel-imap-provider.c:48
# shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
#, fuzzy
msgid "VFolders"
msgstr "¸ê®Æ§¨"
@@ -16317,47 +16334,47 @@ msgid "_Flag:"
msgstr "¦³¼Ð¼mªº"
# mail/mail-ops.c:992
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
#, c-format
msgid "Scanning folders under %s on \"%s\""
msgstr "±½´y \"%s\" ¤W¦ì©ó %s ¸Ìªº¸ê®Æ§¨"
# mail/mail-ops.c:992
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
#, c-format
msgid "Scanning root-level folders on \"%s\""
msgstr "±½´y \"%s\" ¤WºÞ²zªÌ¼h¯Åªº¸ê®Æ§¨"
# mail/subscribe-dialog.c:271
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr "­q¾\¦Ü¸ê®Æ§¨ \"%s\""
# mail/subscribe-dialog.c:273
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr "¨ú®ø­q¾\¦Ü¸ê®Æ§¨ \"%s\""
# mail/subscribe-dialog.c:76
# shell/e-storage-set-view.c:48
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "¸ê®Æ§¨"
# ui/evolution-message-composer.xml.h:22
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
#, fuzzy
msgid "Scanning folders..."
msgstr "Àx¦s¦Ü¸ê®Æ§¨..."
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
msgid "No server has been selected"
msgstr "©|¥¼¿ï¾Ü¦øªA¾¹"
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
msgid "Please select a server."
msgstr "½Ð¿ï¾Ü¤@­Ó¦øªA¾¹¡C"
@@ -28328,20 +28345,20 @@ msgid "Folder containing the Evolution Summary"
msgstr "¸ê®Æ§¨¥]§t Evolution ºK­n"
# calendar/gui/event-editor-dialog.glade.h:3
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
msgid "Appointments"
msgstr "¬ù·|"
# calendar/gui/e-day-view.c:3146
# ui/evolution-calendar.xml.h:16
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
msgid "No appointments"
msgstr "µL¬ù·|"
# calendar/gui/e-day-view-top-item.c:274
# calendar/gui/e-day-view.c:1294
# calendar/gui/e-week-view-main-item.c:325
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
#, fuzzy
msgid "%k:%M %d %B"
msgstr "%k%M %d %B"
@@ -28349,25 +28366,25 @@ msgstr "%k%M %d %B"
# calendar/gui/e-day-view-top-item.c:274
# calendar/gui/e-day-view.c:1294
# calendar/gui/e-week-view-main-item.c:325
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
msgid "%l:%M %d %B"
msgstr "%l:%M %d %B"
# addressbook/gui/component/addressbook-config.c:689
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
#, fuzzy
msgid "No description"
msgstr "´y­z"
# calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
msgid "Mail summary"
msgstr "¶l¥óºK­n"
# mail/mail-config.glade.h:76
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
#: shell/e-local-storage.c:1102
#, fuzzy
msgid "Local Folders"
@@ -28391,27 +28408,27 @@ msgstr "Dictionary.com ¨C¤é¤@¦r"
msgid "Quotes of the Day"
msgstr "¨C¤é¤@¤å"
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
msgid "Add a news feed"
msgstr "·s¼W·s»Dµo°e¦øªA¾¹"
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
msgid "Enter the URL of the news feed you wish to add"
msgstr "¿é¤J±z§Æ±æ·s¼W·s»Dµo°e¦øªA¾¹ºô§}"
# shell/e-shell-importer.c:404
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
#, fuzzy
msgid "Error downloading RDF"
msgstr "<b>¤U¸ü RDF ®Éµo¥Í¿ù»~</b>"
# importers/netscape-importer.c:790
# importers/pine-importer.c:656
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
msgid "News Feed"
msgstr "·s»Dµo°e¦øªA¾¹"
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
msgid "All"
msgstr ""
@@ -28421,34 +28438,34 @@ msgstr ""
# calendar/gui/event-editor-dialog.glade.h:2
# mail/mail-config.glade.h:7
#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
#, fuzzy
msgid "Add"
msgstr "·s¼W(_A)"
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
#, fuzzy
msgid "Shown"
msgstr "¤U³·"
# ui/evolution-tasks.xml.h:3
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
msgid "No tasks"
msgstr "µL¤u§@"
# addressbook/gui/component/addressbook-config.c:689
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
#, fuzzy
msgid "(No Description)"
msgstr "´y­z¡G"
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
msgid "My Weather"
msgstr "§Úªº¤Ñ®ð"
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
#, fuzzy
msgid "There was an error downloading data for"
msgstr "¤U¸ü·s»Dµo°e¦øªA¾¹®Éµo¥Í¿ù»~"
@@ -28460,27 +28477,27 @@ msgstr "¤Ñ®ð"
# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
msgid "%A, %B %e %Y"
msgstr "%A, %B %e %Y"
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
#, fuzzy
msgid "Please wait..."
msgstr "½Ðµy­Ô"
# calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
msgid "Print Summary"
msgstr "¦C¦LºK­n"
# mail/mail-callbacks.c:1454
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
msgid "Printing of Summary failed"
msgstr "¦C¦LºK­n¥¢±Ñ"
# wombat/wombat.c:198
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "°õ¦æºK­n¤¸¥ó¤£¯àªì©l¤Æ Bonobo¡C\n"
@@ -29887,7 +29904,7 @@ msgid "Drafts"
msgstr "¯ó½Z"
# mail/local-config.glade.h:8
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
#: shell/e-shortcuts.c:1055
msgid "Inbox"
msgstr "Inbox"
@@ -30415,32 +30432,32 @@ msgstr "Evolution"
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
#, fuzzy
msgid "Opening Folder"
msgstr "¶}±Ò¸ê®Æ§¨ %s"
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
#, fuzzy, c-format
msgid "Opening Folder \"%s\""
msgstr "¶}±Ò¸ê®Æ§¨ %s"
# mail/mail-display.c:299
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
#, fuzzy, c-format
msgid "in \"%s\" ..."
msgstr "¦b %s ¤º¶}±Ò..."
# camel/providers/local/camel-mbox-summary.c:655
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
#, fuzzy, c-format
msgid "Could not open shared folder: %s."
msgstr "µLªk±N¸ê®Æ§¨¡G%s ­«·s©R¦W"
# shell/e-shell-folder-creation-dialog.c:99
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
#, fuzzy
msgid "Cannot find the specified shared folder."
msgstr ""
@@ -30491,6 +30508,16 @@ msgstr "¦¹¸ê®Æ§¨¤£¯à¥]§t¶l¥ó¡C"
msgid "'.' and '..' are reserved folder names."
msgstr "'.' ©M '..' ¬O¸ê®Æ§¨«O¯d¦WºÙ¡C"
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+# camel/camel-filter-driver.c:871
+#: shell/e-shell-view-menu.c:102
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "°õ¦æ¹LÂo¾¹µo¥Í¿ù»~¡G %s: %s"
+
# shell/e-shell-view-menu.c:179
#: shell/e-shell-view-menu.c:196
msgid "Bug buddy was not found in your $PATH."
@@ -30529,18 +30556,18 @@ msgid "Select the folder you want the shortcut to point to:"
msgstr "¿ï¾Ü±z·Q±¶®|¹ïÀ³¨ìªº¸ê®Æ§¨¡G"
# shell/e-shell-view-menu.c:590
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
#, fuzzy
msgid "_Work Online"
msgstr "½u¤W¤u§@"
# ui/evolution.xml.h:66
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
msgid "_Work Offline"
msgstr "Â÷½u¤u§@(_W)"
# ui/evolution.xml.h:39
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
msgid "Work Offline"
msgstr "Â÷½u¤u§@"
@@ -30549,26 +30576,26 @@ msgstr "Â÷½u¤u§@"
msgid "(No folder displayed)"
msgstr "(¨S¦³¸ê®Æ§¨Åã¥Ü)"
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
# shell/e-storage.c:178
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
msgid "(None)"
msgstr "(¨S¦³)"
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution ¥Ø«e¬°½u¤W¤u§@¡C«ö³o¸Ì§ï¬°Â÷½u¤u§@¡C"
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
msgid "Ximian Evolution is in the process of going offline."
msgstr "Ximian Evolution ²{¥¿Â÷½u¤¤¡C"
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution ¥Ø«e¬OÂ÷½u¤u§@¡C«ö³o¸Ì§ï¬°½u¤W¤u§@¡C"
@@ -30587,7 +30614,7 @@ msgstr ""
msgid "Cannot set up local storage -- %s"
msgstr "µLªk³]©w¥»¦aºÝªºÀx¦sªÅ¶¡ -- %s"
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -30597,20 +30624,20 @@ msgstr ""
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
msgid "Invalid arguments"
msgstr "µL®Äªº°Ñ¼Æ"
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
msgid "Cannot register on OAF"
msgstr "¤£¯à©ó OAF µù¥U"
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
msgid "Configuration Database not found"
msgstr "§ä¤£¨ì²ÕºA¸ê®Æ®w"
# shell/e-storage.c:461
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
msgid "Generic error"
msgstr "¤@¯ë¿ù»~"
@@ -30784,70 +30811,70 @@ msgid "Checkbox"
msgstr ""
# shell/e-storage.c:459
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
msgid "No error"
msgstr "¨S¦³¿ù»~"
# shell/e-storage.c:463
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
msgid "A folder with the same name already exists"
msgstr "¬Û¦P¦WºÙªº¸ê®Æ§¨¤w¸g¦s¦b"
# shell/e-storage.c:465
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
msgid "The specified folder type is not valid"
msgstr "©Ò«ü©wªº¸ê®Æ§¨Ãþ§O¬OµL®Äªº"
# shell/e-storage.c:467
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
msgid "I/O error"
msgstr "¿é¥X/¤J¿ù»~"
# shell/e-storage.c:469
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
msgid "Not enough space to create the folder"
msgstr "¨S¦³¨¬°÷ªÅ¶¡¥h«Ø¥ß¸ê®Æ§¨"
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
msgid "The folder is not empty"
msgstr ""
# shell/e-storage.c:471
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
msgid "The specified folder was not found"
msgstr "§ä¤£¨ì«ü©wªº¸ê®Æ§¨"
# shell/e-storage.c:473
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
msgid "Function not implemented in this storage"
msgstr "³o­ÓÀx¦sªÅ¶¡ªº¥\¯à¤´¥¼¹ê§@"
# shell/e-storage.c:477
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
msgid "Operation not supported"
msgstr "¦æ°Ê¤£¤ä´©"
# shell/e-storage.c:479
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
msgid "The specified type is not supported in this storage"
msgstr "³o­ÓÀx¦sªÅ¶¡¤£¤ä´©©Ò«ü©wªºÃþ§O"
# shell/e-storage.c:471
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
msgid "The specified folder cannot be modified or removed"
msgstr "«ü©wªº¸ê®Æ§¨¤£¯à½s¿è©Î²¾°Ê"
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
msgid "Cannot make a folder a child of one of its descendants"
msgstr "¤£¯à§â¸ê®Æ§¨¸m©ó¨ä¤l¸ê®Æ§¨¤§¤U"
# camel/providers/local/camel-mbox-folder.c:152
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
#, fuzzy
msgid "Cannot create a folder with that name"
msgstr "µLªk«Ø¥ß¸ê®Æ§¨Âê©w %s ¡G %s"
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
msgid "This operation cannot be performed in off-line mode"
msgstr ""
@@ -31850,10 +31877,11 @@ msgstr "¹wÄý­±ª©(_P)"
msgid "Change the properties of this folder"
msgstr "Åܧó³o­Ó¸ê®Æ§¨ªº¯S©Ê"
-# ui/evolution-mail.xml.h:42
+# ui/evolution-mail.xml.h:9
#: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "½Æ»s¿ï©w¶l¥ó(_E)"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "½Æ»s¤w¿ï©wªº¶l¥ó¨ì¥t¤@­Ó¸ê®Æ§¨"
# ui/evolution-event-editor.xml.h:15
# ui/evolution-task-editor-dialog.xml.h:16
@@ -31861,10 +31889,12 @@ msgstr "½Æ»s¿ï©w¶l¥ó(_E)"
msgid "Cu_t"
msgstr "°Å¤U(_T)"
-# mail/message-browser.c:199
+# ui/evolution-event-editor.xml.h:31
+# ui/evolution-task-editor-dialog.xml.h:34
#: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "°Å¤U¿ï©wªº¶l¥ó"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "±N¶l¥ó¶K¨ì°Å¶KªO"
# ui/evolution-mail.xml.h:42
#: ui/evolution-mail-list.xml.h:5
@@ -31900,7 +31930,8 @@ msgstr "±N¥þ³¡¥i¨£ªº¶l¥ó¼Ð¥Ü¦¨¤w¾\Ū"
# ui/evolution-event-editor.xml.h:31
# ui/evolution-task-editor-dialog.xml.h:34
#: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
msgstr "±N¶l¥ó¶K¨ì°Å¶KªO"
# ui/evolution-mail.xml.h:62
@@ -32766,6 +32797,11 @@ msgstr "¶}±Ò(_O)..."
msgid "_Reply-To Field"
msgstr "¦^ÂÐ(_R)"
+# ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "¦w¥þ(_S)"
+
# ui/evolution-message-composer.xml.h:8
#: ui/evolution-signature-editor.xml.h:4
#, fuzzy
@@ -33161,12 +33197,6 @@ msgstr "­«·s©R¦W(_R)..."
msgid "_Send / Receive"
msgstr "¶Ç°e / ±µ¦¬ (_S)"
-# ui/evolution-mail.xml.h:110
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "¶l¥ó³]©w(_M)..."
-
# ui/evolution.xml.h:62
#: ui/evolution.xml.h:63
msgid "_Shortcut Bar"
@@ -33519,26 +33549,26 @@ msgid "Don't show this message again."
msgstr "¤£­n¦AÅã¥Ü³o­Ó°T®§¡C"
# addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
#, fuzzy
msgid "_Find Now"
msgstr "¥ß§Y·j´M"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
# ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
#, fuzzy
msgid "_Clear"
msgstr "²M°£"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
# ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
msgid "Clear"
msgstr "²M°£"
# addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
msgid "Find Now"
msgstr "¥ß§Y·j´M"
@@ -33569,6 +33599,52 @@ msgstr "init_corba()¡G¤£¯àªì©l¤Æ GNOME"
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo()¡G¤£¯àªì©l¤Æ Bonobo"
+# mail/mail-config.glade.h:40
+#, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "¶l¥ó³]©w"
+
+# mail/mail-config.glade.h:40
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "¶l¥ó³]©w"
+
+# ui/evolution-message-composer.xml.h:26
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "¶Ç°e"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+# mail/mail-config.glade.h:63
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "¿ï¾Ü PGP ¤G¤¸ÀÉ"
+
+# mail/mail-config.glade.h:74
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "ñ¦WÀÉ¡G"
+
+# mail/mail-config.glade.h:74
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "ñ¦WÀÉ¡G"
+
+# mail/mail-config.glade.h:50
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP ¤G¤¸½X¸ô®|¡G"
+
+# ui/evolution-mail.xml.h:42
+#~ msgid "Copy selected messages"
+#~ msgstr "½Æ»s¿ï©w¶l¥ó(_E)"
+
+# mail/message-browser.c:199
+#~ msgid "Cut selected messages"
+#~ msgstr "°Å¤U¿ï©wªº¶l¥ó"
+
# addressbook/gui/component/select-names/e-select-names-popup.c:161
# composer/e-msg-composer-attachment-bar.c:468
# shell/e-shortcuts-view.c:265
@@ -34131,18 +34207,10 @@ msgstr "init_bonobo()¡G¤£¯àªì©l¤Æ Bonobo"
#~ msgid "Edit Addressbook"
#~ msgstr "½s¿è¥Ø¿ýªA°È"
-# mail/mail-config.glade.h:3
-#~ msgid "Account Name"
-#~ msgstr "±b¸¹"
-
# addressbook/gui/component/addressbook-config.c:662
#~ msgid "Add Addressbook"
#~ msgstr "·s¼W¥Ø¿ýªA°È"
-# addressbook/gui/component/select-names/select-names.glade.h:3
-#~ msgid "Server Name"
-#~ msgstr "¦øªA¾¹¦WºÙ"
-
#~ msgid "The information below is required in order to add an addressbook. "
#~ msgstr "¤U¦C¸ê°T¬O·s¼W¥Ø¿ýªA°È©Ò»Ý­nªº¡C"