[evolution-data-server] po/vi: updated from Damned Lies
- From: Nguyen Thai Ngoc Duy <pclouds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] po/vi: updated from Damned Lies
- Date: Wed, 21 Mar 2012 02:10:55 +0000 (UTC)
commit a77ca235cb2504c3b7058faead1dd9bcf7c7c749
Author: Nguyán ThÃi Ngác Duy <pclouds gmail com>
Date: Wed Mar 21 08:51:41 2012 +0700
po/vi: updated from Damned Lies
po/vi.po | 3160 +++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 1659 insertions(+), 1501 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index 9fc71de..03763ec 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: evolution-data-server GNOME TRUNK\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-09-26 10:49+0000\n"
-"PO-Revision-Date: 2011-10-10 19:29+1100\n"
+"POT-Creation-Date: 2012-03-01 07:22+0000\n"
+"PO-Revision-Date: 2012-03-21 08:51+0700\n"
"Last-Translator: Nguyán ThÃi Ngác Duy <pclouds gmail com>\n"
"Language-Team: Vietnamese <vi-VN googlegroups com>\n"
"MIME-Version: 1.0\n"
@@ -18,238 +18,273 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.8\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:828
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:478
+#: ../addressbook/backends/file/e-book-backend-file.c:129
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
+#: ../addressbook/libebook/e-book-client.c:106
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:577
+#: ../calendar/backends/http/e-cal-backend-http.c:424
+#: ../calendar/libecal/e-cal.c:4596 ../calendar/libecal/e-cal-client.c:150
+#: ../camel/providers/imap/camel-imap-command.c:515
+#: ../camel/providers/imap/camel-imap-store.c:464
+#: ../camel/providers/imapx/camel-imapx-command.c:538
+#: ../libedataserver/e-client.c:164
+msgid "Unknown error"
+msgstr "KhÃng biát lái"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:154
+#, fuzzy, c-format
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to remove file '%s': %s"
+msgstr "Lái táo tián trÃnh con '%s': %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:177
+#, fuzzy, c-format
+#| msgid "Could not create directory %s: %s"
+msgid "Failed to make directory %s: %s"
+msgstr "KhÃng thá táo thÆ mác %s: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:472
+#, fuzzy, c-format
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr "Lái táo tián trÃnh con '%s': %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/file/e-book-backend-file.c:1129
+msgid "No UID in the contact"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1563
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516
msgid "Loading..."
msgstr "Äang náp..."
-#: ../addressbook/backends/file/e-book-backend-file.c:831
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4807
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:480
+#: ../addressbook/backends/file/e-book-backend-file.c:1566
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518
msgid "Searching..."
msgstr "Äang tÃm kiám..."
+#: ../addressbook/backends/file/e-book-backend-file.c:2108
+#, c-format
+msgid "Failed to build summary for an address book %s"
+msgstr ""
+
#. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:842
+#: ../addressbook/backends/google/e-book-backend-google.c:874
msgid "Querying for updated contactsâ"
msgstr "Äang truy ván cho liÃn lác ÄÆác cáp nhátâ"
-#: ../addressbook/backends/google/e-book-backend-google.c:893
-#: ../addressbook/libebook/e-book.c:3506 ../calendar/libecal/e-cal.c:1381
-#: ../libedataserver/e-client.c:1951
+#: ../addressbook/backends/google/e-book-backend-google.c:923
+#: ../addressbook/libebook/e-book.c:3531 ../calendar/libecal/e-cal.c:1380
+#: ../libedataserver/e-client.c:1918
msgid "Personal"
msgstr "CÃ nhÃn"
-#: ../addressbook/backends/google/e-book-backend-google.c:895
-#| msgid "Favorites"
+#: ../addressbook/backends/google/e-book-backend-google.c:925
msgid "Friends"
msgstr "Bán bÃ"
-#: ../addressbook/backends/google/e-book-backend-google.c:897
-#| msgid "Family Name"
+#: ../addressbook/backends/google/e-book-backend-google.c:927
msgid "Family"
msgstr "Gia ÄÃnh"
-#: ../addressbook/backends/google/e-book-backend-google.c:899
+#: ../addressbook/backends/google/e-book-backend-google.c:929
msgid "Coworkers"
msgstr "Äáng nghiáp"
#. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:983
+#: ../addressbook/backends/google/e-book-backend-google.c:1019
msgid "Querying for updated groupsâ"
msgstr "Truy ván nhÃm ÄÃ cáp nhátâ"
+#: ../addressbook/backends/google/e-book-backend-google.c:1424
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1639
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:295
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+msgid "The backend does not support bulk additions"
+msgstr ""
+
#. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1402
+#: ../addressbook/backends/google/e-book-backend-google.c:1451
msgid "Creating new contactâ"
msgstr "Táo liÃn lác máiâ"
-#: ../addressbook/backends/google/e-book-backend-google.c:1512
+#: ../addressbook/backends/google/e-book-backend-google.c:1540
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+#, fuzzy
+#| msgid "Calendar doesn't support Free/Busy"
+msgid "The backend does not support bulk removals"
+msgstr "Lách khÃng há trá Bán/Ránh"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1568
msgid "Deleting contactâ"
msgstr "Xoà liÃn lácâ"
+#: ../addressbook/backends/google/e-book-backend-google.c:1818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2296
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:375
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
+#, fuzzy
+#| msgid "Key usage does not support certificate signing"
+msgid "The backend does not support bulk modifications"
+msgstr "CÃch sá dáng khÃa khÃng há trá kà cháng nhán"
+
#. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1793
+#: ../addressbook/backends/google/e-book-backend-google.c:1851
msgid "Modifying contactâ"
msgstr "Sáa liÃn lácâ"
-#: ../addressbook/backends/google/e-book-backend-google.c:2000
-#| msgid "Loading..."
+#: ../addressbook/backends/google/e-book-backend-google.c:2058
msgid "Loadingâ"
msgstr "Äang nápâ"
-#: ../addressbook/backends/google/e-book-backend-google.c:2158
-#| msgid "Authentication required"
+#: ../addressbook/backends/google/e-book-backend-google.c:2187
msgid "Authenticating with the serverâ"
msgstr "Äang xÃc thác vái mÃy cháâ"
#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
-#| msgid "Not connected."
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:177
msgid "Not connected"
msgstr "ChÆa kát nái"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:784
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
msgid "Using Distinguished Name (DN)"
msgstr "DÃng tÃn phÃn biát (TB)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:787
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
msgid "Using Email Address"
msgstr "DÃng Äáa chá thÆ"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1058
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
msgid "Reconnecting to LDAP server..."
msgstr "Äang tÃi kát nái tái mÃy phác vá LDAP..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1187
-#| msgid "Invalid argument"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
msgid "Invalid DN syntax"
msgstr "CÃ phÃp DN khÃng háp lá"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1712
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
msgid "Adding contact to LDAP server..."
msgstr "Äang thÃm liÃn lác vÃo mÃy phác vá LDAP..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1869
msgid "Removing contact from LDAP server..."
msgstr "Äang gá bá liÃn lác khái mÃy phác vá LDAP..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2278
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2318
msgid "Modifying contact from LDAP server..."
msgstr "Äang sáa Äái liÃn lác tá mÃy phác vá LDAP..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4658
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4720
msgid "Receiving LDAP search results..."
msgstr "Äang nhán kát quá tÃm kiám LDAP..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4828
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
msgid "Error performing search"
msgstr "Gáp lái khi tÃm kiám"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4949
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "Äang tái vá cÃc liÃn lác (%d)... "
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:906
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:452
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:559
-#: ../calendar/backends/http/e-cal-backend-http.c:433
-#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
-#: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:411
-#: ../camel/providers/imapx/camel-imapx-server.c:2280
-#: ../camel/providers/smtp/camel-smtp-transport.c:442
-#: ../libedataserver/e-client.c:159
-msgid "Unknown error"
-msgstr "KhÃng biát lái"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:343
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
#, c-format
msgid "Create resource '%s' failed with HTTP status: %d (%s)"
msgstr "Lái táo tÃi nguyÃn '%s' vái mà tráng thÃi HTTP: %d (%s)"
-#: ../addressbook/libebook/e-book.c:3173
+#: ../addressbook/libebook/e-book.c:3198
#, c-format
-#| msgid "%s: there was no source for uid `%s' stored in gconf."
msgid "%s: there was no source for UID '%s' stored in GConf."
msgstr "%s: khÃng cà nguán UID '%s' ÄÆác lÆu vÃo GConf"
-#: ../addressbook/libebook/e-book.c:3489 ../calendar/libecal/e-cal.c:1361
-#: ../libedataserver/e-client.c:1946
+#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
+#: ../libedataserver/e-client.c:1913
msgid "On This Computer"
msgstr "TrÃn mÃy nÃy"
-#: ../addressbook/libebook/e-book.c:3615
-#: ../addressbook/libebook/e-book-client.c:678
-#: ../addressbook/libedata-book/e-data-book.c:315
-#| msgid "Folder '%s/%s' does not exist."
+#: ../addressbook/libebook/e-book.c:3640
+#: ../addressbook/libebook/e-book-client.c:702
+#: ../addressbook/libedata-book/e-data-book.c:322
msgid "Address book does not exist"
msgstr "Sá Äáa chá khÃng tán tái"
-#: ../addressbook/libebook/e-book-client.c:92
-#| msgid "No such folder %s"
+#: ../addressbook/libebook/e-book-client.c:95
msgid "No such book"
msgstr "KhÃng cà sá nhÆ váy"
-#: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:308
-#| msgid "Object not found"
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:315
msgid "Contact not found"
msgstr "KhÃng tÃm tháy liÃn lác"
-#: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:309
-#| msgid "Object ID already exists"
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:316
msgid "Contact ID already exists"
msgstr "ID liÃn lác Äà cà rái"
-#: ../addressbook/libebook/e-book-client.c:98
-#| msgid "No such message"
+#: ../addressbook/libebook/e-book-client.c:101
msgid "No such source"
msgstr "KhÃng cà nguán nhÆ váy"
-#: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:325
-#| msgid "Namespace"
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:332
msgid "No space"
msgstr "Hát chá cháa"
-#: ../addressbook/libebook/e-book-client.c:491
-#| msgid "Failed to encode data"
+#: ../addressbook/libebook/e-book-client.c:515
msgid "Failed to run book factory"
msgstr ""
-#: ../addressbook/libebook/e-book-client.c:501
-#: ../addressbook/libedata-book/e-data-book-factory.c:379
-#: ../addressbook/libedata-book/e-data-book-factory.c:437
-#: ../calendar/libecal/e-cal-client.c:610
-#: ../calendar/libedata-cal/e-data-cal-factory.c:399
+#: ../addressbook/libebook/e-book-client.c:525
+#: ../addressbook/libedata-book/e-data-book-factory.c:196
+#: ../addressbook/libedata-book/e-data-book-factory.c:228
+#: ../calendar/libecal/e-cal-client.c:613
+#: ../calendar/libedata-cal/e-data-cal-factory.c:213
+#: ../calendar/libedata-cal/e-data-cal-factory.c:242
#, c-format
-#| msgid "%s: Invalid source."
msgid "Invalid source"
msgstr "Nguán khÃng háp lá"
-#: ../addressbook/libebook/e-book-client.c:603
-#: ../calendar/libecal/e-cal-client.c:725
+#: ../addressbook/libebook/e-book-client.c:627
+#: ../calendar/libecal/e-cal-client.c:728
#, c-format
msgid "Incorrect uri '%s'"
msgstr "URI khÃng ÄÃng '%s'"
-#: ../addressbook/libebook/e-book-client.c:641
-#| msgid "Failed on message %d"
+#: ../addressbook/libebook/e-book-client.c:665
msgid "Failed to find system book"
msgstr "Lái tÃm sá há tháng"
-#: ../addressbook/libebook/e-book-client.c:750
-#: ../calendar/libecal/e-cal-client.c:878
+#: ../addressbook/libebook/e-book-client.c:774
+#: ../calendar/libecal/e-cal-client.c:881
#, c-format
-#| msgid "%s: there was no source for uid `%s' stored in gconf."
msgid "There was no source for UID '%s' stored in a source list."
msgstr "KhÃng cà nguán vái UID '%s' lÆu trong danh sÃch nguán."
-#: ../addressbook/libebook/e-book-client.c:2280
-#: ../calendar/libecal/e-cal-client.c:4482
-#| msgid "Connection to Server"
+#: ../addressbook/libebook/e-book-client.c:2566
+#: ../calendar/libecal/e-cal-client.c:4536
msgid "Cannot get connection to view"
msgstr "KhÃng thá láy kát nái Äá xem"
#. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:121
msgid "Unique ID"
msgstr "ID duy nhát"
#. FILE_AS is not really a structured field - we use a getter/setter
#. * so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:119
+#: ../addressbook/libebook/e-contact.c:124
msgid "File Under"
msgstr "Ghi lÆu lÃ"
#. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook/e-contact.c:126
msgid "Book URI"
msgstr "URI SÃch"
@@ -257,577 +292,547 @@ msgstr "URI SÃch"
#. FN isn't really a structured field - we use a getter/setter
#. * so we can set the N property (since evo 1.4 works fine with
#. * vcards that don't even have a N attribute. *sigh*)
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:132
msgid "Full Name"
msgstr "TÃn Äáy Äá"
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:133
msgid "Given Name"
msgstr "TÃn"
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:134
msgid "Family Name"
msgstr "Há"
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:135
msgid "Nickname"
msgstr "TÃn hiáu"
#. Email fields
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:138
msgid "Email 1"
msgstr "ThÆ Äián tá 1"
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:139
msgid "Email 2"
msgstr "ThÆ Äián tá 2"
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:140
msgid "Email 3"
msgstr "ThÆ Äián tá 3"
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:141
msgid "Email 4"
msgstr "ThÆ Äián tá 4"
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:143
msgid "Mailer"
msgstr "TrÃnh thÆ"
#. Address Labels
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:146
msgid "Home Address Label"
msgstr "NhÃn Äáa chá nhÃ"
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:147
msgid "Work Address Label"
msgstr "NhÃn Äáa chá lÃm viác"
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:148
msgid "Other Address Label"
msgstr "NhÃn Äáa chá khÃc"
#. Phone fields
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:151
msgid "Assistant Phone"
msgstr "Äián thoái phá tÃ"
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:152
msgid "Business Phone"
msgstr "Äián thoái kinh doanh"
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:153
msgid "Business Phone 2"
msgstr "Äián thoái kinh doanh 2"
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:154
msgid "Business Fax"
msgstr "Äián thÆ kinh doanh"
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:155
msgid "Callback Phone"
msgstr "Sá gái lái"
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:156
msgid "Car Phone"
msgstr "Äián thoái xe"
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:157
msgid "Company Phone"
msgstr "Äián thoái cÃng ty"
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:158
msgid "Home Phone"
msgstr "Äián thoái nhÃ"
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:159
msgid "Home Phone 2"
msgstr "Äián thoái nhà 2"
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:160
msgid "Home Fax"
msgstr "Äián thÆ á nhÃ"
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:161
msgid "ISDN"
msgstr "ISDN"
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:162
msgid "Mobile Phone"
msgstr "Äián thoái di Äáng"
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:163
msgid "Other Phone"
msgstr "Äián thoái khÃc"
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:164
msgid "Other Fax"
msgstr "Äián thÆ khÃc"
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:165
msgid "Pager"
msgstr "Sá nhán tin"
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:166
msgid "Primary Phone"
msgstr "Äián thoái chÃnh"
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:167
msgid "Radio"
msgstr "RaÄiÃ"
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:168
msgid "Telex"
msgstr "Telex"
#. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:170
msgid "TTY"
msgstr "TTY"
#. Organizational fields
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:173
msgid "Organization"
msgstr "Tá chác"
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:174
msgid "Organizational Unit"
msgstr "ÄÆn vá tá chác"
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:175
msgid "Office"
msgstr "VÄn phÃng"
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:176
msgid "Title"
msgstr "Táa Äá"
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:177
msgid "Role"
msgstr "Vai trÃ"
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:178
msgid "Manager"
msgstr "Quán lÃ"
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:179
msgid "Assistant"
msgstr "Phá tÃ"
#. Web fields
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:182
msgid "Homepage URL"
msgstr "Äáa chá trang chá Máng"
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:183
msgid "Weblog URL"
msgstr "Äáa chá sá kà sá Máng"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:181
-#: ../libedataserverui/e-categories-dialog.c:85
+#: ../addressbook/libebook/e-contact.c:186
+#: ../libedataserverui/e-categories-dialog.c:88
msgid "Categories"
msgstr "PhÃn loái"
#. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:189
msgid "Calendar URI"
msgstr "URI lách"
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:190
msgid "Free/Busy URL"
msgstr "URL Ránh/Bán"
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:191
msgid "ICS Calendar"
msgstr "Lách ICS"
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:192
msgid "Video Conferencing URL"
msgstr "Äáa chá hái tháo trác tuyán"
#. Misc fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:195
msgid "Spouse's Name"
msgstr "TÃn vá/cháng"
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:196
msgid "Note"
msgstr "Ghi chÃ"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:199
msgid "AIM Home Screen Name 1"
msgstr "TÃn mÃn hÃnh AIM á nhà 1"
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:200
msgid "AIM Home Screen Name 2"
msgstr "TÃn mÃn hÃnh AIM á nhà 2"
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:201
msgid "AIM Home Screen Name 3"
msgstr "TÃn mÃn hÃnh AIM á nhà 3"
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:202
msgid "AIM Work Screen Name 1"
msgstr "TÃn mÃn hÃnh AIM á chá lÃm 1"
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:203
msgid "AIM Work Screen Name 2"
msgstr "TÃn mÃn hÃnh AIM á chá lÃm 2"
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:204
msgid "AIM Work Screen Name 3"
msgstr "TÃn mÃn hÃnh AIM á chá lÃm 3"
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:205
msgid "GroupWise Home Screen Name 1"
msgstr "TÃn mÃn hÃnh GroupWise á nhà 1"
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:206
msgid "GroupWise Home Screen Name 2"
msgstr "TÃn mÃn hÃnh GroupWise á nhà 2"
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:207
msgid "GroupWise Home Screen Name 3"
msgstr "TÃn mÃn hÃnh GroupWise á nhà 3"
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:208
msgid "GroupWise Work Screen Name 1"
msgstr "TÃn mÃn hÃnh GroupWise á chá lÃm 1"
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:209
msgid "GroupWise Work Screen Name 2"
msgstr "TÃn mÃn hÃnh Groupwise á chá lÃm 2"
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:210
msgid "GroupWise Work Screen Name 3"
msgstr "TÃn mÃn hÃnh GroupWise á chá lÃm 3"
-#: ../addressbook/libebook/e-contact.c:206
-#| msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:211
msgid "Jabber Home ID 1"
msgstr "ID Jabber á nhà 1"
-#: ../addressbook/libebook/e-contact.c:207
-#| msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:212
msgid "Jabber Home ID 2"
msgstr "ID Jabber á nhà 2"
-#: ../addressbook/libebook/e-contact.c:208
-#| msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:213
msgid "Jabber Home ID 3"
msgstr "ID Jabber á nhà 3"
-#: ../addressbook/libebook/e-contact.c:209
-#| msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:214
msgid "Jabber Work ID 1"
msgstr "ID Jabber á chá lÃm 1"
-#: ../addressbook/libebook/e-contact.c:210
-#| msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:215
msgid "Jabber Work ID 2"
msgstr "ID Jabber á chá lÃm 2"
-#: ../addressbook/libebook/e-contact.c:211
-#| msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:216
msgid "Jabber Work ID 3"
msgstr "ID Jabber á chá lÃm 3"
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:217
msgid "Yahoo! Home Screen Name 1"
msgstr "TÃn mÃn hÃnh Yahoo á nhà 1"
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:218
msgid "Yahoo! Home Screen Name 2"
msgstr "TÃn mÃn hÃnh Yahoo á nhà 2"
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:219
msgid "Yahoo! Home Screen Name 3"
msgstr "TÃn mÃn hÃnh Yahoo á nhà 3"
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:220
msgid "Yahoo! Work Screen Name 1"
msgstr "TÃn mÃn hÃnh Yahoo á chá lÃm 1"
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:221
msgid "Yahoo! Work Screen Name 2"
msgstr "TÃn mÃn hÃnh Yahoo á chá lÃm 2"
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:222
msgid "Yahoo! Work Screen Name 3"
msgstr "TÃn mÃn hÃnh Yahoo á chá lÃm 3"
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:223
msgid "MSN Home Screen Name 1"
msgstr "TÃn mÃn hÃnh MSN á nhà 1"
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:224
msgid "MSN Home Screen Name 2"
msgstr "TÃn mÃn hÃnh MSN á nhà 2"
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:225
msgid "MSN Home Screen Name 3"
msgstr "TÃn mÃn hÃnh MSN á nhà 3"
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:226
msgid "MSN Work Screen Name 1"
msgstr "TÃn mÃn hÃnh MSN á chá lÃm 1"
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:227
msgid "MSN Work Screen Name 2"
msgstr "TÃn mÃn hÃnh MSN á chá lÃm 2"
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:228
msgid "MSN Work Screen Name 3"
msgstr "TÃn mÃn hÃnh MSN á chá lÃm 3"
-#: ../addressbook/libebook/e-contact.c:224
-#| msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:229
msgid "ICQ Home ID 1"
msgstr "ID ICQ á nhà 1"
-#: ../addressbook/libebook/e-contact.c:225
-#| msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:230
msgid "ICQ Home ID 2"
msgstr "ID ICQ á nhà 2"
-#: ../addressbook/libebook/e-contact.c:226
-#| msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:231
msgid "ICQ Home ID 3"
msgstr "ID ICQ á nhà 3"
-#: ../addressbook/libebook/e-contact.c:227
-#| msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:232
msgid "ICQ Work ID 1"
msgstr "ID ICQ á chá lÃm 1"
-#: ../addressbook/libebook/e-contact.c:228
-#| msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:233
msgid "ICQ Work ID 2"
msgstr "ID ICQ á chá lÃm 2"
-#: ../addressbook/libebook/e-contact.c:229
-#| msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:234
msgid "ICQ Work ID 3"
msgstr "ID ICQ á chá lÃm 3"
#. Last modified time
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:237
msgid "Last Revision"
msgstr "Sáa Äái mái nhát"
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:238
msgid "Name or Org"
msgstr "TÃn hoác Tá chác"
#. Address fields
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:241
msgid "Address List"
msgstr "Danh sÃch Äáa chá"
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:242
msgid "Home Address"
msgstr "Äáa chá nhÃ"
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:243
msgid "Work Address"
msgstr "Äáa chá lÃm viác"
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:244
msgid "Other Address"
msgstr "Äáa chá khÃc"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:247
msgid "Category List"
msgstr "Danh sÃch phÃn loái"
#. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:250
msgid "Photo"
msgstr "ánh"
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:251
msgid "Logo"
msgstr "Biáu hÃnh"
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:253
msgid "Name"
msgstr "TÃn"
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:254
msgid "Email List"
msgstr "Danh sÃch thÆ Äián tá"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:257
msgid "AIM Screen Name List"
msgstr "Danh sÃch tÃn mÃn hÃnh AIM"
-#: ../addressbook/libebook/e-contact.c:253
-#| msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:258
msgid "GroupWise ID List"
msgstr "Danh sÃch ID GroupWise"
-#: ../addressbook/libebook/e-contact.c:254
-#| msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:259
msgid "Jabber ID List"
msgstr "Danh sÃch ID Jabber"
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:260
msgid "Yahoo! Screen Name List"
msgstr "Danh sÃch tÃn mÃn hÃnh Yahoo"
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:261
msgid "MSN Screen Name List"
msgstr "Danh sÃch tÃn mÃn hÃnh MSN"
-#: ../addressbook/libebook/e-contact.c:257
-#| msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:262
msgid "ICQ ID List"
msgstr "Danh sÃch ID ICQ"
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:264
msgid "Wants HTML Mail"
msgstr "Muán thÆ dáng HTML"
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:266
msgid "List"
msgstr "Danh sÃch"
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:267
msgid "List Show Addresses"
msgstr "Danh sÃch: hián Äáa chá"
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:269
msgid "Birth Date"
msgstr "NgÃy sinh"
-#: ../addressbook/libebook/e-contact.c:265
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
+#: ../addressbook/libebook/e-contact.c:270
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
msgid "Anniversary"
msgstr "Ká niám"
#. Security fields
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:273
msgid "X.509 Certificate"
msgstr "Cháng nhán X.509"
-#: ../addressbook/libebook/e-contact.c:270
-#| msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:275
msgid "Gadu-Gadu Home ID 1"
msgstr "ID Gadu-Gadu á nhà 1"
-#: ../addressbook/libebook/e-contact.c:271
-#| msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:276
msgid "Gadu-Gadu Home ID 2"
msgstr "ID Gadu-Gadu á nhà 2"
-#: ../addressbook/libebook/e-contact.c:272
-#| msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:277
msgid "Gadu-Gadu Home ID 3"
msgstr "ID Gadu-Gadu á nhà 3"
-#: ../addressbook/libebook/e-contact.c:273
-#| msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:278
msgid "Gadu-Gadu Work ID 1"
msgstr "ID Gadu-Gadu á chá lÃm 1"
-#: ../addressbook/libebook/e-contact.c:274
-#| msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:279
msgid "Gadu-Gadu Work ID 2"
msgstr "ID Gadu-Gadu á chá lÃm 2"
-#: ../addressbook/libebook/e-contact.c:275
-#| msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:280
msgid "Gadu-Gadu Work ID 3"
msgstr "ID Gadu-Gadu á chá lÃm 3"
-#: ../addressbook/libebook/e-contact.c:276
-#| msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:281
msgid "Gadu-Gadu ID List"
msgstr "Danh sÃch ID Gadu-Gadu"
#. Geo information
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:284
msgid "Geographic Information"
msgstr "ThÃng tin Äáa lÃ"
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:286
msgid "Telephone"
msgstr "Äián thoái"
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:288
msgid "Skype Home Name 1"
msgstr "TÃn Skype á nhà 1"
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:289
msgid "Skype Home Name 2"
msgstr "TÃn Skype á nhà 2"
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:290
msgid "Skype Home Name 3"
msgstr "TÃn Skype á nhà 3"
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:291
msgid "Skype Work Name 1"
msgstr "TÃn Skype á chá lÃm 1"
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:292
msgid "Skype Work Name 2"
msgstr "TÃn Skype á chá lÃm 2"
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:293
msgid "Skype Work Name 3"
msgstr "TÃn Skype á chá lÃm 3"
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:294
msgid "Skype Name List"
msgstr "Danh sÃch tÃn Skype"
-#: ../addressbook/libebook/e-contact.c:291
-#| msgid "Home Address"
+#: ../addressbook/libebook/e-contact.c:296
msgid "SIP address"
msgstr "Äáa chá SIP"
-#: ../addressbook/libebook/e-contact.c:293
-#| msgid "Skype Home Name 1"
+#: ../addressbook/libebook/e-contact.c:298
msgid "Google Talk Home Name 1"
msgstr "Google Talk á nhà 1"
-#: ../addressbook/libebook/e-contact.c:294
-#| msgid "Skype Home Name 2"
+#: ../addressbook/libebook/e-contact.c:299
msgid "Google Talk Home Name 2"
msgstr "Google Talk á nhà 2"
-#: ../addressbook/libebook/e-contact.c:295
-#| msgid "Skype Home Name 3"
+#: ../addressbook/libebook/e-contact.c:300
msgid "Google Talk Home Name 3"
msgstr "Google Talk á nhà 3"
-#: ../addressbook/libebook/e-contact.c:296
-#| msgid "Skype Work Name 1"
+#: ../addressbook/libebook/e-contact.c:301
msgid "Google Talk Work Name 1"
msgstr "Google Talk á chá lÃm 1"
-#: ../addressbook/libebook/e-contact.c:297
-#| msgid "Skype Work Name 2"
+#: ../addressbook/libebook/e-contact.c:302
msgid "Google Talk Work Name 2"
msgstr "Google Talk á chá lÃm 2"
-#: ../addressbook/libebook/e-contact.c:298
-#| msgid "Skype Work Name 3"
+#: ../addressbook/libebook/e-contact.c:303
msgid "Google Talk Work Name 3"
msgstr "Google Talk á chá lÃm 3"
-#: ../addressbook/libebook/e-contact.c:299
-#| msgid "Skype Name List"
+#: ../addressbook/libebook/e-contact.c:304
msgid "Google Talk Name List"
msgstr "Danh sÃch tÃn Google Talk"
-#: ../addressbook/libebook/e-contact.c:1580
-#: ../addressbook/libebook/e-destination.c:884
+#: ../addressbook/libebook/e-contact.c:1597
+#: ../addressbook/libebook/e-destination.c:878
msgid "Unnamed List"
msgstr "Danh sÃch và danh"
@@ -835,254 +840,239 @@ msgstr "Danh sÃch và danh"
msgid "Cannot process, book backend is opening"
msgstr "KhÃng thá xá lÃ, háu phÆÆng sá Äang má"
-#: ../addressbook/libedata-book/e-book-backend.c:96
+#: ../addressbook/libedata-book/e-book-backend.c:91
#, c-format
-#| msgid "Unknown error: %s"
msgid "Unknown book property '%s'"
msgstr "Thuác tÃnh sá lá '%s'"
-#: ../addressbook/libedata-book/e-book-backend.c:113
+#: ../addressbook/libedata-book/e-book-backend.c:108
#, c-format
-#| msgid "Cannot create folder '%s': %s"
msgid "Cannot change value of book property '%s'"
msgstr "KhÃng thá thay Äái thuác tÃnh sá '%s'"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:470
-#: ../camel/camel-db.c:481
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
+#: ../camel/camel-db.c:503
#, c-format
msgid "Insufficient memory"
msgstr "KhÃng Äá bá nhá"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#, fuzzy, c-format
+#| msgid "Contact not found"
+msgid "Contact '%s' not found"
+msgstr "KhÃng tÃm tháy liÃn lác"
+
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:199
-#: ../addressbook/libedata-book/e-data-book.c:212
-#: ../addressbook/libedata-book/e-data-book.c:744
-#| msgid "Invalid query"
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../addressbook/libedata-book/e-data-book.c:219
+#: ../addressbook/libedata-book/e-data-book.c:733
msgid "Invalid query: "
msgstr "Truy ván khÃng háp lá: "
-#: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427
msgid "Success"
msgstr "ThÃnh cÃng"
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:420
-#: ../libedataserver/e-client.c:118
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libecal/e-cal.c:4564 ../calendar/libedata-cal/e-data-cal.c:428
+#: ../libedataserver/e-client.c:123
msgid "Backend is busy"
msgstr "Háu phÆÆng quà bán"
-#: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:128
-#| msgid "Repository is offline"
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:133
msgid "Repository offline"
msgstr "Kho ngoái tuyán"
-#: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:422
-#: ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libecal/e-cal.c:4578 ../calendar/libedata-cal/e-data-cal.c:430
+#: ../libedataserver/e-client.c:137
msgid "Permission denied"
msgstr "KhÃng Äá quyán truy cáp"
-#: ../addressbook/libedata-book/e-data-book.c:310
-#: ../calendar/libedata-cal/e-data-cal.c:427
-#| msgid "Authentication failed"
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
msgid "Authentication Failed"
msgstr "XÃc thác thát bái"
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:428
-#| msgid "Authentication required"
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436
msgid "Authentication Required"
msgstr "Cán xÃc thác"
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
msgid "Unsupported field"
msgstr "TrÆáng khÃng ÄÆác há trá"
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:140
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:145
msgid "Unsupported authentication method"
msgstr "PhÆÆng phÃp xÃc thác khÃng ÄÆác há trá"
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:147
msgid "TLS not available"
msgstr "TLS khÃng sán sÃng"
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libedata-book/e-data-book.c:323
msgid "Book removed"
msgstr "ÄÃ bá sá"
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
-#| msgid "This message is not available in offline mode."
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:443
msgid "Not available in offline mode"
msgstr "KhÃng hoát Äáng ngoái tuyán"
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:149
msgid "Search size limit exceeded"
msgstr "VÆát quà giái hán kÃch cá tÃm kiám"
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:151
msgid "Search time limit exceeded"
msgstr "VÆát quà thái hán tÃm kiám"
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:438 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:153
msgid "Invalid query"
msgstr "Truy ván khÃng háp lá"
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:155
msgid "Query refused"
msgstr "Truy ván bá tá chái"
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:136
-#| msgid "%s: could not cancel"
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:141
msgid "Could not cancel"
msgstr "KhÃng thá huá"
#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
#. { OtherError, N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libedata-cal/e-data-cal.c:450
msgid "Invalid server version"
msgstr "PhiÃn bán trÃnh phác vá khÃng háp lá"
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:443
-#: ../libedataserver/e-client.c:116
+#: ../addressbook/libedata-book/e-data-book.c:333
+#: ../calendar/libecal/e-cal.c:4562 ../calendar/libedata-cal/e-data-cal.c:451
+#: ../libedataserver/e-client.c:121
msgid "Invalid argument"
msgstr "Äái sá khÃng háp lá"
#. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:445
-#: ../libedataserver/e-client.c:138
-#| msgid "Protocol not supported"
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal.c:4601 ../calendar/libedata-cal/e-data-cal.c:453
+#: ../libedataserver/e-client.c:143
msgid "Not supported"
msgstr "ChÆa há trá"
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:156
-#| msgid "Backend is busy"
+#: ../addressbook/libedata-book/e-data-book.c:336
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:161
msgid "Backend is not opened yet"
msgstr "Háu phÆÆng chÆa má"
-#: ../addressbook/libedata-book/e-data-book.c:337
-#: ../calendar/libecal/e-cal-client.c:618
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:154
-#| msgid "I/O error"
+#: ../addressbook/libedata-book/e-data-book.c:344
+#: ../calendar/libecal/e-cal-client.c:621
+#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:159
msgid "Other error"
msgstr "Lái khÃc"
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:562
-#: ../addressbook/libedata-book/e-data-book.c:954
-#| msgid "Cannot get folder container %s"
+#: ../addressbook/libedata-book/e-data-book.c:551
+#: ../addressbook/libedata-book/e-data-book.c:943
msgid "Cannot get contact: "
msgstr "KhÃng thá láy liÃn lác: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:587
-#: ../addressbook/libedata-book/e-data-book.c:612
+#: ../addressbook/libedata-book/e-data-book.c:576
+#: ../addressbook/libedata-book/e-data-book.c:601
msgid "Empty query: "
msgstr "Truy ván ráng: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:637
-#: ../addressbook/libedata-book/e-data-book.c:1036
-#| msgid "Cannot add encryption certificate"
+#: ../addressbook/libedata-book/e-data-book.c:626
+#: ../addressbook/libedata-book/e-data-book.c:1041
msgid "Cannot add contact: "
msgstr "KhÃng thá thÃm liÃn lác: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:662
-#: ../addressbook/libedata-book/e-data-book.c:1058
-#| msgid "Cannot get folder container %s"
-msgid "Cannot modify contact: "
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:1075
+#, fuzzy
+#| msgid "Cannot modify contact: "
+msgid "Cannot modify contacts: "
msgstr "KhÃng thá sáa liÃn lác: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:770
-#: ../calendar/libedata-cal/e-data-cal.c:893
-#| msgid "Cannot authenticate to server: %s"
+#: ../addressbook/libedata-book/e-data-book.c:759
+#: ../calendar/libedata-cal/e-data-cal.c:866
msgid "Cannot authenticate user: "
msgstr "KhÃng thá xÃc thác ngÆái dÃng: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:841
-#| msgid "Cannot open mailbox: %s: %s\n"
+#: ../addressbook/libedata-book/e-data-book.c:830
msgid "Cannot open book: "
msgstr "KhÃng thá má sá: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:857
+#: ../addressbook/libedata-book/e-data-book.c:846
msgid "Cannot remove book: "
msgstr "KhÃng thá bá sá: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:884
+#: ../addressbook/libedata-book/e-data-book.c:873
msgid "Cannot refresh address book: "
msgstr "KhÃng thá cáp nhát sá: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:910
+#: ../addressbook/libedata-book/e-data-book.c:899
msgid "Cannot get backend property: "
msgstr "KhÃng thá láy thuác tÃnh háu phÆÆng: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:935
-#: ../calendar/libedata-cal/e-data-cal.c:1096
+#: ../addressbook/libedata-book/e-data-book.c:924
+#: ../calendar/libedata-cal/e-data-cal.c:1069
msgid "Cannot set backend property: "
msgstr "KhÃng thá Äát thuác tÃnh háu phÆÆng: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:972
-#| msgid "Cannot get folder container %s"
+#: ../addressbook/libedata-book/e-data-book.c:961
msgid "Cannot get contact list: "
msgstr "KhÃng thá láy danh sÃch liÃn lác: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1006
-#| msgid "Cannot get folder container %s"
+#: ../addressbook/libedata-book/e-data-book.c:995
msgid "Cannot get contact list uids: "
msgstr "KhÃng thá láy UID danh sÃch liÃn lác: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1079
-#| msgid "Cannot create encoder context"
+#: ../addressbook/libedata-book/e-data-book.c:1100
msgid "Cannot remove contacts: "
msgstr "KhÃng thá bá liÃn lác: "
-#: ../addressbook/libedata-book/e-data-book-factory.c:363
-#: ../addressbook/libedata-book/e-data-book-factory.c:396
-#: ../calendar/libedata-cal/e-data-cal-factory.c:414
+#: ../addressbook/libedata-book/e-data-book-factory.c:184
+#: ../addressbook/libedata-book/e-data-book-factory.c:212
+#: ../calendar/libedata-cal/e-data-cal-factory.c:229
#, c-format
msgid "Empty URI"
msgstr "URI ráng"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:528
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
#, c-format
msgid "Server is unreachable (%s)"
msgstr "KhÃng thá tiáp cán mÃy chá (%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
#, c-format
-#| msgid ""
-#| "Unexpected GnuPG status message encountered:\n"
-#| "\n"
-#| "%s"
msgid "Unexpected HTTP status code %d returned (%s)"
msgstr "Nhán ÄÆác mà tráng thÃi HTTP khÃng mong Äái %d (%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2183
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2540
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
#, c-format
msgid ""
"Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1091,96 +1081,112 @@ msgstr ""
"KhÃng thá tiáp cán mÃy chá, lách má trong chá Äá chá Äác.\n"
"ThÃng bÃo lái: %s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4476
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
msgid "Calendar doesn't support Free/Busy"
msgstr "Lách khÃng há trá Bán/Ránh"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:758
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:219
+#: ../libedataserverui/e-client-utils.c:875
+#, c-format
+msgid ""
+"Enter password for address book %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"HÃy nháp mát kháu cho sá Äáa chá %s (ngÆái dÃng %s)\n"
+"NguyÃn nhÃn: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:221
+#: ../libedataserverui/e-client-utils.c:877
+#, c-format
+msgid "Enter password for address book %s (user %s)"
+msgstr "HÃy nháp mát kháu cho sá Äáa chá %s (ngÆái dÃng %s)"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065
msgid "Birthday"
msgstr "NgÃy sinh"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
#, c-format
msgid "Birthday: %s"
msgstr "NgÃy sinh: %s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
#, c-format
msgid "Anniversary: %s"
msgstr "Ká niám: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:251
msgid "Cannot save calendar data: Malformed URI."
msgstr "KhÃng thá lÆu dá liáu lách: URI dáng sai."
-#: ../calendar/backends/file/e-cal-backend-file.c:248
-#: ../calendar/backends/file/e-cal-backend-file.c:254
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
msgid "Cannot save calendar data"
msgstr "KhÃng thá lÆu dá liáu lách"
-#: ../calendar/backends/http/e-cal-backend-http.c:416
+#: ../calendar/backends/http/e-cal-backend-http.c:405
msgid "Redirected to Invalid URI"
msgstr "TÃi Äánh hÆáng Äán URI khÃng háp lá"
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:446
msgid "Bad file format."
msgstr "Äánh dáng táp tin sai."
-#: ../calendar/backends/http/e-cal-backend-http.c:461
+#: ../calendar/backends/http/e-cal-backend-http.c:454
msgid "Not a calendar."
msgstr "KhÃng phái lách."
#: ../calendar/backends/http/e-cal-backend-http.c:780
#: ../calendar/backends/http/e-cal-backend-http.c:781
-#: ../calendar/backends/weather/e-cal-backend-weather.c:527
+#: ../calendar/backends/weather/e-cal-backend-weather.c:524
msgid "Could not create cache file"
msgstr "KhÃng thá táo táp tin nhá tám"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
msgid "Could not retrieve weather data"
msgstr "KhÃng thá láy dá liáu thái tiát: %s"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
msgid "Weather: Fog"
msgstr "Thái tiát: sÆÆng mÃ"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
msgid "Weather: Cloudy Night"
msgstr "Thái tiát: ÄÃm Äáy mÃy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
msgid "Weather: Cloudy"
msgstr "Thái tiát: Äáy mÃy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
msgid "Weather: Overcast"
msgstr "Thái tiát: u Ãm"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
msgid "Weather: Showers"
msgstr "Thái tiát: mÆa rÃo"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
msgid "Weather: Snow"
msgstr "Thái tiát: tuyát"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
msgid "Weather: Clear Night"
msgstr "Thái tiát: ÄÃm rÃ"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
msgid "Weather: Sunny"
msgstr "Thái tiát: trái náng"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:296
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
msgid "Weather: Thunderstorms"
msgstr "Thái tiát: bÃo kÃm sám"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:444
+#: ../calendar/backends/weather/e-cal-backend-weather.c:435
msgid "Forecast"
msgstr "Dá bÃo"
-#: ../calendar/libecal/e-cal.c:892 ../libedataserverui/e-book-auth-util.c:204
+#: ../calendar/libecal/e-cal.c:891 ../libedataserverui/e-book-auth-util.c:204
#: ../libedataserverui/e-book-auth-util.c:428
#, c-format
msgid "Enter password for %s (user %s)"
@@ -1190,111 +1196,105 @@ msgstr "HÃy nháp mát kháu cho %s (ngÆái dÃng %s)"
#. * This password prompt will be prompted rarely. Since the key that is passed to
#. * the auth_func corresponds to the parent user.
#.
-#: ../calendar/libecal/e-cal.c:906
+#: ../calendar/libecal/e-cal.c:905
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr ""
"HÃy nháp mát kháu cho  %s  Äá hiáu lác áy nhiám cho ngÆái dÃng  %s Â."
-#: ../calendar/libecal/e-cal.c:4565
+#: ../calendar/libecal/e-cal.c:4566
msgid "Repository is offline"
msgstr "Kho ngoái tuyán"
-#: ../calendar/libecal/e-cal.c:4567 ../calendar/libecal/e-cal-client.c:134
+#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
msgid "No such calendar"
msgstr "KhÃng cà lách nhÆ váy."
-#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:136
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../calendar/libecal/e-cal.c:4570 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:432
msgid "Object not found"
msgstr "KhÃng tÃm tháy Äái tÆáng"
-#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:138
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libecal/e-cal.c:4572 ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:433
msgid "Invalid object"
msgstr "Äái tÆáng khÃng háp lá"
-#: ../calendar/libecal/e-cal.c:4573
+#: ../calendar/libecal/e-cal.c:4574
msgid "URI not loaded"
msgstr "URI chÆa ÄÆác tái"
-#: ../calendar/libecal/e-cal.c:4575
+#: ../calendar/libecal/e-cal.c:4576
msgid "URI already loaded"
msgstr "URI ÄÃ ÄÆác tái"
-#: ../calendar/libecal/e-cal.c:4579
+#: ../calendar/libecal/e-cal.c:4580
msgid "Unknown User"
msgstr "KhÃng biát ngÆái dÃng"
-#: ../calendar/libecal/e-cal.c:4581 ../calendar/libecal/e-cal-client.c:142
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libecal/e-cal.c:4582 ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:434
msgid "Object ID already exists"
msgstr "ID Äái tÆáng ÄÃ tán tái"
-#: ../calendar/libecal/e-cal.c:4583
+#: ../calendar/libecal/e-cal.c:4584
msgid "Protocol not supported"
msgstr "ChÆa há trá giao thác nÃy"
-#: ../calendar/libecal/e-cal.c:4585
+#: ../calendar/libecal/e-cal.c:4586
msgid "Operation has been canceled"
msgstr "Thao tÃc bá háy bá"
-#: ../calendar/libecal/e-cal.c:4587
+#: ../calendar/libecal/e-cal.c:4588
msgid "Could not cancel operation"
msgstr "KhÃng thá háy bá tÃc vá"
-#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:124
+#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
msgid "Authentication failed"
msgstr "XÃc thác thát bái"
-#: ../calendar/libecal/e-cal.c:4591
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
-#: ../libedataserver/e-client.c:126
+#: ../calendar/libecal/e-cal.c:4592
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../libedataserver/e-client.c:131
msgid "Authentication required"
msgstr "Cán thiát xÃc thác"
-#: ../calendar/libecal/e-cal.c:4593
-#| msgid "A CORBA exception has occurred"
+#: ../calendar/libecal/e-cal.c:4594
msgid "A D-Bus exception has occurred"
msgstr "Mát lái ngoái lá D-Bus ÄÃ xáy ra"
-#: ../calendar/libecal/e-cal.c:4597
+#: ../calendar/libecal/e-cal.c:4598
msgid "No error"
msgstr "KhÃng cà lái"
-#: ../calendar/libecal/e-cal-client.c:140
-#: ../calendar/libedata-cal/e-data-cal.c:434
-#| msgid "Unknown User"
+#: ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:442
msgid "Unknown user"
msgstr "NgÆái dÃng lá"
-#: ../calendar/libecal/e-cal-client.c:144
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../calendar/libecal/e-cal-client.c:147
+#: ../calendar/libedata-cal/e-data-cal.c:431
msgid "Invalid range"
msgstr "Phám vi khÃng háp lá"
-#: ../calendar/libecal/e-cal-client.c:600
-#| msgid "Failed to encode data"
+#: ../calendar/libecal/e-cal-client.c:603
msgid "Failed to run calendar factory"
msgstr ""
-#: ../calendar/libecal/e-cal-client.c:765
-#| msgid "Failed to encode data"
+#: ../calendar/libecal/e-cal-client.c:768
msgid "Failed to find system calendar"
msgstr "Lái tÃm lách há tháng"
-#: ../calendar/libecal/e-cal-client.c:804
-#: ../calendar/libedata-cal/e-data-cal.c:433
-#| msgid "Folder '%s' does not exist."
+#: ../calendar/libecal/e-cal-client.c:807
+#: ../calendar/libedata-cal/e-data-cal.c:441
msgid "Calendar does not exist"
msgstr "Lách khÃng tán tái"
-#: ../calendar/libecal/e-cal-client.c:919
-#| msgid "%s: Invalid source."
+#: ../calendar/libecal/e-cal-client.c:922
msgid "Invalid source type"
msgstr "Loái nguán khÃng háp lá"
-#: ../calendar/libecal/e-cal-component.c:1326
+#: ../calendar/libecal/e-cal-component.c:1337
msgid "Untitled appointment"
msgstr "Cuác hán khÃng tÃn"
@@ -1423,128 +1423,128 @@ msgid "31st"
msgstr "NgÃy 31"
#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
-#| msgid "High"
msgctxt "Priority"
msgid "High"
msgstr "Cao"
#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
-#| msgid "Normal"
msgctxt "Priority"
msgid "Normal"
msgstr "BÃnh thÆáng"
#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
-#| msgid "Low"
msgctxt "Priority"
msgid "Low"
msgstr "Tháp"
#. An empty string is the same as 'None'.
#: ../calendar/libecal/e-cal-util.c:716
-#| msgid "Undefined"
msgctxt "Priority"
msgid "Undefined"
msgstr "ChÆa Äánh nghÄa"
-#: ../calendar/libedata-cal/e-cal-backend.c:34
+#: ../calendar/libedata-cal/e-cal-backend.c:38
msgid "Cannot process, calendar backend is opening"
msgstr "KhÃng thá xá lÃ, háu phÆÆng lách Äang má"
-#: ../calendar/libedata-cal/e-cal-backend.c:212
+#: ../calendar/libedata-cal/e-cal-backend.c:146
#, c-format
-#| msgid "Unknown error: %s"
msgid "Unknown calendar property '%s'"
msgstr "Thuác tÃnh lách lá '%s'"
-#: ../calendar/libedata-cal/e-cal-backend.c:229
+#: ../calendar/libedata-cal/e-cal-backend.c:163
#, c-format
-#| msgid "Cannot save calendar data"
msgid "Cannot change value of calendar property '%s'"
msgstr "KhÃng thá thay Äái già trá thuác tÃnh lách '%s'"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:72
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:728
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:750
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:865
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:896
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1126
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:79
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:841
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:956
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1187
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1217
#, c-format
msgid "\"%s\" expects no arguments"
msgstr "\"%s\" khÃng cán Äán cà tham sá"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:224
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:269
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:308
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1167
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:231
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:276
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:315
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1258
#, c-format
msgid "\"%s\" expects one argument"
msgstr "\"%s\" cán Äán mát tham sá"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:114
#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:314
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:795
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:128
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:321
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:886
#, c-format
msgid "\"%s\" expects the first argument to be a string"
msgstr "\"%s\" cán Äán tham sá Äáu tiÃn là chuái"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:129
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:136
#, c-format
msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
msgstr "\"%s\" cán Äán tham sá Äáu tiÃn là chuái ngÃy/giá theo ISO 8601"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:171
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:455
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:789
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:931
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:178
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:537
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:880
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
#, c-format
msgid "\"%s\" expects two arguments"
msgstr "\"%s\" cán Äán hai tham sá"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:177
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:230
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:275
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:396
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:461
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1173
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:184
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:237
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:282
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:403
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:486
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:543
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1028
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1264
#, c-format
msgid "\"%s\" expects the first argument to be a time_t"
msgstr "\"%s\" cán Äán tham sá Äáu tiÃn là time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
#, c-format
msgid "\"%s\" expects the second argument to be an integer"
msgstr "\"%s\" cán Äán tham sá thá hai là sá nguyÃn"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:390
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397
#, c-format
-#| msgid "\"%s\" expects two arguments"
msgid "\"%s\" expects two or three arguments"
msgstr "\"%s\" cán hai hoác ba tham sá"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:404
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:470
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:945
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:411
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:492
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:552
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1036
#, c-format
msgid "\"%s\" expects the second argument to be a time_t"
msgstr "\"%s\" cán Äán tham sá thá hai là time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:420
#, c-format
-#| msgid "\"%s\" expects the first argument to be a string"
msgid "\"%s\" expects the third argument to be a string"
msgstr "\"%s\" cán tham sá thá ba là chuái"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:803
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480
+#, fuzzy, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects none or two arguments"
+msgstr "\"%s\" cán Äán hai tham sá"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894
#, c-format
msgid "\"%s\" expects the second argument to be a string"
msgstr "\"%s\" cán Äán tham sá thá hai là chuái"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:924
#, c-format
msgid ""
"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1555,12 +1555,12 @@ msgstr ""
"description  (mà tá),  location  (vá trÃ),  attendee  (ngÆái tham dá), "
" organizer  (ngÆái tá chác) hoác  classification  (phÃn loái)."
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:995
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
#, c-format
msgid "\"%s\" expects at least one argument"
msgstr "\"%s\" cán Äán Ãt nhát mát tham sá"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1009
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1100
#, c-format
msgid ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1569,183 +1569,148 @@ msgstr ""
"\"%s\" cán Äán mái Äái sá Äáu là chuái hoác chá cà mát Äái sá và Äái sá Äà "
"là boolean khÃng thát (#f)"
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libedata-cal/e-data-cal.c:438
msgid "Unsupported method"
msgstr "PhÆÆng phÃp khÃng ÄÆác há trá"
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:989
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:962
msgid "Cannot open calendar: "
msgstr "KhÃng thá má lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:987
msgid "Cannot remove calendar: "
msgstr "KhÃng thá bá lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1014
msgid "Cannot refresh calendar: "
msgstr "KhÃng thá cáp nhát lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1070
-#| msgid "Cannot create encoder context"
+#: ../calendar/libedata-cal/e-data-cal.c:1043
msgid "Cannot retrieve backend property: "
msgstr "KhÃng thá nhán thuác tÃnh háu phÆÆng: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1125
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1098
msgid "Cannot retrieve calendar object path: "
msgstr "KhÃng thá nhán ÄÆáng dán Äái tÆáng lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1155
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1128
msgid "Cannot retrieve calendar object list: "
msgstr "KhÃng thá nhán danh sÃch ÄÆáng dán Äái tÆáng lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1184
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1157
msgid "Cannot retrieve calendar free/busy list: "
msgstr "KhÃng thá nhán danh sÃch bán/ránh: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1215
-#| msgid "Cannot create encoder context"
+#: ../calendar/libedata-cal/e-data-cal.c:1188
msgid "Cannot create calendar object: "
msgstr "KhÃng thá táo Äái tÆáng lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1247
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1220
msgid "Cannot modify calendar object: "
msgstr "KhÃng thá thay Äái Äái tÆáng lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1254
msgid "Cannot remove calendar object: "
msgstr "KhÃng thá bá Äái tÆáng lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1308
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1281
msgid "Cannot receive calendar objects: "
msgstr "KhÃng thá nhán Äái tÆáng lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1339
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1312
msgid "Cannot send calendar objects: "
msgstr "KhÃng thá lÆu Äái tÆáng lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1371
-#| msgid "Could not retrieve weather data"
+#: ../calendar/libedata-cal/e-data-cal.c:1344
msgid "Could not retrieve attachment uris: "
msgstr "KhÃng thá nhán URI Äá ÄÃnh kÃm: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1399
-#| msgid "Could not store folder: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1372
msgid "Could not discard reminder: "
msgstr "KhÃng thá huá nhác nhá: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1428
-#| msgid "Could not generate encrypting data: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1401
msgid "Could not get calendar view path: "
msgstr "KhÃng thá láy ÄÆáng dán khung xem lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1458
-#| msgid "Could not retrieve weather data"
+#: ../calendar/libedata-cal/e-data-cal.c:1431
msgid "Could not retrieve calendar time zone: "
msgstr "KhÃng thá láy mÃi giá lách: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1484
-#| msgid "Could not rename folder: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1457
msgid "Could not add calendar time zone: "
msgstr "KhÃng thá thÃm mÃi giá lách: "
-#: ../calendar/libedata-cal/e-data-cal-factory.c:387
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
#, c-format
-#| msgid "Invalid range"
msgid "Invalid call"
msgstr "Lái gái khÃng háp lá"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:428
-#, c-format
-#| msgid "Invalid server URI"
-msgid "Invalid URI"
-msgstr "URI khÃng háp lá"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:446
-#, c-format
-msgid "No backend factory for '%s' of '%s'"
-msgstr "KhÃng cà bá táo háu phÆÆng cho '%s' cáa '%s'"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:489
-#, c-format
-#| msgid "Could not create cache file"
-msgid "Could not instantiate backend"
-msgstr "KhÃng thá táo háu phÆÆng"
-
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:206
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "Loái mà nÃy khÃng há trá kà tÃn"
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:219
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "Loái mà nÃy khÃng há trá xÃc minh"
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:235
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "Loái mà nÃy khÃng há trá mà hÃa"
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:249
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "Loái mà nÃy khÃng há trá giái mÃ"
-#: ../camel/camel-cipher-context.c:256
+#: ../camel/camel-cipher-context.c:262
#, c-format
msgid "You may not import keys with this cipher"
msgstr "Bán khÃng thá náp khÃa báng loái mà nÃy"
-#: ../camel/camel-cipher-context.c:270
+#: ../camel/camel-cipher-context.c:276
#, c-format
msgid "You may not export keys with this cipher"
msgstr "Bán khÃng thá xuát khÃa báng loái mà nÃy"
-#: ../camel/camel-cipher-context.c:812
+#: ../camel/camel-cipher-context.c:805
msgid "Signing message"
msgstr "Äang kà thÆ"
-#: ../camel/camel-cipher-context.c:1053
+#: ../camel/camel-cipher-context.c:1046
msgid "Encrypting message"
msgstr "Äang mà hÃa thÆ"
-#: ../camel/camel-cipher-context.c:1180
+#: ../camel/camel-cipher-context.c:1173
msgid "Decrypting message"
msgstr "Äang giái mà thÆ"
-#: ../camel/camel-data-cache.c:178
+#: ../camel/camel-data-cache.c:181
#, c-format
msgid "Unable to create cache path"
msgstr "KhÃng thá táo ÄÆáng dán nhá tám"
-#: ../camel/camel-data-cache.c:504
+#: ../camel/camel-data-cache.c:507
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "KhÃng thá loái bá mác nhá tám: %s: %s"
@@ -1777,37 +1742,46 @@ msgstr ""
msgid "Resynchronizing with server"
msgstr "Äang tÃi Äáng bá vái mÃy phác vá"
-#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
msgid "Downloading new messages for offline mode"
msgstr "Äang tái vá cÃc thÆ cho chá Äá ngoái tuyán"
-#: ../camel/camel-disco-folder.c:410
+#: ../camel/camel-disco-folder.c:416
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "Äang chuán bá thÆ mác '%s' Äá dÃng ngoái tuyán"
-#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
-msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+#, fuzzy
+#| msgid "Copy folder content locally for offline operation"
+msgid "Copy folder content locally for _offline operation"
msgstr ""
"Sao chÃp nái dung thÆ mác vá mÃy Äáa phÆÆng Äá phác vá cÃc thao tÃc ngoái "
"tuyán"
#: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1157
-#: ../camel/providers/imap/camel-imap-store.c:1935
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap/camel-imap-store.c:3192
-#: ../camel/providers/imapx/camel-imapx-folder.c:324
-#: ../camel/providers/imapx/camel-imapx-folder.c:357
-#: ../camel/providers/imapx/camel-imapx-folder.c:411
-#: ../camel/providers/imapx/camel-imapx-folder.c:457
-#: ../camel/providers/imapx/camel-imapx-folder.c:491
-#: ../camel/providers/imapx/camel-imapx-folder.c:531
-#: ../camel/providers/imapx/camel-imapx-folder.c:567
-#: ../camel/providers/imapx/camel-imapx-store.c:242
-#: ../camel/providers/imapx/camel-imapx-store.c:1306
-#: ../camel/providers/imapx/camel-imapx-store.c:1394
-#: ../camel/providers/imapx/camel-imapx-store.c:1440
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imap/camel-imap-store.c:2028
+#: ../camel/providers/imap/camel-imap-store.c:2523
+#: ../camel/providers/imap/camel-imap-store.c:3282
+#: ../camel/providers/imapx/camel-imapx-folder.c:407
+#: ../camel/providers/imapx/camel-imapx-folder.c:440
+#: ../camel/providers/imapx/camel-imapx-folder.c:474
+#: ../camel/providers/imapx/camel-imapx-folder.c:530
+#: ../camel/providers/imapx/camel-imapx-folder.c:587
+#: ../camel/providers/imapx/camel-imapx-folder.c:621
+#: ../camel/providers/imapx/camel-imapx-folder.c:661
+#: ../camel/providers/imapx/camel-imapx-folder.c:697
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1367
+#: ../camel/providers/imapx/camel-imapx-store.c:1455
+#: ../camel/providers/imapx/camel-imapx-store.c:1501
+#: ../camel/providers/pop3/camel-pop3-folder.c:525
+#: ../camel/providers/pop3/camel-pop3-folder.c:655
+#: ../camel/providers/pop3/camel-pop3-folder.c:838
+#: ../camel/providers/pop3/camel-pop3-folder.c:1036
+#: ../camel/providers/pop3/camel-pop3-store.c:393
+#: ../camel/providers/pop3/camel-pop3-store.c:805
#, c-format
msgid "You must be working online to complete this operation"
msgstr "Bán phái Äang hoát Äáng trác tuyán mái cà thá hoÃn tát thao tÃc nÃy."
@@ -1817,64 +1791,64 @@ msgstr "Bán phái Äang hoát Äáng trác tuyán mái cà thá hoÃn t
msgid "Canceled"
msgstr "Bá thÃi"
-#: ../camel/camel-filter-driver.c:878 ../camel/camel-filter-search.c:697
+#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "Lái táo tián trÃnh con '%s': %s"
-#: ../camel/camel-filter-driver.c:926
+#: ../camel/camel-filter-driver.c:943
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Nhán luáng thÆ khÃng háp lá tá %s: %s"
-#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1140
+#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
msgid "Syncing folders"
msgstr "Äang Äáng bá nháng thÆ mác"
-#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Lái phÃn tÃch bá lác: %s: %s"
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1692
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Lái thác hián bá lác: %s: %s"
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1347
#, c-format
msgid "Unable to open spool folder"
msgstr "KhÃng thá má thÆ mác hÃng Äái"
-#: ../camel/camel-filter-driver.c:1355
+#: ../camel/camel-filter-driver.c:1359
#, c-format
msgid "Unable to process spool folder"
msgstr "KhÃng thá xá là thÆ mác hÃng Äái"
-#: ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1377
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Äang láy thÃng diáp %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1380 ../camel/camel-filter-driver.c:1402
+#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
#, c-format
msgid "Failed on message %d"
msgstr "Lái trÃn thÆ %d"
-#: ../camel/camel-filter-driver.c:1417 ../camel/camel-filter-driver.c:1518
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
msgid "Syncing folder"
msgstr "Äang Äáng bá thÆ mác"
-#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
+#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
msgid "Complete"
msgstr "HoÃn tát"
-#: ../camel/camel-filter-driver.c:1482
+#: ../camel/camel-filter-driver.c:1485
#, c-format
msgid "Getting message %d of %d"
msgstr "Äang láy thÆ %d trÃn %d"
-#: ../camel/camel-filter-driver.c:1500
+#: ../camel/camel-filter-driver.c:1503
#, c-format
msgid "Failed at message %d of %d"
msgstr "Lái tái thÆ %d trÃn %d"
@@ -1883,68 +1857,63 @@ msgstr "Lái tái thÆ %d trÃn %d"
msgid "Failed to retrieve message"
msgstr "Lái nhán thÆ"
-#: ../camel/camel-filter-search.c:447
+#: ../camel/camel-filter-search.c:512
msgid "Invalid arguments to (system-flag)"
msgstr "Äái sá khÃng háp lá Äái vái (system-flag: cá há tháng)"
-#: ../camel/camel-filter-search.c:465
+#: ../camel/camel-filter-search.c:530
msgid "Invalid arguments to (user-tag)"
msgstr "Äái sá khÃng háp lá Äái vái (user-tag: thá ngÆái dÃng)"
-#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
+#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Lái thác hián tÃm kiám bá lác: %s: %s"
-#: ../camel/camel-folder.c:243
+#: ../camel/camel-folder.c:262
#, c-format
-#| msgid "Scanning for changed messages in %s"
msgid "Learning new spam message in '%s'"
msgid_plural "Learning new spam messages in '%s'"
msgstr[0] "Hác thÆ rÃc mái trong '%s'"
-#: ../camel/camel-folder.c:283
+#: ../camel/camel-folder.c:302
#, c-format
-#| msgid "Scanning for changed messages in %s"
msgid "Learning new ham message in '%s'"
msgid_plural "Learning new ham messages in '%s'"
msgstr[0] ""
-#: ../camel/camel-folder.c:331
+#: ../camel/camel-folder.c:350
#, c-format
-#| msgid "Filtering new message(s)"
msgid "Filtering new message in '%s'"
msgid_plural "Filtering new messages in '%s'"
msgstr[0] "Lác thÆ mái trong '%s'"
-#: ../camel/camel-folder.c:902
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:918
+#: ../camel/providers/local/camel-maildir-folder.c:322
msgid "Moving messages"
msgstr "Äang di chuyán thÆ"
-#: ../camel/camel-folder.c:905
+#: ../camel/camel-folder.c:921
msgid "Copying messages"
msgstr "Äang chÃp thÆ"
-#: ../camel/camel-folder.c:1160
+#: ../camel/camel-folder.c:1233
#, c-format
msgid "Quota information not supported for folder '%s'"
msgstr "KhÃng há trá thÃng tin chá tiÃu cho thÆ mác '%s'"
-#: ../camel/camel-folder.c:3271
+#: ../camel/camel-folder.c:3549
#, c-format
-#| msgid "Retrieving POP message %d"
msgid "Retrieving message '%s' in %s"
msgstr "Äang nhán thÆ '%s' trong %s"
-#: ../camel/camel-folder.c:3404
+#: ../camel/camel-folder.c:3698
#, c-format
-#| msgid "Fetching summary information for new messages in %s"
msgid "Retrieving quota information for '%s'"
msgstr "Äang láy thÃng tin chá tiÃu cho '%s'"
-#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:459
-#: ../camel/camel-folder-search.c:630
+#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
+#: ../camel/camel-folder-search.c:664
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -1953,8 +1922,8 @@ msgstr ""
"KhÃng thá phÃn tÃch biáu thác tÃm kiám: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:471
-#: ../camel/camel-folder-search.c:642
+#: ../camel/camel-folder-search.c:377 ../camel/camel-folder-search.c:491
+#: ../camel/camel-folder-search.c:676
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1964,47 +1933,47 @@ msgstr ""
"%s"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:856 ../camel/camel-folder-search.c:899
+#: ../camel/camel-folder-search.c:890 ../camel/camel-folder-search.c:933
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) cán thiát mát kát quá ÄÃng/sai riÃng lá"
#. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:960
+#: ../camel/camel-folder-search.c:994
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) khÃng ÄÆác phÃp bÃn trong %s"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:967 ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:1001 ../camel/camel-folder-search.c:1009
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) cán thiát mát chuái kháp kiáu (match type)"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1003
+#: ../camel/camel-folder-search.c:1037
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) mong Äái mát kát quá máng"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1013
+#: ../camel/camel-folder-search.c:1047
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) cán thiát Äát thÆ mác"
-#: ../camel/camel-gpg-context.c:657 ../camel/camel-gpg-context.c:662
-#: ../camel/camel-gpg-context.c:1288
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Lái thác hián GPG: %s"
-#: ../camel/camel-gpg-context.c:662
-#: ../camel/providers/smtp/camel-smtp-transport.c:762
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
msgid "Unknown"
msgstr "KhÃng biát"
-#: ../camel/camel-gpg-context.c:727
+#: ../camel/camel-gpg-context.c:733
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -2015,17 +1984,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:744
+#: ../camel/camel-gpg-context.c:769
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "Lái phÃn tÃch chá dán GPG UserID."
-#: ../camel/camel-gpg-context.c:769 ../camel/camel-gpg-context.c:784
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "Lái phÃn tÃch yÃu cáu cám tá mát kháu cáa GPG."
-#: ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:830
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -2034,7 +2003,7 @@ msgstr ""
"Bán cán mát mà PIN Äá má khÃa cho\n"
"thá thÃng minh cáa bán: Â %s Â"
-#: ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:834
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -2043,87 +2012,86 @@ msgstr ""
"Bán cán mát cám tá mát kháu Äá má khÃa\n"
"cho ngÆái dÃng: \"%s\""
-#: ../camel/camel-gpg-context.c:815
+#: ../camel/camel-gpg-context.c:840
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Nhán yÃu cáu khÃng mong Äái tá GnuPG cho  %s Â"
-#: ../camel/camel-gpg-context.c:844 ../camel/camel-net-utils.c:523
-#: ../camel/camel-tcp-stream-raw.c:260
-#: ../camel/providers/imapx/camel-imapx-server.c:5014
-#: ../camel/providers/imapx/camel-imapx-server.c:5031
-#: ../camel/providers/imapx/camel-imapx-store.c:161
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-#: ../libedataserver/e-client.c:134 ../libedataserverui/e-book-auth-util.c:227
+#: ../camel/camel-gpg-context.c:850
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+
+#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:382
+#: ../libedataserver/e-client.c:139 ../libedataserverui/e-book-auth-util.c:227
#, c-format
-#| msgid "Canceled"
msgid "Cancelled"
msgstr "Bá thÃi"
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:900
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "Lái má khÃa bà mát: Äà cho 3 cám tá mát kháu sai."
-#: ../camel/camel-gpg-context.c:874
+#: ../camel/camel-gpg-context.c:913
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "TÃn hiáu trá lái khÃng mong Äái tá GnuPG: %s"
-#: ../camel/camel-gpg-context.c:1005
+#: ../camel/camel-gpg-context.c:1044
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "Lái mà hÃa: chÆa xÃc Äánh ngÆái nhán."
-#: ../camel/camel-gpg-context.c:1552 ../camel/camel-smime-context.c:827
-#| msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
msgid "Could not generate signing data: "
msgstr "KhÃng thá phÃt sinh dá liáu kà nhán: "
-#: ../camel/camel-gpg-context.c:1601 ../camel/camel-gpg-context.c:1805
-#: ../camel/camel-gpg-context.c:1915 ../camel/camel-gpg-context.c:2062
-#: ../camel/camel-gpg-context.c:2162 ../camel/camel-gpg-context.c:2210
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
msgid "Failed to execute gpg."
msgstr "Lái thác hián GPG."
-#: ../camel/camel-gpg-context.c:1680 ../camel/camel-gpg-context.c:1688
-#: ../camel/camel-gpg-context.c:1696 ../camel/camel-gpg-context.c:1716
-#: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
-#: ../camel/camel-smime-context.c:976
+#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-smime-context.c:980
#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "KhÃng thá xÃc minh chá kà thÆ: dáng thác thÆ khÃng ÄÃng"
-#: ../camel/camel-gpg-context.c:1758
-#| msgid "Cannot verify message signature: Incorrect message format"
+#: ../camel/camel-gpg-context.c:1797
msgid "Cannot verify message signature: "
msgstr "KhÃng thá xÃc minh chá kà thÆ: "
-#: ../camel/camel-gpg-context.c:1881
-#| msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1920
msgid "Could not generate encrypting data: "
msgstr "KhÃng thá phÃt sinh dá liáu mát mà hÃa: "
-#: ../camel/camel-gpg-context.c:1934
+#: ../camel/camel-gpg-context.c:1973
msgid "This is a digitally encrypted message part"
msgstr "ÄÃy là mát phán thÆ cà mát mà hÃa sá"
-#: ../camel/camel-gpg-context.c:1992 ../camel/camel-gpg-context.c:2001
-#: ../camel/camel-gpg-context.c:2024
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "KhÃng thá giái mát mà thÆ: dáng thác thÆ khÃng ÄÃng"
-#: ../camel/camel-gpg-context.c:2012
+#: ../camel/camel-gpg-context.c:2051
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Lái giái mát mà phán MIME: lái giao thác"
-#: ../camel/camel-gpg-context.c:2103 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
msgid "Encrypted content"
msgstr "Nái dung bá mát mà hÃa"
-#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
msgid "Only reset to beginning is supported with CamelHttpStream"
msgstr "Chá há trá Äát lái vá Äáu vái CamelHttpStream"
@@ -2134,7 +2102,6 @@ msgstr "KhÃng thá táo táp tin khÃa cho %s: %s"
#: ../camel/camel-lock.c:145
#, c-format
-#| msgid "Timed out trying to get lock file on %s. Try again later."
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr "Quà hán thá láy táp tin khÃa trÃn %s. Sá thá lái sau."
@@ -2224,13 +2191,11 @@ msgstr "Lái sao chÃp táp tin thÆ tám: %s"
#: ../camel/camel-multipart-signed.c:297
#, c-format
-#| msgid "No description available"
msgid "No content available"
msgstr "KhÃng cà nái dung"
#: ../camel/camel-multipart-signed.c:305
#, c-format
-#| msgid "No description available"
msgid "No signature available"
msgstr "KhÃng cà chá kÃ"
@@ -2239,21 +2204,6 @@ msgstr "KhÃng cà chá kÃ"
msgid "parse error"
msgstr "lái phÃn tÃch"
-#: ../camel/camel-network-service.c:99
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "KhÃng thá kát nái tái %s: %s"
-
-#: ../camel/camel-network-service.c:100
-msgid "SSL unavailable"
-msgstr "KhÃng cà SSL"
-
-#: ../camel/camel-network-service.c:123
-#, c-format
-#| msgid "Could not connect to %s: %s"
-msgid "Could not connect to %s: "
-msgstr "KhÃng thá kát nái tái %s: "
-
#: ../camel/camel-net-utils.c:703
#, c-format
msgid "Resolving: %s"
@@ -2281,12 +2231,17 @@ msgstr "Lái tra cáu mÃy phác vá tÃn"
msgid "Name lookup failed: %s"
msgstr "Lái tra cáu mÃy phác vá tÃn: %s"
-#: ../camel/camel-offline-folder.c:202
+#: ../camel/camel-network-service.c:112
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "KhÃng thá kát nái tái %s: "
+
+#: ../camel/camel-offline-folder.c:206
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "Äang Äáng bá thÆ trong thÆ mác `%s' vÃo ÄÄa"
-#: ../camel/camel-offline-journal.c:147 ../camel/camel-offline-journal.c:177
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "KhÃng thá táo thÆ mác '%s': %s"
@@ -2299,22 +2254,22 @@ msgstr "Bá cung cáp thÆ mác áo"
msgid "For reading mail as a query of another set of folders"
msgstr "Äá Äác thÆ nhÆ là mát truy ván cáa mát táp cÃc thÆ mác khÃc"
-#: ../camel/camel-provider.c:192
+#: ../camel/camel-provider.c:193
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "KhÃng thá tái %s: há tháng nÃy chÆa há trá tÃnh nÄng tái mà Äun."
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:202
#, c-format
msgid "Could not load %s: %s"
msgstr "KhÃng thá tái %s: %s"
-#: ../camel/camel-provider.c:210
+#: ../camel/camel-provider.c:211
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "KhÃng thá tái %s: khÃng cà mà khái Äáng trong mà Äun"
-#: ../camel/camel-provider.c:394 ../camel/camel-session.c:351
+#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "KhÃng cà bÃn nÃo cung cáp giao thác `%s'"
@@ -2359,11 +2314,11 @@ msgstr ""
"ThÃng tin truy tÃm khÃng háp lá:\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:46
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:48
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
@@ -2371,11 +2326,11 @@ msgstr ""
"TÃy chán nÃy sá kát nái tái mÃy phác vá dÃng mát kháu an toÃn CRAM-MD5, náu "
"mÃy chá cà há trá."
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:59
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:61
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -2383,47 +2338,47 @@ msgstr ""
"TÃy chán nÃy sá kát nái tái mÃy phác vá báng mát kháu an toÃn DIGEST-MD5, "
"náu mÃy phác vá cà há trá."
-#: ../camel/camel-sasl-digest-md5.c:830
+#: ../camel/camel-sasl-digest-md5.c:850
#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "Lánh thÃch thác mÃy phác vá quà dÃi (trÃn 2048 octet)."
-#: ../camel/camel-sasl-digest-md5.c:841
+#: ../camel/camel-sasl-digest-md5.c:861
#, c-format
msgid "Server challenge invalid\n"
msgstr "Lánh thÃch thác mÃy phác vá khÃng háp lá.\n"
-#: ../camel/camel-sasl-digest-md5.c:849
+#: ../camel/camel-sasl-digest-md5.c:869
#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr ""
"Lánh thÃch thác mÃy phác vá cháa hiáu bÃi  Quality of Protection  (mác báo "
"vá) khÃng háp lá."
-#: ../camel/camel-sasl-digest-md5.c:883
+#: ../camel/camel-sasl-digest-md5.c:902
#, c-format
msgid "Server response did not contain authorization data"
msgstr "Hái ÄÃp cáa mÃy phác vá khÃng cháa dá liáu Äá xÃc thác."
-#: ../camel/camel-sasl-digest-md5.c:904
+#: ../camel/camel-sasl-digest-md5.c:923
#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "Hái ÄÃp cáa mÃy phác vá cháa dá liáu xÃc thác khÃng hoÃn chánh."
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:936
#, c-format
msgid "Server response does not match"
msgstr "Hái ÄÃp cáa mÃy phác vá khÃng kháp."
-#: ../camel/camel-sasl-gssapi.c:86
+#: ../camel/camel-sasl-gssapi.c:91
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:88
+#: ../camel/camel-sasl-gssapi.c:93
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "TÃy chán nÃy sá kát nái tái mÃy chu báng cÆ chá xÃc minh Kerberos 5."
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:134
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
@@ -2431,18 +2386,18 @@ msgstr ""
"CÆ chá xÃc Äánh khÃng ÄÆác há trá do thÃng tin xÃc thác ÄÃ cung cáp, hoác "
"khÃng ÄÆác cháp nhán do cÃch thác hián."
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:139
msgid "The provided target_name parameter was ill-formed."
msgstr "Tham sá target_name (tÃn ÄÃch) ÄÆác cung cáp cà dáng thác sai."
-#: ../camel/camel-sasl-gssapi.c:137
+#: ../camel/camel-sasl-gssapi.c:142
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr ""
"Tham sá target_name (tÃn ÄÃch) cháa loái tÃn khÃng há trá hoác khÃng háp lá."
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:146
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
@@ -2450,7 +2405,7 @@ msgstr ""
"Tham sá input-token (hiáu bÃi gÃ) cháa thá ÄÃng kát kÃnh khÃc vái Äiáu do "
"tham sá input-chan-bindings (thá ÄÃng kát kÃnh gÃ) xÃc Äánh."
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:151
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
@@ -2458,7 +2413,7 @@ msgstr ""
"Tham sá input_token (hiáu bÃi gà cháa chá kà khÃng háp lá, hoác chá kà khÃng "
"ÄÆác xÃc nhán."
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:155
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
@@ -2466,85 +2421,83 @@ msgstr ""
"ThÃng tin xÃc thác khÃng háp lá Äá khái Äáng ngá cánh, hoác mÃc nà khÃng "
"tham chiáu Äán thÃng tin xÃc thác nÃo."
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:160
msgid "The supplied context handle did not refer to a valid context."
msgstr "MÃc ngá cánh ÄÆác cung cáp khÃng tham chiáu Äán mát ngá cánh háp lá."
-#: ../camel/camel-sasl-gssapi.c:158
+#: ../camel/camel-sasl-gssapi.c:163
msgid "The consistency checks performed on the input_token failed."
msgstr ""
"Thao tÃc kiám tra Äáng bá ÄÆác thác hián trÃn input_token (hiáu bÃi gÃ) ÄÃ "
"thát bái."
-#: ../camel/camel-sasl-gssapi.c:161
+#: ../camel/camel-sasl-gssapi.c:166
msgid "The consistency checks performed on the credential failed."
msgstr ""
"Thao tÃc kiám tra Äáng bá ÄÆác thác hián trÃn thÃng tin xÃc thác ÄÃ thát bái."
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:169
msgid "The referenced credentials have expired."
msgstr "ÄÃ tham chiáu Äán thÃng tin xÃc thác ÄÃ hát hán."
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:321
-#: ../camel/camel-sasl-gssapi.c:365 ../camel/camel-sasl-gssapi.c:382
-#: ../camel/providers/smtp/camel-smtp-transport.c:1232
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
+#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:562
#, c-format
msgid "Bad authentication response from server."
msgstr "Trá lái xÃc thác sai tá mÃy phác vá."
-#: ../camel/camel-sasl-gssapi.c:394
+#: ../camel/camel-sasl-gssapi.c:410
#, c-format
msgid "Unsupported security layer."
msgstr "Táng báo mát chÆa ÄÆác há trá."
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:40
msgid "Login"
msgstr "ÄÄng nháp"
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
msgid "This option will connect to the server using a simple password."
msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá báng mát kháu ÄÆn gián."
-#: ../camel/camel-sasl-login.c:92
+#: ../camel/camel-sasl-login.c:107
#, c-format
msgid "Unknown authentication state."
msgstr "Tráng thÃi xÃc thác lá."
-#: ../camel/camel-sasl-ntlm.c:42
+#: ../camel/camel-sasl-ntlm.c:47
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:44
+#: ../camel/camel-sasl-ntlm.c:49
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
msgstr ""
"TÃy chán nÃy sá kát nái tái mÃy phác vá dáa vÃo Windows dÃng NTLM / SPA"
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:44
msgid "PLAIN"
msgstr "THÃ"
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
msgid "POP before SMTP"
msgstr "POP trÆác SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "TÃy chán nÃy sá xÃc thác kát nái POP trÆác khi thá SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:80
-#| msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:84
msgid "POP Source UID"
msgstr "UID nguán POP"
-#: ../camel/camel-sasl-popb4smtp.c:92
+#: ../camel/camel-sasl-popb4smtp.c:96
#, c-format
-#| msgid "POP Before SMTP auth using an unknown transport"
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "XÃc thác POP trÆác SMTP dÃng truyán tái lá"
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
#, c-format
msgid "POP Before SMTP authentication attempted with a %s service"
msgstr "ÄÃ thá xÃc thác POP trÆác SMTP vái dách vá %s"
@@ -2554,279 +2507,276 @@ msgstr "ÄÃ thá xÃc thác POP trÆác SMTP vái dách vá %s"
msgid "Regular expression compilation failed: %s: %s"
msgstr "BiÃn dách biáu thác chÃnh quy thát bái: %s: %s"
-#: ../camel/camel-service.c:524
-#, c-format
-#| msgid "URL '%s' needs a username component"
-msgid "URL '%s' needs a user component"
-msgstr "URL '%s' cán tÃn ngÆái dÃng"
-
-#: ../camel/camel-service.c:535
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' cán phán mÃy phác vá"
-
-#: ../camel/camel-service.c:546
+#: ../camel/camel-session.c:393
#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' cán phán ÄÆáng dán"
-
-#: ../camel/camel-session.c:361
-#, c-format
-#| msgid "No provider available for protocol '%s'"
msgid "Invalid GType registered for protocol '%s'"
msgstr ""
-#: ../camel/camel-session.c:941
+#: ../camel/camel-session.c:472
+#: ../camel/providers/imap/camel-imap-store.c:1143
+#: ../camel/providers/imapx/camel-imapx-server.c:2936
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:566
+#: ../camel/providers/smtp/camel-smtp-transport.c:455
+#, fuzzy, c-format
+#| msgid "No support for authentication type %s"
+msgid "No support for %s authentication"
+msgstr "KhÃng há trá kiáu xÃc thác %s"
+
+#: ../camel/camel-session.c:487
+#, fuzzy, c-format
+#| msgid "Authentication failed"
+msgid "%s authentication failed"
+msgstr "XÃc thác thát bái"
+
+#: ../camel/camel-session.c:1194
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "%sHÃy gà mát kháu POP cho %s trÃn mÃy %s"
-#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "KhÃng thá tÃm cháng nhán cho '%s'"
-#: ../camel/camel-smime-context.c:375
+#: ../camel/camel-smime-context.c:379
msgid "Cannot create CMS message"
msgstr "KhÃng thá táo thÆ CMS"
-#: ../camel/camel-smime-context.c:380
+#: ../camel/camel-smime-context.c:384
msgid "Cannot create CMS signed data"
msgstr "KhÃng thá táo dá liáu cà chá kà CMS"
-#: ../camel/camel-smime-context.c:386
+#: ../camel/camel-smime-context.c:390
msgid "Cannot attach CMS signed data"
msgstr "KhÃng thá ÄÃnh kÃm dá liáu cà chá kà CMS"
-#: ../camel/camel-smime-context.c:393
+#: ../camel/camel-smime-context.c:397
msgid "Cannot attach CMS data"
msgstr "KhÃng thá ÄÃnh kÃm dá liáu CMS"
-#: ../camel/camel-smime-context.c:399
+#: ../camel/camel-smime-context.c:403
msgid "Cannot create CMS Signer information"
msgstr "KhÃng thá táo thÃng tin Chá kà CMS"
-#: ../camel/camel-smime-context.c:405
+#: ../camel/camel-smime-context.c:409
msgid "Cannot find certificate chain"
msgstr "KhÃng thá tÃm dÃy cháng nhán"
-#: ../camel/camel-smime-context.c:411
+#: ../camel/camel-smime-context.c:415
msgid "Cannot add CMS Signing time"
msgstr "KhÃng thá thÃm thái gian kà nhán CMS"
-#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "Cháng nhán mà hÃa cho \"%s\" khÃng tán tái"
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:461
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr ""
"KhÃng thá thÃm thuác tÃnh SMIMEEncKeyPrefs (sá thÃch khÃa mà hÃa S/MIME)"
-#: ../camel/camel-smime-context.c:462
+#: ../camel/camel-smime-context.c:466
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr ""
"KhÃng thá thÃm thuác tÃnh MS SMIMEEncKeyPrefs (sá thÃch khÃa mà hÃa S/MIME "
"MS)"
-#: ../camel/camel-smime-context.c:467
+#: ../camel/camel-smime-context.c:471
msgid "Cannot add encryption certificate"
msgstr "KhÃng thá thÃm cháng nhán mà hÃa"
-#: ../camel/camel-smime-context.c:473
+#: ../camel/camel-smime-context.c:477
msgid "Cannot add CMS Signer information"
msgstr "KhÃng thá thÃm thÃng tin Chá kà CMS"
#. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:506
+#: ../camel/camel-smime-context.c:510
msgid "Unverified"
msgstr "ChÆa thám tra"
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:512
msgid "Good signature"
msgstr "Chá kà tát"
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:514
msgid "Bad signature"
msgstr "Chá kà sai"
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:516
msgid "Content tampered with or altered in transit"
msgstr "Nái dung bá giá máo hay bá thay Äái trong khi truyán"
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:518
msgid "Signing certificate not found"
msgstr "KhÃng tÃm tháy cháng nhán kà tÃn"
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:520
msgid "Signing certificate not trusted"
msgstr "Cháng nhán kà tÃn khÃng ÄÃng tin"
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:522
msgid "Signature algorithm unknown"
msgstr "KhÃng biát thuát toÃn chá kÃ"
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:524
msgid "Signature algorithm unsupported"
msgstr "KhÃng há trá thuát toÃn chá kÃ"
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:526
msgid "Malformed signature"
msgstr "Chá kà dáng thác sai"
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:528
msgid "Processing error"
msgstr "Lái xá lÃ"
-#: ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:573
msgid "No signed data in signature"
msgstr "KhÃng cà dá liáu cà kà tÃn trong chá kÃ"
-#: ../camel/camel-smime-context.c:574
+#: ../camel/camel-smime-context.c:578
msgid "Digests missing from enveloped data"
msgstr "Thiáu Äiáu tÃm tát thÆ trong dá liáu ÄÆác bao"
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
msgid "Cannot calculate digests"
msgstr "KhÃng thá tÃnh nháng Äiáu tÃm tát"
-#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
msgid "Cannot set message digests"
msgstr "KhÃng thá Äát nháng Äiáu tÃm tát thÆ"
-#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
msgid "Certificate import failed"
msgstr "Lái náp cháng nhán"
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:638
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "Cháng nhán là toÃn thÆ; khÃng thá thám tra cháng nhán"
-#: ../camel/camel-smime-context.c:637
+#: ../camel/camel-smime-context.c:641
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "Cháng nhán là toÃn thÆ; cÃc cháng nhán ÄÆác náp và ÄÆác thám tra"
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:645
msgid "Cannot find signature digests"
msgstr "KhÃng tÃm tháy Äiáu tÃm tát chá kÃ"
-#: ../camel/camel-smime-context.c:657
+#: ../camel/camel-smime-context.c:661
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "KÃ tÃn do : %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
msgid "Cannot create encoder context"
msgstr "KhÃng thá táo ngÅ cánh bá biÃn mÃ"
-#: ../camel/camel-smime-context.c:844
+#: ../camel/camel-smime-context.c:848
msgid "Failed to add data to CMS encoder"
msgstr "Lái thÃm dá liáu vÃo bá biÃn mà CMS"
-#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
msgid "Failed to encode data"
msgstr "Lái biÃn mà dá liáu"
-#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
msgid "Decoder failed"
msgstr "Lái bá giái mÃ"
-#: ../camel/camel-smime-context.c:1061
+#: ../camel/camel-smime-context.c:1065
msgid "Cannot find common bulk encryption algorithm"
msgstr "KhÃng tÃm tháy thuát toÃn mà hÃa hÃng loát chung"
-#: ../camel/camel-smime-context.c:1069
+#: ../camel/camel-smime-context.c:1073
msgid "Cannot allocate slot for encryption bulk key"
msgstr "KhÃng thá gÃn vá trà cho khÃa hÃng loát mà hÃa"
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1084
msgid "Cannot create CMS Message"
msgstr "KhÃng thá táo thÆ CMS"
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1090
msgid "Cannot create CMS Enveloped data"
msgstr "KhÃng thá táo dá liáu ÄÆác bao CMS"
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1096
msgid "Cannot attach CMS Enveloped data"
msgstr "KhÃng ÄÃnh kÃm dá liáu ÄÆác bao CMS"
-#: ../camel/camel-smime-context.c:1098
+#: ../camel/camel-smime-context.c:1102
msgid "Cannot attach CMS data object"
msgstr "KhÃng thá ÄÃnh kÃm Äái tÆáng dá liáu CMS"
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1111
msgid "Cannot create CMS Recipient information"
msgstr "KhÃng thá táo thÃng tin ngÆái nhán CMS"
-#: ../camel/camel-smime-context.c:1112
+#: ../camel/camel-smime-context.c:1116
msgid "Cannot add CMS Recipient information"
msgstr "KhÃng thá thÃm thÃng tin ngÆái nhán CMS"
-#: ../camel/camel-smime-context.c:1137
+#: ../camel/camel-smime-context.c:1141
msgid "Failed to add data to encoder"
msgstr "Lái thÃm dá liáu vÃo bá biÃn mÃ"
-#: ../camel/camel-smime-context.c:1246
+#: ../camel/camel-smime-context.c:1250
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME giái mÃ: khÃng tÃm tháy nái dung ÄÆác mà hÃa"
-#: ../camel/camel-store.c:1815
+#: ../camel/camel-store.c:1799
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "KhÃng thá táo thÆ mác '%s': thÆ mác ÄÃ cÃ"
-#: ../camel/camel-store.c:1858
+#: ../camel/camel-store.c:1842
#, c-format
-#| msgid "Syncing folders"
msgid "Opening folder '%s'"
msgstr "Má thÆ mác '%s'"
-#: ../camel/camel-store.c:2043
+#: ../camel/camel-store.c:2027
#, c-format
-#| msgid "Scanning for changed messages in %s"
msgid "Scanning folders in '%s'"
msgstr "Äang quÃt thÆ mác trong '%s'"
#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2055 ../camel/camel-store.c:2065
+#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
#: ../camel/camel-vtrash-folder.c:48
msgid "Trash"
msgstr "RÃc"
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2058 ../camel/camel-store.c:2069
+#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
#: ../camel/camel-vtrash-folder.c:50
msgid "Junk"
msgstr "ThÆ rÃc"
-#: ../camel/camel-store.c:2520
+#: ../camel/camel-store.c:2501
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "KhÃng thá táo thÆ mác: %s: thÆ mác ÄÃ cÃ"
-#: ../camel/camel-store.c:2534
+#: ../camel/camel-store.c:2515
#, c-format
-#| msgid "Cannot get folder '%s': %s"
msgid "Creating folder '%s'"
msgstr "Äang táo thÆ mác '%s'"
-#: ../camel/camel-store.c:2652 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "KhÃng thá xoà thÆ mác: %s: thao tÃc khÃng háp lá"
-#: ../camel/camel-store.c:2795 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:710
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:764
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "KhÃng thá Äái tÃn thÆ mác: %s: thao tÃc khÃng háp lá"
-#: ../camel/camel-stream-filter.c:327
+#: ../camel/camel-stream-filter.c:334
msgid "Only reset to beginning is supported with CamelStreamFilter"
msgstr "Chá há trá Äát lái vá Äáu vái CamelStreamFilter"
@@ -2840,129 +2790,138 @@ msgstr "Kát nái bá háy bá"
msgid "Could not connect with command \"%s\": %s"
msgstr "KhÃng thá kát nái báng lánh \"%s\": %s"
-#: ../camel/camel-tcp-stream-raw.c:756 ../camel/camel-tcp-stream-raw.c:767
+#: ../camel/camel-tcp-stream-raw.c:303
+#, c-format
+msgid "NSPR error code %d"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
#, c-format
msgid "The proxy host does not support SOCKS4"
msgstr "MÃu uá nhiám khÃng há trá SOCKS4"
-#: ../camel/camel-tcp-stream-raw.c:778
+#: ../camel/camel-tcp-stream-raw.c:662
#, c-format
msgid "The proxy host denied our request: code %d"
msgstr "MÃy uá nhiám tá chái yÃu cáu cáa ta: mà %d"
-#: ../camel/camel-tcp-stream-raw.c:874 ../camel/camel-tcp-stream-raw.c:880
+#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
#, c-format
msgid "The proxy host does not support SOCKS5"
msgstr "MÃy chá khÃng há trá SOCKS5"
-#: ../camel/camel-tcp-stream-raw.c:886
+#: ../camel/camel-tcp-stream-raw.c:770
#, c-format
-#| msgid "No support for authentication type %s"
msgid "Could not find a suitable authentication type: code 0x%x"
msgstr "KhÃng tÃm tháy loái xÃc thác phà háp: mà 0x%x"
-#: ../camel/camel-tcp-stream-raw.c:898
+#: ../camel/camel-tcp-stream-raw.c:782
msgid "General SOCKS server failure"
msgstr "Lái mÃy chá SOCKS chung"
-#: ../camel/camel-tcp-stream-raw.c:899
+#: ../camel/camel-tcp-stream-raw.c:783
msgid "SOCKS server's rules do not allow connection"
msgstr "CÃc quy tác cáa mÃy chá SOCKS khÃng cho phÃp táo kát nái"
-#: ../camel/camel-tcp-stream-raw.c:900
+#: ../camel/camel-tcp-stream-raw.c:784
msgid "Network is unreachable from SOCKS server"
msgstr "KhÃng thá tiáp cán mÃy chá SOCKS"
-#: ../camel/camel-tcp-stream-raw.c:901
+#: ../camel/camel-tcp-stream-raw.c:785
msgid "Host is unreachable from SOCKS server"
msgstr "KhÃng thá tiáp cán mÃy chá SOCKS"
-#: ../camel/camel-tcp-stream-raw.c:902
-#| msgid "Connection canceled"
+#: ../camel/camel-tcp-stream-raw.c:786
msgid "Connection refused"
msgstr "Kát nái bá tá chái"
-#: ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:787
msgid "Time-to-live expired"
msgstr "Hát hán Time-to-live (TTL)"
-#: ../camel/camel-tcp-stream-raw.c:904
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:788
msgid "Command not supported by SOCKS server"
msgstr "MÃy chá SOCKS khÃng há trá lánh nÃy"
-#: ../camel/camel-tcp-stream-raw.c:905
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:789
msgid "Address type not supported by SOCKS server"
msgstr "MÃy chá SOCKS khÃng há trá loái Äáa chá nÃy"
-#: ../camel/camel-tcp-stream-raw.c:906
-#| msgid "Unknown error: %s"
+#: ../camel/camel-tcp-stream-raw.c:790
msgid "Unknown error from SOCKS server"
msgstr "Lái lá tá mÃy chá SOCKS"
-#: ../camel/camel-tcp-stream-raw.c:939
+#: ../camel/camel-tcp-stream-raw.c:823
#, c-format
msgid "Got unknown address type from SOCKS server"
msgstr "Nhán loái Äáa chá lá tá mÃy chá SOCKS"
-#: ../camel/camel-tcp-stream-raw.c:957
+#: ../camel/camel-tcp-stream-raw.c:841
#, c-format
-#| msgid "Invalid response from server"
msgid "Incomplete reply from SOCKS server"
msgstr "Hái ÄÃp khÃng hoÃn chánh tá mÃy chá SOCKS"
-#: ../camel/camel-tcp-stream-raw.c:977
+#: ../camel/camel-tcp-stream-raw.c:861
#, c-format
msgid "Hostname is too long (maximum is 255 characters)"
msgstr "TÃn mÃy quà dÃi (tái Äa 255 kà tá)"
#. SOCKS5
#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1009 ../camel/camel-tcp-stream-raw.c:1019
+#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
#, c-format
-#| msgid "Invalid response from server"
msgid "Invalid reply from proxy server"
msgstr "Hái ÄÃp khÃng háp lá tá mÃy uá nhiám"
-#: ../camel/camel-tcp-stream-ssl.c:462
-#, c-format
+#: ../camel/camel-tcp-stream-ssl.c:474
+#, fuzzy, c-format
+#| msgid ""
+#| "Issuer: %s\n"
+#| "Subject: %s\n"
+#| "Fingerprint: %s\n"
+#| "Signature: %s"
msgid ""
-"Issuer: %s\n"
-"Subject: %s\n"
-"Fingerprint: %s\n"
-"Signature: %s"
+" Issuer: %s\n"
+" Subject: %s\n"
+" Fingerprint: %s\n"
+" Signature: %s"
msgstr ""
"Nhà phÃt hÃnh: %s\n"
"Chá Äá: %s\n"
"Dáu Äiám chá: %s\n"
"Chá kÃ: %s"
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:480
msgid "GOOD"
msgstr "TáT"
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:480
msgid "BAD"
msgstr "SAI"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:472
+#: ../camel/camel-tcp-stream-ssl.c:484
#, c-format
msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
"\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:488
+msgid "_Reject"
msgstr ""
-"Kiám tra cháng nhán SSL cho %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Bán cà muán cháp nhán khÃng?"
-#: ../camel/camel-tcp-stream-ssl.c:516
+#: ../camel/camel-tcp-stream-ssl.c:489
+msgid "Accept _Temporarily"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:490
+msgid "_Accept Permanently"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:548
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2971,7 +2930,7 @@ msgstr ""
"Ván Äá cháng nhán: %s\n"
"Nhà phÃt hÃnh: %s"
-#: ../camel/camel-tcp-stream-ssl.c:568
+#: ../camel/camel-tcp-stream-ssl.c:600
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2980,7 +2939,7 @@ msgstr ""
"VÃng cháng nhán sai: %s\n"
"Nhà phÃt hÃnh: %s"
-#: ../camel/camel-tcp-stream-ssl.c:586
+#: ../camel/camel-tcp-stream-ssl.c:618
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2989,7 +2948,7 @@ msgstr ""
"Cháng nhán quà hán: %s\n"
"Nhà phÃt hÃnh: %s"
-#: ../camel/camel-tcp-stream-ssl.c:603
+#: ../camel/camel-tcp-stream-ssl.c:635
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2998,24 +2957,29 @@ msgstr ""
"Danh sÃch háy bá cháng nhán quà hán: %s\n"
"Nhà phÃt hÃnh: %s"
-#: ../camel/camel-url.c:333
+#: ../camel/camel-url.c:330
#, c-format
msgid "Could not parse URL '%s'"
msgstr "KhÃng thá phÃn tÃch URL '%s'"
-#: ../camel/camel-vee-folder.c:1310 ../camel/camel-vee-folder.c:1470
+#: ../camel/camel-vee-folder.c:651
+#, fuzzy, c-format
+#| msgid "Storing folder"
+msgid "Updating %s folder"
+msgstr "Äang lÆu thÆ mác"
+
+#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482
#, c-format
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "KhÃng thá sao chÃp hoác di chuyán thÆ vÃo thÆ mác áo"
-#: ../camel/camel-vee-folder.c:1343
+#: ../camel/camel-vee-folder.c:1358
#, c-format
msgid "No such message %s in %s"
msgstr "KhÃng cà thÆ %s trong %s"
-#: ../camel/camel-vee-folder.c:1411
+#: ../camel/camel-vee-folder.c:1426
#, c-format
-#| msgid "Error storing '%s': %s"
msgid "Error storing '%s': "
msgstr "Lái lÆu '%s': "
@@ -3043,24 +3007,36 @@ msgstr "KhÃng thá sao chÃp cÃc thÆ vÃo thÆ mác RÃc"
msgid "Cannot copy messages to the Junk folder"
msgstr "KhÃng thá sao chÃp cÃc thÆ vÃo thÆ mác ThÆ rÃc"
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:293
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
#, c-format
msgid "No output stream"
msgstr "KhÃng cà luáng kát xuát"
-#: ../camel/providers/imap/camel-imap-command.c:206
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
#, c-format
msgid "No input stream"
msgstr "KhÃng cà luáng nháp liáu"
-#: ../camel/providers/imap/camel-imap-command.c:365
+#: ../camel/providers/imap/camel-imap-command.c:383
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "MÃy chá ÄÃ ngát kát nái bát ngá: %s"
-#: ../camel/providers/imap/camel-imap-command.c:395
+#: ../camel/providers/imap/camel-imap-command.c:416
+#, fuzzy, c-format
+#| msgid ""
+#| "Alert from IMAP server %s %s:\n"
+#| "%s"
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"BÃo Äáng tá mÃy phác vá IMAP %s %s:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:420
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -3069,117 +3045,123 @@ msgstr ""
"BÃo Äáng tá mÃy phác vá IMAP %s %s:\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:471
+#: ../camel/providers/imap/camel-imap-command.c:502
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "TÃnh hiáu trá lái khÃng mong Äái tá mÃy phác vá IMAP: %s"
-#: ../camel/providers/imap/camel-imap-command.c:483
+#: ../camel/providers/imap/camel-imap-command.c:514
#, c-format
msgid "IMAP command failed: %s"
msgstr "Lái lánh IMAP: %s"
-#: ../camel/providers/imap/camel-imap-command.c:563
+#: ../camel/providers/imap/camel-imap-command.c:594
#, c-format
msgid "Server response ended too soon."
msgstr "TÃnh hiáu trá lái cáa mÃy phác vá kát thÃc quà sám."
-#: ../camel/providers/imap/camel-imap-command.c:775
+#: ../camel/providers/imap/camel-imap-command.c:806
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "TÃn hiáu trá lái cáa mÃy phác vá IMAP khÃng cháa thÃng tin %s"
-#: ../camel/providers/imap/camel-imap-command.c:813
+#: ../camel/providers/imap/camel-imap-command.c:844
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "TÃn hiáu trá lái ÂÄáng ÃÂ khÃng mong Äái tá mÃy phác vá IMAP: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:296
-msgid "Always check for new mail in this folder"
+#: ../camel/providers/imap/camel-imap-folder.c:348
+#, fuzzy
+#| msgid "Always check for new mail in this folder"
+msgid "Always check for _new mail in this folder"
msgstr "LuÃn luÃn kiám tra tÃm thÆ mái trong thÆ mác nÃy"
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:359
+#: ../camel/providers/imapx/camel-imapx-folder.c:747
+#: ../camel/providers/nntp/camel-nntp-folder.c:760
+#, fuzzy
+#| msgid "Cannot copy messages to the Trash folder"
+msgid "Apply message _filters to this folder"
+msgstr "KhÃng thá sao chÃp cÃc thÆ vÃo thÆ mác RÃc"
+
+#: ../camel/providers/imap/camel-imap-folder.c:440
#, c-format
msgid "Could not create directory %s: %s"
msgstr "KhÃng thá táo thÆ mác %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:395
+#: ../camel/providers/imap/camel-imap-folder.c:461
#, c-format
msgid "Could not load summary for %s"
msgstr "KhÃng thá tái tÃm tát cho %s"
-#: ../camel/providers/imap/camel-imap-folder.c:1057
-#: ../camel/providers/imapx/camel-imapx-server.c:4065
+#: ../camel/providers/imap/camel-imap-folder.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:3938
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Äang quÃt tÃm cÃc thÆ thay Äái trong %s"
-#: ../camel/providers/imap/camel-imap-folder.c:3486
-#| msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3478
msgid "Unable to retrieve message: "
msgstr "KhÃng thá láy thÆ: "
-#: ../camel/providers/imap/camel-imap-folder.c:3523
-#: ../camel/providers/imapx/camel-imapx-server.c:5344
+#: ../camel/providers/imap/camel-imap-folder.c:3515
+#: ../camel/providers/imapx/camel-imapx-server.c:5497
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "KhÃng thá láy thÆ cà mà sá thÆ %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:3524
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#: ../camel/providers/imap/camel-imap-folder.c:3516
+#: ../camel/providers/imapx/camel-imapx-server.c:5498
msgid "No such message available."
msgstr "KhÃng cà thÆ nhÆ váy."
-#: ../camel/providers/imap/camel-imap-folder.c:3599
-#: ../camel/providers/imap/camel-imap-folder.c:4506
-#: ../camel/providers/nntp/camel-nntp-folder.c:438
+#: ../camel/providers/imap/camel-imap-folder.c:3591
+#: ../camel/providers/imap/camel-imap-folder.c:4469
+#: ../camel/providers/nntp/camel-nntp-folder.c:515
#, c-format
msgid "This message is not currently available"
msgstr "ThÆ nÃy hián thái chÆa sán sÃng"
-#: ../camel/providers/imap/camel-imap-folder.c:4090
-#: ../camel/providers/imap/camel-imap-folder.c:4173
-#: ../camel/providers/imapx/camel-imapx-server.c:4023
-#: ../camel/providers/imapx/camel-imapx-server.c:4173
+#: ../camel/providers/imap/camel-imap-folder.c:4050
+#: ../camel/providers/imap/camel-imap-folder.c:4133
+#: ../camel/providers/imapx/camel-imapx-server.c:3890
+#: ../camel/providers/imapx/camel-imapx-server.c:4070
#, c-format
msgid "Fetching summary information for new messages in %s"
msgstr "Äang láy thÃng tin tÃm tát cho cÃc thÆ mái trong %s"
-#: ../camel/providers/imap/camel-imap-folder.c:4307
+#: ../camel/providers/imap/camel-imap-folder.c:4267
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "TÃn hiáu trá lái chÆa hoÃn tát: chÆa nhán thÃng tin cho thÆ %d"
-#: ../camel/providers/imap/camel-imap-folder.c:4317
+#: ../camel/providers/imap/camel-imap-folder.c:4277
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "TÃn hiáu trá lái chÆa hoÃn tát: chÆa nhán UID cho thÆ %d"
-#: ../camel/providers/imap/camel-imap-folder.c:4546
+#: ../camel/providers/imap/camel-imap-folder.c:4509
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "KhÃng thá tÃm tháy phán thÃn thÆ trong tÃn hiáu trá lái FETCH (láy)"
-#: ../camel/providers/imap/camel-imap-message-cache.c:197
-#: ../camel/providers/imap/camel-imap-message-cache.c:257
-#| msgid "Could not open cache directory: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
msgid "Could not open cache directory: "
msgstr "KhÃng thá má thÆ mác nhá tám (cache): "
-#: ../camel/providers/imap/camel-imap-message-cache.c:335
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "Lái lÆu tám thÆ %s: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:401
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
#, c-format
-#| msgid "Failed to cache message %s: %s"
msgid "Failed to cache message %s: "
msgstr "Lái lÆu tám thÆ %s: "
-#: ../camel/providers/imap/camel-imap-message-cache.c:543
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
#, c-format
-#| msgid "Failed to cache %s: %s"
msgid "Failed to cache %s: "
msgstr "Lái lÆu tám %s: "
@@ -3189,12 +3171,12 @@ msgid "Checking for New Mail"
msgstr "Kiám tra tÃm thÆ mái"
#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
msgid "C_heck for new messages in all folders"
msgstr "_Kiám tra tÃm thÆ mái trÃn mái thÆ mác"
#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
msgid "Ch_eck for new messages in subscribed folders"
msgstr "Kiám tr_a tÃm thÆ mái trÃn mái thÆ mác ÄÃ ÄÄng kÃ"
@@ -3209,13 +3191,12 @@ msgid "_Use custom command to connect to server"
msgstr "_DÃng lánh tá chán Äá kát nái Äán mÃy phác vá"
#: ../camel/providers/imap/camel-imap-provider.c:52
-#| msgid "Command:"
msgid "Co_mmand:"
msgstr "_Lánh:"
#: ../camel/providers/imap/camel-imap-provider.c:56
#: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
msgid "Folders"
msgstr "ThÆ mác"
@@ -3230,7 +3211,6 @@ msgid "O_verride server-supplied folder namespace"
msgstr "CÃ quyán cao hÆn bá tÃn Äác nhát thÆ mác do mÃy phác vá cung cáp"
#: ../camel/providers/imap/camel-imap-provider.c:62
-#| msgid "Namespace:"
msgid "Names_pace:"
msgstr "_Mián tÃn:"
@@ -3239,219 +3219,204 @@ msgstr "_Mián tÃn:"
#: ../camel/providers/local/camel-local-provider.c:42
#: ../camel/providers/local/camel-local-provider.c:84
#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
msgid "Options"
msgstr "TÃy chán"
#: ../camel/providers/imap/camel-imap-provider.c:66
#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#, fuzzy
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "Apply _filters to new messages in all folders"
+msgstr "Ã_p dáng bá lác vÃo thÆ mái trong háp ThÆ Äán"
+
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
msgid "_Apply filters to new messages in Inbox on this server"
msgstr ""
"Ã_p dáng bá lác cho nháng thÆ mái nám trong thÆ mác INBOX (háp Äán) trÃn mÃy "
"phác vá nÃy"
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "_Kiám tra thÆ mái tÃm nái dung rÃc"
-
#: ../camel/providers/imap/camel-imap-provider.c:70
#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Chá kiám tra thÆ rÃc trong thÆ mác IN_BOX (háp Äán)"
+msgid "Check new messages for _Junk contents"
+msgstr "Kiám tra thÆ mái tÃm nái dung _rÃc"
#: ../camel/providers/imap/camel-imap-provider.c:72
#: ../camel/providers/imapx/camel-imapx-provider.c:80
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "Chá kiám tra thÆ rÃc trong thÆ mác IN_BOX (háp Äán)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
msgid "Automatically synchroni_ze remote mail locally"
msgstr "_Tá Äáng Äáng bá hÃa thÆ tá xa mát cÃch Äáa phÆÆng"
-#: ../camel/providers/imap/camel-imap-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:80
msgid "IMAP default port"
msgstr "Cáng IMAP mác Äánh"
-#: ../camel/providers/imap/camel-imap-provider.c:79
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
-#| msgid "IMAP server %s"
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
msgid "IMAP over SSL"
msgstr "IMAP qua SSL"
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:87
msgid "IMAP"
msgstr "IMAP"
-#: ../camel/providers/imap/camel-imap-provider.c:87
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imap/camel-imap-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:98
msgid "For reading and storing mail on IMAP servers."
msgstr "Äá Äác và lÆu thÆ trÃn mÃy phác vá IMAP."
-#: ../camel/providers/imap/camel-imap-provider.c:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:118
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
msgid "Password"
msgstr "Mát kháu"
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:115
+#: ../camel/providers/imap/camel-imap-provider.c:109
+#: ../camel/providers/imapx/camel-imapx-provider.c:120
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"TÃy chán nÃy sá kát nái tái mÃy phác vá IMAP báng mát kháu thà (khÃng mát "
"mÃ)."
#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:224
-#: ../camel/providers/imap/camel-imap-store.c:2601
-#: ../camel/providers/imapx/camel-imapx-store.c:340
-#: ../camel/providers/imapx/camel-imapx-store.c:796
-#: ../camel/providers/local/camel-maildir-folder.c:464
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:711
-#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/imap/camel-imap-store.c:272
+#: ../camel/providers/imap/camel-imap-store.c:2694
+#: ../camel/providers/imapx/camel-imapx-store.c:373
+#: ../camel/providers/imapx/camel-imapx-store.c:844
+#: ../camel/providers/local/camel-maildir-folder.c:471
+#: ../camel/providers/local/camel-maildir-store.c:301
+#: ../camel/providers/local/camel-maildir-store.c:675
+#: ../camel/providers/local/camel-maildir-store.c:681
+#: ../camel/providers/local/camel-maildir-store.c:765
+#: ../camel/providers/local/camel-spool-store.c:387
msgid "Inbox"
msgstr "Háp nhán"
-#: ../camel/providers/imap/camel-imap-store.c:356
-#: ../camel/providers/imap/camel-imap-store.c:383
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:3042
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#: ../camel/providers/imapx/camel-imapx-server.c:2818
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Lái kát nái tái mÃy phác vá IMAP %s trong chá Äá an toÃn: %s"
-#: ../camel/providers/imap/camel-imap-store.c:357
-#: ../camel/providers/imapx/camel-imapx-server.c:3043
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:2819
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
msgid "STARTTLS not supported"
msgstr "ChÆa há trá STARTTLS"
-#: ../camel/providers/imap/camel-imap-store.c:376
-#: ../camel/providers/imapx/camel-imapx-server.c:3081
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imapx/camel-imapx-server.c:2858
#, c-format
-#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgid "Failed to connect to IMAP server %s in secure mode: "
msgstr "Lái kát nái tái mÃy phác vá IMAP %s trong chá Äá an toÃn: "
-#: ../camel/providers/imap/camel-imap-store.c:384
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-msgid "SSL is not available in this build"
-msgstr "PhiÃn bán xÃy dáng nÃy khÃng há trá giao thác SSL"
-
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:3176
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imapx/camel-imapx-server.c:2925
+#, fuzzy, c-format
+#| msgid "IMAP server %s does not support requested authentication type %s"
+msgid "IMAP server %s does not support %s authentication"
msgstr "MÃy phác vá IMAP %s khÃng há trá kiáu xÃc thác ÄÆác yÃu cáu %s"
-#: ../camel/providers/imap/camel-imap-store.c:720
-#: ../camel/providers/imapx/camel-imapx-server.c:3189
-#: ../camel/providers/smtp/camel-smtp-transport.c:350
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "KhÃng há trá kiáu xÃc thác %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:731
-#: ../camel/providers/smtp/camel-smtp-transport.c:363
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "Lái táo Äái tÆáng xÃc thác SASL."
-
-#: ../camel/providers/imap/camel-imap-store.c:779
-#: ../camel/providers/imapx/camel-imapx-server.c:3234
-#, c-format
-msgid "You did not enter a password."
-msgstr "Bán chÆa nháp mát kháu."
-
-#: ../camel/providers/imap/camel-imap-store.c:820
-#: ../camel/providers/imapx/camel-imapx-server.c:3279
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"KhÃng thá xÃc thác vái mÃy phác vá IMAP.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/imap/camel-imap-store.c:878
-#: ../camel/providers/imapx/camel-imapx-store.c:144
+#: ../camel/providers/imap/camel-imap-store.c:809
+#: ../camel/providers/imapx/camel-imapx-store.c:155
#, c-format
msgid "IMAP server %s"
msgstr "MÃy phác vá IMAP %s"
-#: ../camel/providers/imap/camel-imap-store.c:881
-#: ../camel/providers/imapx/camel-imapx-store.c:147
+#: ../camel/providers/imap/camel-imap-store.c:812
+#: ../camel/providers/imapx/camel-imapx-store.c:158
#, c-format
msgid "IMAP service for %s on %s"
msgstr "Dách vá IMAP cho %s trÃn %s"
-#: ../camel/providers/imap/camel-imap-store.c:1972
-#: ../camel/providers/imap/camel-imap-store.c:2176
-#: ../camel/providers/imapx/camel-imapx-store.c:315
+#: ../camel/providers/imap/camel-imap-store.c:1111
+#: ../camel/providers/imapx/camel-imapx-server.c:2955
+#: ../camel/providers/nntp/camel-nntp-store.c:505
+#, fuzzy
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate without a username"
+msgstr "KhÃng thá xÃc thác vái mÃy phác vá: %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:2964
+#: ../camel/providers/nntp/camel-nntp-store.c:514
+#: ../camel/providers/pop3/camel-pop3-store.c:491
+#: ../camel/providers/pop3/camel-pop3-store.c:511
+#, fuzzy
+#| msgid "Authentication Failed"
+msgid "Authentication password not available"
+msgstr "XÃc thác thát bái"
+
+#: ../camel/providers/imap/camel-imap-store.c:2065
+#: ../camel/providers/imap/camel-imap-store.c:2269
+#: ../camel/providers/imapx/camel-imapx-store.c:348
#, c-format
msgid "No such folder %s"
msgstr "KhÃng cà thÆ mác %s"
-#: ../camel/providers/imap/camel-imap-store.c:1986
-#: ../camel/providers/imap/camel-imap-store.c:2445
-#: ../camel/providers/imapx/camel-imapx-store.c:1327
+#: ../camel/providers/imap/camel-imap-store.c:2079
+#: ../camel/providers/imap/camel-imap-store.c:2538
+#: ../camel/providers/imapx/camel-imapx-store.c:1388
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
msgstr "TÃn thÆ mác  %s  khÃng háp lá và cháa kà tá  %c Â."
-#: ../camel/providers/imap/camel-imap-store.c:2050
-#: ../camel/providers/imap/camel-imap-store.c:2509
-#: ../camel/providers/imapx/camel-imapx-store.c:1348
+#: ../camel/providers/imap/camel-imap-store.c:2143
+#: ../camel/providers/imap/camel-imap-store.c:2602
+#: ../camel/providers/imapx/camel-imapx-store.c:1409
#, c-format
msgid "The parent folder is not allowed to contain subfolders"
msgstr "ThÆ mác má khÃng ÄÆác phÃp cháa cÃc thÆ mác con"
-#: ../camel/providers/imap/camel-imap-store.c:2103
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:424
-#: ../camel/providers/local/camel-mh-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:2196
+#: ../camel/providers/local/camel-maildir-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:421
+#: ../camel/providers/local/camel-mh-store.c:558
#, c-format
msgid "Cannot create folder '%s': folder exists."
msgstr "KhÃng thá táo thÆ mác  %s Â: thÆ mác Äà cÃ."
-#: ../camel/providers/imap/camel-imap-store.c:2458
-#: ../camel/providers/imapx/camel-imapx-store.c:1338
+#: ../camel/providers/imap/camel-imap-store.c:2551
+#: ../camel/providers/imapx/camel-imapx-store.c:1399
#, c-format
msgid "Unknown parent folder: %s"
msgstr "ThÆ mác cha lá: %s"
-#: ../camel/providers/imap/camel-imap-store.c:3235
+#: ../camel/providers/imap/camel-imap-store.c:3326
#, c-format
-#| msgid "Server unexpectedly disconnected: %s"
msgid "Server unexpectedly disconnected"
msgstr "MÃy chá ngát kát nái bát ngá"
-#: ../camel/providers/imap/camel-imap-store.c:3238
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3329
msgid "Server unexpectedly disconnected: "
msgstr "MÃy chá ÄÃ ngát kát nái bát ngá: "
-#: ../camel/providers/imapx/camel-imapx-folder.c:91
+#: ../camel/providers/imapx/camel-imapx-folder.c:101
#, c-format
-#| msgid "Could not load summary for %s"
msgid "Could not create folder summary for %s"
msgstr "KhÃng thá táo tÃm tát thÆ mác cho %s"
-#: ../camel/providers/imapx/camel-imapx-folder.c:99
+#: ../camel/providers/imapx/camel-imapx-folder.c:109
#, c-format
-#| msgid "Could not create cache file"
msgid "Could not create cache for %s: "
msgstr "KhÃng thá táo vÃng lÆu trá tám (cache) cho %s: "
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
msgid "Use _Quick Resync if the server supports it"
msgstr "DÃng Äáng bá _nhanh náu mÃy chá há trá"
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use I_dle if the server supports it"
-msgstr "DÃng I_dle náu mÃy chá há trá"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
+msgstr ""
#: ../camel/providers/imapx/camel-imapx-provider.c:56
msgid "Command:"
@@ -3465,38 +3430,159 @@ msgstr "_Sá kát nái tám cà thá má"
msgid "Namespace:"
msgstr "Mián tÃn:"
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
msgid "Default IMAP port"
msgstr "Cáng IMAP mác Äánh"
-#: ../camel/providers/imapx/camel-imapx-provider.c:94
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapx/camel-imapx-server.c:1504
-#| msgid "Error writing mail temp file: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:817
+#, fuzzy
+#| msgid "Server unexpectedly disconnected"
+msgid "Server disconnected"
+msgstr "MÃy chá ngát kát nái bát ngá"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1203
msgid "Error writing to cache stream: "
msgstr "Lái ghi vÃo luáng trá tám (cache): "
-#: ../camel/providers/imapx/camel-imapx-server.c:2214
+#: ../camel/providers/imapx/camel-imapx-server.c:1930
#, c-format
-#| msgid "Failed to authenticate.\n"
msgid "Not authenticated"
msgstr "ChÆa xÃc thác"
-#: ../camel/providers/imapx/camel-imapx-server.c:3452
-#| msgid "Posting failed: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:1995
+#, fuzzy
+#| msgid "Error performing search"
+msgid "Error performing IDLE"
+msgstr "Gáp lái khi tÃm kiám"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3150
+#, fuzzy
+#| msgid "Encrypting message"
+msgid "Error fetching message"
+msgstr "Äang mà hÃa thÆ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3218
msgid "Closing tmp stream failed: "
msgstr "Lái ÄÃng luáng tmp: "
-#: ../camel/providers/imapx/camel-imapx-server.c:5490
-#: ../camel/providers/imapx/camel-imapx-server.c:5505
-#| msgid "Cannot create message: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3317
+#, fuzzy
+#| msgid "Copying messages"
+msgid "Error copying messages"
+msgstr "Äang chÃp thÆ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3447
+#, fuzzy
+#| msgid "Sending message"
+msgid "Error appending message"
+msgstr "Äang gái thÆ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3627
+msgid "Error fetching message headers"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3768
+#, fuzzy
+#| msgid ""
+#| "Error retrieving newsgroups:\n"
+#| "\n"
+#| "%s"
+msgid "Error retrieving message"
+msgstr ""
+"Lái nhán nhÃm tin:\n"
+"\n"
+"%s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3971
+#, fuzzy
+#| msgid "Checking for new messages"
+msgid "Error fetching new messages"
+msgstr "Äang kiám tra tÃm thÆ mái"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4161
+#, fuzzy
+#| msgid "Verifying message"
+msgid "Error while fetching messages"
+msgstr "Äang xÃc minh thÆ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4169
+#: ../camel/providers/imapx/camel-imapx-server.c:4199
+#, fuzzy, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for %d message in %s"
+msgid_plural "Fetching summary information for %d messages in %s"
+msgstr[0] "Äang láy thÃng tin tÃm tát cho cÃc thÆ mái trong %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4321
+#: ../camel/providers/imapx/camel-imapx-server.c:4355
+#, fuzzy
+#| msgid "Error performing search"
+msgid "Error refreshing folder"
+msgstr "Gáp lái khi tÃm kiám"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4444
+#, fuzzy
+#| msgid "Expunging old messages"
+msgid "Error expunging message"
+msgstr "Äang xÃa hán cÃc thÆ cÅ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4528
+#, fuzzy
+#| msgid "Creating folder '%s'"
+msgid "Error fetching folders"
+msgstr "Äang táo thÆ mác '%s'"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4602
+#, fuzzy
+#| msgid "_Show only subscribed folders"
+msgid "Error subscribing to folder"
+msgstr "Chá _hián nháng thÆ mác ÄÄng kÃ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4655
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error creating folder"
+msgstr "Äang lÆu thÆ mác"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4700
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error deleting folder"
+msgstr "Äang lÆu thÆ mác"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4750
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error renaming folder"
+msgstr "Äang lÆu thÆ mác"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4801
+#, fuzzy
+#| msgid "Error performing search"
+msgid "Error performing NOOP"
+msgstr "Gáp lái khi tÃm kiám"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4896
+msgid "Error syncing changes"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5652
+#: ../camel/providers/imapx/camel-imapx-server.c:5667
msgid "Cannot create spool file: "
msgstr ""
-#: ../camel/providers/imapx/camel-imapx-store.c:1115
-#: ../camel/providers/nntp/camel-nntp-store.c:1713
+#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#, fuzzy, c-format
+#| msgid "Retrieving quota information for '%s'"
+msgid "Retrieving folder list for %s"
+msgstr "Äang láy thÃng tin chá tiÃu cho '%s'"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1176
+#: ../camel/providers/nntp/camel-nntp-store.c:1790
#, c-format
msgid "No such folder: %s"
msgstr "KhÃng cà thÆ mác nhÆ váy: %s"
@@ -3508,36 +3594,33 @@ msgstr ""
#: ../camel/providers/imapx/camel-imapx-stream.c:79
#, c-format
-#| msgid "service unavailable"
msgid "Source stream unavailable"
msgstr "Luáng nguán khÃng sán sÃng"
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:191
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:188
-#: ../camel/providers/local/camel-local-folder.c:197
+#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:210
#, c-format
-#| msgid "mailbox:%s (%s)"
msgid "mailbox: %s (%s)"
msgstr "háp thÆ: %s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:219
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:473
-msgid "Index message body data"
+#: ../camel/providers/local/camel-local-folder.c:483
+#, fuzzy
+#| msgid "Index message body data"
+msgid "_Index message body data"
msgstr "Chá mác cÃc dá liáu trong phán thÃn thÆ"
-#: ../camel/providers/local/camel-local-folder.c:704
+#: ../camel/providers/local/camel-local-folder.c:712
#, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| " %s"
msgid ""
"Cannot get message %s from folder %s\n"
"%s"
@@ -3571,7 +3654,9 @@ msgstr ""
#: ../camel/providers/local/camel-local-provider.c:86
#: ../camel/providers/local/camel-local-provider.c:107
-msgid "_Apply filters to new messages in INBOX"
+#, fuzzy
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "_Apply filters to new messages in Inbox"
msgstr "Ã_p dáng bá lác vÃo thÆ mái trong háp ThÆ Äán"
#: ../camel/providers/local/camel-local-provider.c:93
@@ -3604,234 +3689,225 @@ msgstr ""
msgid "Standard Unix mbox spool directory"
msgstr "ThÆ mác hÃng Äái mbox UNIX chuán"
-#: ../camel/providers/local/camel-local-store.c:92
+#: ../camel/providers/local/camel-local-store.c:98
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "KhÃng thá Äái tÃn thÆ mác %s thÃnh %s: %s"
-#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:178
#, c-format
msgid "Local mail file %s"
msgstr "Táp tin thÆ các bá %s"
-#: ../camel/providers/local/camel-local-store.c:235
-#: ../camel/providers/local/camel-local-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:542
-#: ../camel/providers/local/camel-spool-store.c:574
+#: ../camel/providers/local/camel-local-store.c:218
+#: ../camel/providers/local/camel-local-store.c:375
+#: ../camel/providers/local/camel-maildir-store.c:101
+#: ../camel/providers/local/camel-mbox-store.c:555
+#: ../camel/providers/local/camel-spool-store.c:86
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "Gác lÆu %s khÃng phái là ÄÆáng dán tuyát Äái"
-#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:227
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "Gác lÆu %s khÃng phái là thÆ mác bÃnh thÆáng"
-#: ../camel/providers/local/camel-local-store.c:255
-#: ../camel/providers/local/camel-local-store.c:265
-#: ../camel/providers/local/camel-local-store.c:390
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../camel/providers/local/camel-local-store.c:239
+#: ../camel/providers/local/camel-local-store.c:249
+#: ../camel/providers/local/camel-local-store.c:388
+#: ../camel/providers/local/camel-maildir-store.c:134
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "KhÃng thá láy thÆ mác: %s: %s"
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:286
#, c-format
msgid "Local stores do not have an inbox"
msgstr "Bá lÆu trá các bá chÆa cà thÆ mác Háp nhán"
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:716
+#: ../camel/providers/local/camel-local-store.c:445
+#: ../camel/providers/local/camel-mbox-store.c:722
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "KhÃng thá xoà táp tin chá mác thÆ mác  %s Â: %s"
-#: ../camel/providers/local/camel-local-store.c:463
-#: ../camel/providers/local/camel-mbox-store.c:746
+#: ../camel/providers/local/camel-local-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:752
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "KhÃng thá xoà siÃu táp tin cáa thÆ mác  %s Â: %s"
-#: ../camel/providers/local/camel-local-store.c:549
+#: ../camel/providers/local/camel-local-store.c:581
#, c-format
msgid "Could not rename '%s': %s"
msgstr "KhÃng thá Äái tÃn '%s': %s"
-#: ../camel/providers/local/camel-local-summary.c:569
+#: ../camel/providers/local/camel-local-summary.c:527
#, c-format
msgid "Unable to add message to summary: unknown reason"
msgstr "KhÃng thá thÃm thÆ vÃo báng tÃm tát: khÃng biát sao"
#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-maildir-folder.c:336
#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
msgid "No such message"
msgstr "KhÃng cà thÆ nhÆ váy"
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:226
#, c-format
-#| msgid "Cannot append message to maildir folder: %s: %s"
msgid "Cannot append message to maildir folder: %s: "
msgstr "KhÃng thá nái thÆ vÃo cuái thÆ mác maildir: %s: "
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:172
+#: ../camel/providers/local/camel-mh-folder.c:182
#, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| " %s"
msgid "Cannot get message %s from folder %s: "
msgstr "KhÃng thá láy thÆ %s tá thÆ mác %s: "
-#: ../camel/providers/local/camel-maildir-folder.c:351
+#: ../camel/providers/local/camel-maildir-folder.c:354
#, c-format
-#| msgid "Cannot append message to maildir folder: %s: %s"
msgid "Cannot transfer message to destination folder: %s"
msgstr "KhÃng thá truyán thÆ Äán thÆ mác ÄÃch: %s"
-#: ../camel/providers/local/camel-maildir-store.c:100
-#, c-format
-#| msgid "Cannot create folder: %s: folder exists"
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+#: ../camel/providers/local/camel-maildir-store.c:109
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgid "Cannot create folder: %s: Folder name cannot contain a dot"
msgstr "KhÃng thá táo thÆ mác: %s : tÃn thÆ mác khÃng ÄÆác cháa dáu chám"
-#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:728
+#: ../camel/providers/local/camel-maildir-store.c:119
+#: ../camel/providers/local/camel-maildir-store.c:782
#, c-format
-#| msgid "Folder already exists"
msgid "Folder %s already exists"
msgstr "ThÆ mác %s ÄÃ cÃ"
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:392
-#: ../camel/providers/local/camel-mbox-store.c:406
+#: ../camel/providers/local/camel-maildir-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:403
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "KhÃng thá táo thÆ mác  %s Â: %s"
-#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:358
-#: ../camel/providers/local/camel-mh-store.c:505
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:516
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "KhÃng thá láy thÆ mác  %s Â: %s"
-#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:368
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:525
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "KhÃng thá láy thÆ mác  %s Â: thÆ mác khÃng tán tái."
-#: ../camel/providers/local/camel-maildir-store.c:239
+#: ../camel/providers/local/camel-maildir-store.c:263
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "KhÃng thá láy thÆ mác  %s Â: khÃng phái thÆ mác maildir."
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:652
+#: ../camel/providers/local/camel-maildir-store.c:329
+#: ../camel/providers/local/camel-maildir-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:670
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "KhÃng thá xoà thÆ mác  %s Â: %s"
-#: ../camel/providers/local/camel-maildir-store.c:295
+#: ../camel/providers/local/camel-maildir-store.c:331
msgid "not a maildir directory"
msgstr "khÃng phái là thÆ mác dáng Maildir"
-#: ../camel/providers/local/camel-maildir-store.c:510
-#: ../camel/providers/local/camel-maildir-store.c:885
-#: ../camel/providers/local/camel-spool-store.c:161
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:569
+#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:228
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "KhÃng thá quÃt thÆ mác  %s Â: %s"
-#: ../camel/providers/local/camel-maildir-store.c:719
+#: ../camel/providers/local/camel-maildir-store.c:773
#, c-format
-#| msgid "Cannot create folder: %s: folder exists"
msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
msgstr "KhÃng thá Äái tÃn thÆ mác: %s: tÃn thÆ mác khÃng ÄÆác cháa dáu chám "
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:571
+#: ../camel/providers/local/camel-maildir-summary.c:416
+#: ../camel/providers/local/camel-maildir-summary.c:549
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "KhÃng thá má ÄÆáng dán thÆ mác dáng Maildir: %s: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:562
+#: ../camel/providers/local/camel-maildir-summary.c:540
msgid "Checking folder consistency"
msgstr "Äang kiám tra tÃnh nhát quÃn cáa thÆ mác"
-#: ../camel/providers/local/camel-maildir-summary.c:655
+#: ../camel/providers/local/camel-maildir-summary.c:633
msgid "Checking for new messages"
msgstr "Äang kiám tra tÃm thÆ mái"
-#: ../camel/providers/local/camel-maildir-summary.c:748
-#: ../camel/providers/local/camel-mbox-summary.c:485
-#: ../camel/providers/local/camel-mbox-summary.c:717
-#: ../camel/providers/local/camel-mbox-summary.c:863
-#: ../camel/providers/local/camel-spool-summary.c:131
+#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:418
+#: ../camel/providers/local/camel-mbox-summary.c:649
+#: ../camel/providers/local/camel-mbox-summary.c:793
+#: ../camel/providers/local/camel-spool-summary.c:130
msgid "Storing folder"
msgstr "Äang lÆu thÆ mác"
-#: ../camel/providers/local/camel-mbox-folder.c:183
+#: ../camel/providers/local/camel-mbox-folder.c:187
#, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
msgid "Cannot open mailbox: %s: "
msgstr "KhÃng thá má háp thÆ: %s: "
-#: ../camel/providers/local/camel-mbox-folder.c:249
+#: ../camel/providers/local/camel-mbox-folder.c:253
#, c-format
-#| msgid "Cannot append message to mbox file: %s: %s"
msgid "Cannot append message to mbox file: %s: "
msgstr "KhÃng thá nái thÆ vÃo ÄuÃi táp tin mbox: %s: "
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
msgid "The folder appears to be irrecoverably corrupted."
msgstr "ThÆ mác nÃy cà vá Äà bá hÆ và khÃng thá ÄÆác phác hái."
-#: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:71
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "KhÃng thá táo khÃa thÆ mác trÃn %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:380
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:563
#, c-format
msgid "Cannot create a folder by this name."
msgstr "KhÃng thá táo thÆ mác vái tÃn ÄÃ"
-#: ../camel/providers/local/camel-mbox-store.c:417
+#: ../camel/providers/local/camel-mbox-store.c:414
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "KhÃng thá láy thÆ mác  %s Â: khÃng phái là táp tin bÃnh thÆáng."
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:579
#, c-format
msgid "Cannot create directory '%s': %s."
msgstr "KhÃng thá táo thÆ mác  %s Â: %s"
-#: ../camel/providers/local/camel-mbox-store.c:582
+#: ../camel/providers/local/camel-mbox-store.c:591
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "KhÃng thá táo thÆ mác: %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:584
+#: ../camel/providers/local/camel-mbox-store.c:593
msgid "Folder already exists"
msgstr "ThÆ mác ÄÃ cÃ"
-#: ../camel/providers/local/camel-mbox-store.c:627
-#: ../camel/providers/local/camel-mbox-store.c:640
-#: ../camel/providers/local/camel-mbox-store.c:669
+#: ../camel/providers/local/camel-mbox-store.c:633
+#: ../camel/providers/local/camel-mbox-store.c:646
+#: ../camel/providers/local/camel-mbox-store.c:675
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3840,132 +3916,130 @@ msgstr ""
"KhÃng thá xoà thÆ mác  %s Â:\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:656
#, c-format
msgid "'%s' is not a regular file."
msgstr " %s  khÃng phái là táp tin bÃnh thÆáng."
-#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:665
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "ThÆ mác  %s  khÃng ráng nÃn chÆa xoÃ."
-#: ../camel/providers/local/camel-mbox-store.c:686
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../camel/providers/local/camel-mbox-store.c:707
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "KhÃng thá xoà táp tin tÃm tát thÆ mác  %s Â: %s"
-#: ../camel/providers/local/camel-mbox-store.c:783
+#: ../camel/providers/local/camel-mbox-store.c:789
#, c-format
msgid "The new folder name is illegal."
msgstr "TÃn thÆ mác mái khÃng ÄÆác phÃp"
-#: ../camel/providers/local/camel-mbox-store.c:799
+#: ../camel/providers/local/camel-mbox-store.c:805
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "KhÃng thá Äái tÃn  %s Â:  %s Â: %s"
-#: ../camel/providers/local/camel-mbox-store.c:882
+#: ../camel/providers/local/camel-mbox-store.c:888
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "KhÃng thá Äái tÃn  %s  thÃnh %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:495
+#: ../camel/providers/local/camel-mbox-summary.c:428
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "KhÃng thá má thÆ mác: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:556
+#: ../camel/providers/local/camel-mbox-summary.c:490
#, c-format
-#| msgid "Fatal mail parser error near position %ld in folder %s"
msgid "Fatal mail parser error near position %s in folder %s"
msgstr "Lái nghiÃm tráng khi phÃn tÃch thÆ gán vá trà %s trong thÆ mác %s"
-#: ../camel/providers/local/camel-mbox-summary.c:645
+#: ../camel/providers/local/camel-mbox-summary.c:574
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "KhÃng thá kiám tra thÆ mác: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:730
-#: ../camel/providers/local/camel-mbox-summary.c:872
-#: ../camel/providers/local/camel-spool-summary.c:138
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:802
+#: ../camel/providers/local/camel-spool-summary.c:137
#, c-format
msgid "Could not open file: %s: %s"
msgstr "KhÃng thá má táp tin: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:744
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-spool-summary.c:152
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "KhÃng thá má háp thÆ tám: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:761
-#: ../camel/providers/local/camel-mbox-summary.c:988
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:918
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "KhÃng thá ÄÃng thÆ mác nguán %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:772
+#: ../camel/providers/local/camel-mbox-summary.c:704
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "KhÃng thá ÄÃng thÆ mác tám: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:789
+#: ../camel/providers/local/camel-mbox-summary.c:721
#, c-format
msgid "Could not rename folder: %s"
msgstr "KhÃng thá Äái tÃn thÆ mác: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1153
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-mbox-summary.c:1084
#, c-format
msgid "Could not store folder: %s"
msgstr "KhÃng thá lÆu thÆ mác: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:925
-#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../camel/providers/local/camel-mbox-summary.c:855
+#: ../camel/providers/local/camel-mbox-summary.c:1115
#, c-format
msgid ""
"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
"it.)"
msgstr "Táp tin MBOX bá hÆ, vui lÃng sáa lái. (Cán dÃng From nhÆng khÃng cÃ)"
-#: ../camel/providers/local/camel-mbox-summary.c:934
-#: ../camel/providers/local/camel-mbox-summary.c:1193
+#: ../camel/providers/local/camel-mbox-summary.c:864
+#: ../camel/providers/local/camel-mbox-summary.c:1124
#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr ""
"Bán tÃm tát và thÆ mác khÃng tÆÆng áng vái nhau, ngay cá sau khi Äáng bá"
-#: ../camel/providers/local/camel-mbox-summary.c:1099
-#: ../camel/providers/local/camel-spool-summary.c:343
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:345
#, c-format
msgid "Unknown error: %s"
msgstr "Lái khÃng rà : %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1263
-#: ../camel/providers/local/camel-mbox-summary.c:1293
+#: ../camel/providers/local/camel-mbox-summary.c:1182
+#: ../camel/providers/local/camel-mbox-summary.c:1212
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "Lái ghi vÃo háp thÆ tám: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1282
+#: ../camel/providers/local/camel-mbox-summary.c:1201
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "Lái ghi vÃo háp thÆ tám: %s: %s"
-#: ../camel/providers/local/camel-mh-folder.c:115
+#: ../camel/providers/local/camel-mh-folder.c:119
#, c-format
-#| msgid "Cannot append message to mh folder: %s: %s"
msgid "Cannot append message to mh folder: %s: "
msgstr "KhÃng thá nái thÆ vÃo ÄuÃi thÆ mác dáng mh: %s: "
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-mh-store.c:535
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "KhÃng thá táo thÆ mác '%s': %s"
-#: ../camel/providers/local/camel-mh-store.c:542
+#: ../camel/providers/local/camel-mh-store.c:551
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "KhÃng thá láy thÆ mác  %s Â: khÃng phái là thÆ mác."
@@ -3975,22 +4049,38 @@ msgstr "KhÃng thá láy thÆ mác  %s Â: khÃng phái là thÆ mác."
msgid "Cannot open MH directory path: %s: %s"
msgstr "KhÃng thá má ÄÆáng dán thÆ mác dáng MH: %s: %s"
-#: ../camel/providers/local/camel-spool-store.c:350
+#: ../camel/providers/local/camel-spool-store.c:94
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "KhÃng thá má hÃng Äái ghi  %s Â: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:108
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "HÃng Äái ghi  %s  khÃng phái là táp tin hay thÆ mác bÃnh thÆáng"
+
+#: ../camel/providers/local/camel-spool-store.c:416
#, c-format
msgid "Spool mail file %s"
msgstr "Táp tin thÆ tÃn hÃng Äái ghi %s"
-#: ../camel/providers/local/camel-spool-store.c:353
+#: ../camel/providers/local/camel-spool-store.c:420
#, c-format
msgid "Spool folder tree %s"
msgstr "CÃy thÆ mác hÃng Äái ghi %s"
-#: ../camel/providers/local/camel-spool-store.c:394
+#: ../camel/providers/local/camel-spool-store.c:423
+#, fuzzy
+#| msgid "Invalid source"
+msgid "Invalid spool"
+msgstr "Nguán khÃng háp lá"
+
+#: ../camel/providers/local/camel-spool-store.c:480
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "ThÆ mác  %s/%s  khÃng tán tái"
-#: ../camel/providers/local/camel-spool-store.c:408
+#: ../camel/providers/local/camel-spool-store.c:493
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3999,12 +4089,12 @@ msgstr ""
"KhÃng thá má thÆ mác  %s Â:\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:414
+#: ../camel/providers/local/camel-spool-store.c:499
#, c-format
msgid "Folder '%s' does not exist."
msgstr "ThÆ mác  %s  khÃng tán tái."
-#: ../camel/providers/local/camel-spool-store.c:421
+#: ../camel/providers/local/camel-spool-store.c:507
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -4013,57 +4103,42 @@ msgstr ""
"KhÃng thá táo thÆ mác  %s Â\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:433
+#: ../camel/providers/local/camel-spool-store.c:520
#, c-format
msgid "'%s' is not a mailbox file."
msgstr " %s  khÃng phái là táp tin háp thÆ."
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../camel/providers/local/camel-spool-store.c:584
#, c-format
msgid "Store does not support an INBOX"
msgstr "Store khÃng há trá háp ThÆ Äán"
-#: ../camel/providers/local/camel-spool-store.c:495
+#: ../camel/providers/local/camel-spool-store.c:603
#, c-format
msgid "Spool folders cannot be deleted"
msgstr "KhÃng thá xoà thÆ mác hÃng Äái ghi"
-#: ../camel/providers/local/camel-spool-store.c:510
+#: ../camel/providers/local/camel-spool-store.c:618
#, c-format
msgid "Spool folders cannot be renamed"
msgstr "KhÃng thá thay Äái tÃn cáa thÆ mác hÃng Äái ghi"
-#: ../camel/providers/local/camel-spool-store.c:583
+#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:192
#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "KhÃng thá má hÃng Äái ghi  %s Â: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:599
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "HÃng Äái ghi  %s  khÃng phái là táp tin hay thÆ mác bÃnh thÆáng"
-
-#: ../camel/providers/local/camel-spool-summary.c:169
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:193
-#, c-format
-#| msgid "Could not sync temporary folder %s: %s"
msgid "Could not synchronize temporary folder %s: %s"
msgstr "KhÃng thá Äáng bá thÆ mác tám %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:211
+#: ../camel/providers/local/camel-spool-summary.c:210
#, c-format
-#| msgid "Could not sync spool folder %s: %s"
msgid "Could not synchronize spool folder %s: %s"
msgstr "KhÃng thá Äáng bá thÆ mác hÃng Äái ghi: %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:243
-#: ../camel/providers/local/camel-spool-summary.c:262
-#: ../camel/providers/local/camel-spool-summary.c:275
+#: ../camel/providers/local/camel-spool-summary.c:242
+#: ../camel/providers/local/camel-spool-summary.c:261
+#: ../camel/providers/local/camel-spool-summary.c:274
#, c-format
-#| msgid ""
-#| "Could not sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in '%s'"
msgid ""
"Could not synchronize spool folder %s: %s\n"
"Folder may be corrupt, copy saved in '%s'"
@@ -4071,79 +4146,77 @@ msgstr ""
"KhÃng thá Äáng bá hoà thÆ mác hÃng Äái ghi %s: %s\n"
"CÃ lá thÆ mác bá hÆ; bán sao ÄÆác lÆu trong '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:213
-#: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/nntp/camel-nntp-folder.c:424
+#: ../camel/providers/nntp/camel-nntp-folder.c:290
+#: ../camel/providers/nntp/camel-nntp-folder.c:379
+#: ../camel/providers/nntp/camel-nntp-folder.c:501
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "Lái nái bá : UID cà Äánh dáng khÃng háp lá: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:263
-#: ../camel/providers/nntp/camel-nntp-folder.c:267
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#: ../camel/providers/nntp/camel-nntp-folder.c:340
+#: ../camel/providers/nntp/camel-nntp-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:611
+#: ../camel/providers/pop3/camel-pop3-folder.c:995
#, c-format
msgid "Cannot get message %s: %s"
msgstr "KhÃng thá láy thÆ %s: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:274
-#: ../camel/providers/nntp/camel-nntp-folder.c:449
-#: ../camel/providers/pop3/camel-pop3-folder.c:368
-#: ../camel/providers/pop3/camel-pop3-folder.c:420
-#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#: ../camel/providers/nntp/camel-nntp-folder.c:351
+#: ../camel/providers/nntp/camel-nntp-folder.c:526
+#: ../camel/providers/pop3/camel-pop3-folder.c:549
+#: ../camel/providers/pop3/camel-pop3-folder.c:601
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
#, c-format
-#| msgid "Cannot get message %s: %s"
msgid "Cannot get message %s: "
msgstr "KhÃng thá láy thÆ %s: "
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
-#: ../camel/providers/nntp/camel-nntp-folder.c:514
-#: ../camel/providers/nntp/camel-nntp-folder.c:561
+#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#: ../camel/providers/nntp/camel-nntp-folder.c:591
+#: ../camel/providers/nntp/camel-nntp-folder.c:638
#, c-format
msgid "Posting failed: %s"
msgstr "Gái thát bái: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:556
-#| msgid "Posting failed: %s"
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
msgid "Posting failed: "
msgstr "Gái thát bái: "
-#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#: ../camel/providers/nntp/camel-nntp-folder.c:662
#, c-format
msgid "You cannot post NNTP messages while working offline!"
msgstr "Bán khÃng thá gái thÆ NNTP (nhÃm tin Máng) khi ngoái tuyán."
-#: ../camel/providers/nntp/camel-nntp-folder.c:605
+#: ../camel/providers/nntp/camel-nntp-folder.c:682
#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "KhÃng thá sao chÃp thÆ tá thÆ mác NNTP (nhÃm tin Máng)."
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
msgid ""
"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
msgstr "_Hián thÆ mác kiáu ngán gán (v.d. c.o.linux thay và comp.os.linux)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:50
msgid "In the subscription _dialog, show relative folder names"
msgstr "Trong háp thoái ÄÄng _kÃ, hián thá tÃn thÆ mác tÆÆng Äái"
-#: ../camel/providers/nntp/camel-nntp-provider.c:52
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
msgid "Default NNTP port"
msgstr "Cáng NNTP mác Äánh"
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
msgid "NNTP over SSL"
msgstr "NNTP qua SSL"
-#: ../camel/providers/nntp/camel-nntp-provider.c:59
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
msgid "USENET news"
msgstr "Tin tác USENET"
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
msgid "This is a provider for reading from and posting to USENET newsgroups."
msgstr "ÄÃy là bá cung cáp Äác tá và gái thÆ tái cÃc nhÃm tin USENET."
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../camel/providers/nntp/camel-nntp-provider.c:86
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
@@ -4151,33 +4224,22 @@ msgstr ""
"TÃy chán nÃy sá xÃc thác vái mÃy phác vá NNTP báng mát kháu thà (khÃng mà "
"hÃa)"
-#: ../camel/providers/nntp/camel-nntp-store.c:97
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "Cán xÃc thác nhÆng khÃng ÄÆác cung cáp tÃn ngÆái dÃng"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:109
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "KhÃng thá xÃc thác vái mÃy phác vá: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:357
+#: ../camel/providers/nntp/camel-nntp-store.c:285
#, c-format
-#| msgid "Could not read greeting from %s: %s"
msgid "Could not read greeting from %s: "
msgstr "KhÃng thá Äác lái chÃo máng tá %s: "
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:297
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "MÃy phác vá NNTP %s trá vá mà lái %d: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:528
+#: ../camel/providers/nntp/camel-nntp-store.c:469
#, c-format
msgid "USENET News via %s"
msgstr "Tin tác USENET thÃng qua %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1060
+#: ../camel/providers/nntp/camel-nntp-store.c:1072
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4188,22 +4250,22 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1153
+#: ../camel/providers/nntp/camel-nntp-store.c:1165
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "Bán khÃng thá táo thÆ mác trong kho tin tác: hÃy ÄÄng kà thay vÃo ÄÃ."
-#: ../camel/providers/nntp/camel-nntp-store.c:1169
+#: ../camel/providers/nntp/camel-nntp-store.c:1181
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "KhÃng thá Äái tÃn thÆ mác trong kho tin tác."
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1204
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "KhÃng thá loái bá thÆ mác trong kho tin tác: hÃy ÄÄng kà thay vÃo ÄÃ."
-#: ../camel/providers/nntp/camel-nntp-store.c:1338
+#: ../camel/providers/nntp/camel-nntp-store.c:1402
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4214,7 +4276,7 @@ msgstr ""
"\n"
"KhÃng cà nhÃm tin nhÆ váy. Mác ÄÆác chán cà lá là thÆ mác má."
-#: ../camel/providers/nntp/camel-nntp-store.c:1389
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4225,71 +4287,68 @@ msgstr ""
"\n"
"KhÃng cà nhÃm tin nhÆ váy!"
-#: ../camel/providers/nntp/camel-nntp-store.c:1582
-#| msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
msgid "NNTP Command failed: "
msgstr "Lái lánh NNTP: "
-#: ../camel/providers/nntp/camel-nntp-store.c:1656
+#: ../camel/providers/nntp/camel-nntp-store.c:1732
#, c-format
msgid "Not connected."
msgstr "ChÆa kát nái."
-#: ../camel/providers/nntp/camel-nntp-summary.c:240
-#: ../camel/providers/nntp/camel-nntp-summary.c:358
+#: ../camel/providers/nntp/camel-nntp-summary.c:195
+#: ../camel/providers/nntp/camel-nntp-summary.c:322
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Äang quÃt tÃm thÆ mái"
-#: ../camel/providers/nntp/camel-nntp-summary.c:256
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "TÃn hiáu trá lái khÃng mong Äái tá xover: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:374
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "TÃn hiáu trá lái khÃng mong Äái tá Äáu (head): %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:419
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
#, c-format
msgid "Operation failed: %s"
msgstr "Thao tÃc thát bái: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:285
-#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:517
#, c-format
msgid "No message with UID %s"
msgstr "KhÃng cà thÆ vái UID %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:352
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
#, c-format
msgid "Retrieving POP message %d"
msgstr "Äang láy thÆ POP %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:432
+#: ../camel/providers/pop3/camel-pop3-folder.c:612
msgid "Unknown reason"
msgstr "KhÃng biát sao"
-#: ../camel/providers/pop3/camel-pop3-folder.c:472
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
msgid "Retrieving POP summary"
msgstr "Äang láy tÃm tát POP"
-#: ../camel/providers/pop3/camel-pop3-folder.c:487
-#| msgid "Cannot get POP summary: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:711
msgid "Cannot get POP summary: "
msgstr "KhÃng thá láy bán tÃm tát POP: "
-#: ../camel/providers/pop3/camel-pop3-folder.c:557
+#: ../camel/providers/pop3/camel-pop3-folder.c:823
msgid "Expunging old messages"
msgstr "Äang xÃa hán cÃc thÆ cÅ"
-#: ../camel/providers/pop3/camel-pop3-folder.c:569
+#: ../camel/providers/pop3/camel-pop3-folder.c:843
msgid "Expunging deleted messages"
msgstr "Äang xÃa hán cÃc thÆ bá xÃa bá"
#: ../camel/providers/pop3/camel-pop3-provider.c:39
-#| msgid "Message storage"
msgid "Message Storage"
msgstr "Kho lÆu thÆ"
@@ -4327,7 +4386,7 @@ msgstr "POP"
msgid "For connecting to and downloading mail from POP servers."
msgstr "Äá kát nái và tái thÆ vá tá mÃy phác vá POP."
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4335,7 +4394,7 @@ msgstr ""
"TÃy chán nÃy sá kát nái tái mÃy phác vá POP dÃng mát kháu thà (khÃng mà "
"hÃa). ÄÃy là tÃy chán duy nhát ÄÆác há trá bái nhiáu mÃy phác vá POP."
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:94
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -4350,67 +4409,52 @@ msgstr ""
msgid ": "
msgstr ": "
-#: ../camel/providers/pop3/camel-pop3-store.c:130
+#: ../camel/providers/pop3/camel-pop3-store.c:136
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "Lái Äác lái chÃo máng háp lá tá mÃy phác vá POP %s."
-#: ../camel/providers/pop3/camel-pop3-store.c:150
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:153
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "Lái kát nái tái mÃy phác vá POP %s trong chá Äá an toÃn: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:151
+#: ../camel/providers/pop3/camel-pop3-store.c:154
msgid "STLS not supported by server"
msgstr "MÃy phác vá khÃng há trá STLS"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:172
#, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
msgid "Failed to connect to POP server %s in secure mode%s"
msgstr "Lái kát nái tái mÃy phác vá POP %s trong chá Äá an toÃn%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:185
#, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
msgid "Failed to connect to POP server %s in secure mode: "
msgstr "Lái kát nái tái mÃy phác vá POP %s trong chá Äá an toÃn: "
-#: ../camel/providers/pop3/camel-pop3-store.c:190
-msgid "TLS is not available in this build"
-msgstr "PhiÃn bán xÃy dáng nÃy khÃng há trá giao thác TLS"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:414
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"KhÃng thá kát nái tái mÃy phác vá POP %s: KhÃng há trá cÆ chá xÃc thác yÃu "
-"cáu."
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:269
-#, c-format
-#| msgid "SASL '%s' Login failed for POP server %s: %s"
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "ÄÄng nháp SASL '%s' thát bái vái mÃy phác vá POP %s%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:286
+#: ../camel/providers/pop3/camel-pop3-store.c:288
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "KhÃng thá ÄÄng nháp vÃo mÃy phác vá POP %s: lái giao thác SASL"
-#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:310
#, c-format
-#| msgid "Failed to authenticate on POP server %s: %s"
msgid "Failed to authenticate on POP server %s: "
msgstr "KhÃng thá xÃc thác tái mÃy phác vá POP %s: "
-#: ../camel/providers/pop3/camel-pop3-store.c:380
+#: ../camel/providers/pop3/camel-pop3-store.c:359
+#, c-format
+msgid "POP3 server %s"
+msgstr "MÃy phác vá POP3 %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:362
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "MÃy chá IMAP cho %s trÃn %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:525
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4420,11 +4464,8 @@ msgstr ""
"háp lá: cà thá bá tán cÃng kiáu máo nhán là ngÆái dÃng háp lá. HÃy liÃn lác "
"vái quán trá."
-#: ../camel/providers/pop3/camel-pop3-store.c:427
+#: ../camel/providers/pop3/camel-pop3-store.c:577
#, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending password: %s"
msgid ""
"Unable to connect to POP server %s.\n"
"Error sending password: "
@@ -4432,12 +4473,10 @@ msgstr ""
"KhÃng thá kát nái tái mÃy phác vá POP %s.\n"
"Lái gái mát kháu: "
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:437
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:592
#, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending username: %s"
msgid ""
"Unable to connect to POP server %s.\n"
"Error sending username%s"
@@ -4445,42 +4484,17 @@ msgstr ""
"KhÃng thá kát nái tái mÃy phác vá POP %s.\n"
"Lái gái tÃn ngÆái dÃng%s"
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending password: %s"
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password%s"
-msgstr ""
-"KhÃng thá kát nái tái mÃy phác vá POP %s.\n"
-"Lái gái mát kháu%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
-#| msgid "IMAP server %s"
-msgid "POP3 server %s"
-msgstr "MÃy phác vá POP3 %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#, c-format
-#| msgid "IMAP service for %s on %s"
-msgid "POP3 server for %s on %s"
-msgstr "MÃy chá IMAP cho %s trÃn %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:650
#, c-format
msgid "Could not connect to POP server %s"
msgstr "KhÃng thá kát nái tái mÃy phác vá POP %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:653
+#: ../camel/providers/pop3/camel-pop3-store.c:678
#, c-format
msgid "No such folder '%s'."
msgstr "KhÃng cà thÆ mác nhÆ váy  %s Â."
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:695
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "Kho POP3 khÃng há trá thÆ mác phÃn cáp"
@@ -4520,22 +4534,21 @@ msgstr "KhÃng thá táo áng dán tái trÃnh sendmail: %s: chÆa gái th
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "KhÃng thá táo tián trÃnh sendmail mái: %s: chÆa gái thÆ"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
-#| msgid "Could not send message: %s"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
msgid "Could not send message: "
msgstr "KhÃng thá gái thÆ: "
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "TrÃnh sendmail ÄÃ thoÃt vái tÃn hiáu %s: chÆa gái thÆ."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "KhÃng thá thác hián %s: chÆa gái thÆ."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "TrÃnh sendmail ÄÃ thoÃt vái tráng thÃi %d: chÆa gái thÆ."
@@ -4545,7 +4558,6 @@ msgid "Default SMTP port"
msgstr "Cáng SMTP mác Äánh"
#: ../camel/providers/smtp/camel-smtp-provider.c:43
-#| msgid "SMTP server %s"
msgid "SMTP over SSL"
msgstr "SMTP qua SSL"
@@ -4562,394 +4574,351 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr ""
"Äá gái thÆ báng cÃch kát nái tái thiát bá trung tÃm máng thÆ tá xa dÃng SMTP."
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
-#| msgid "Welcome response error"
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
msgid "Welcome response error: "
msgstr "Lái hái ÄÃp chÃo máng: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr "KhÃng thá kát nái tái mÃy phác vá SMTP %s trong chá Äá báo mát: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-#| msgid "STARTTLS command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
msgid "STARTTLS command failed: "
msgstr "Lái lánh STARTTLS: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
#, c-format
-#| msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgid "Failed to connect to SMTP server %s in secure mode: "
msgstr "KhÃng thá kát nái tái mÃy phác vá SMTP %s trong chá Äá báo mát: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:283
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
#, c-format
msgid "SMTP server %s"
msgstr "MÃy phác vá SMTP %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "Gái thÆ (SMTP) thÃng qua %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#, fuzzy, c-format
+#| msgid "SMTP server %s does not support requested authentication type %s."
+msgid "SMTP server %s does not support %s authentication"
msgstr "MÃy phác vá SMTP %s khÃng há trá kiáu xÃc thác yÃu cáu %s."
-#: ../camel/providers/smtp/camel-smtp-transport.c:440
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
+msgid "No SASL mechanism was specified"
msgstr ""
-"KhÃng thá xÃc thác vái mÃy phác vá SMTP.\n"
-"%s\n"
-"\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:557
+#: ../camel/providers/smtp/camel-smtp-transport.c:459
+msgid "SMTP Authentication"
+msgstr "XÃc thác SMTP"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:478
+#: ../camel/providers/smtp/camel-smtp-transport.c:489
+#: ../camel/providers/smtp/camel-smtp-transport.c:502
+msgid "AUTH command failed: "
+msgstr "Lái lánh AUTH: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:643
#, c-format
msgid "Cannot send message: service not connected."
msgstr "KhÃng thá gái thÆ: chÆa kát nái dách vá."
-#: ../camel/providers/smtp/camel-smtp-transport.c:564
+#: ../camel/providers/smtp/camel-smtp-transport.c:650
#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "KhÃng thá gái thÆ: Äáa chá ngÆái gái khÃng háp lá."
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
msgid "Sending message"
msgstr "Äang gái thÆ"
-#: ../camel/providers/smtp/camel-smtp-transport.c:593
+#: ../camel/providers/smtp/camel-smtp-transport.c:679
#, c-format
msgid "Cannot send message: no recipients defined."
msgstr "KhÃng thá gái thÆ: chÆa gà ngÆái nhán."
-#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
#, c-format
msgid "Cannot send message: one or more invalid recipients"
msgstr "KhÃng thá gái thÆ: cà mát hoác vÃi ngÆái nhán khÃng háp lá"
-#: ../camel/providers/smtp/camel-smtp-transport.c:709
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
msgid "Syntax error, command unrecognized"
msgstr "Lái cà phÃp, khÃng nhán ra lánh"
-#: ../camel/providers/smtp/camel-smtp-transport.c:711
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
msgid "Syntax error in parameters or arguments"
msgstr "Lái cà phÃp trong tham sá hoác Äái sá"
-#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
msgid "Command not implemented"
msgstr "Lánh chÆa ÄÆác thi cÃng"
-#: ../camel/providers/smtp/camel-smtp-transport.c:715
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
msgid "Command parameter not implemented"
msgstr "Tham sá lánh chÆa ÄÆác thi cÃng"
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
msgid "System status, or system help reply"
msgstr "Tráng thÃi há tháng, hoác trá lái trá giÃp há tháng"
-#: ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
msgid "Help message"
msgstr "ThÆ trá giÃp"
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
msgid "Service ready"
msgstr "Dách vá sán sÃng"
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
msgid "Service closing transmission channel"
msgstr "Dách vá Äang ÄÃng kÃnh truyán"
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
msgid "Service not available, closing transmission channel"
msgstr "Dách vá chÆa sán sÃng, Äang ÄÃng kÃnh truyán thÃng"
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
msgid "Requested mail action okay, completed"
msgstr "HÃnh Äáng thÆ tÃn yÃu cáu ÄÃ xong"
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
msgid "User not local; will forward to <forward-path>"
msgstr "KhÃng phái ngÆái dÃng các bá; Äang chuyán tiáp tái <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "KhÃng thác hián hÃnh Äáng thÆ tÃn yÃu cáu: háp thÆ khÃng sán sÃng"
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
msgid "Requested action not taken: mailbox unavailable"
msgstr "KhÃng thác hián hÃnh Äáng yÃu cáu: háp thÆ khÃng sán sÃng"
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
msgid "Requested action aborted: error in processing"
msgstr "ÄÃ ngáng hÃnh Äáng yÃu cáu: lái khi thác hián"
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
msgid "User not local; please try <forward-path>"
msgstr "KhÃng phái ngÆái dÃng các bá; hÃy thá <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
msgid "Requested action not taken: insufficient system storage"
msgstr "KhÃng thác hián hÃnh Äáng yÃu cáu: khÃng Äá chá cháa"
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "KhÃng thác hián hÃnh Äáng thÆ tÃn yÃu cáu: quà hán sác cháa ÄÆác gÃn"
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
msgid "Requested action not taken: mailbox name not allowed"
msgstr "KhÃng thác hián hÃnh Äáng yÃu cáu: khÃng cho phÃp tÃn háp thÆ áy"
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Bát Äáu gà thÆ; kát thÃc báng <Xuáng dÃng>.<Xuáng dÃng>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
msgid "Transaction failed"
msgstr "Giao dách thát bái"
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
msgid "A password transition is needed"
msgstr "Cán chuyán tiáp mát kháu"
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
msgid "Authentication mechanism is too weak"
msgstr "CÆ chá xÃc thác quà yáu"
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
msgid "Encryption required for requested authentication mechanism"
msgstr "CÆ chá xÃc thác yÃu cáu cán phái ÄÆác mà hoÃ"
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
msgid "Temporary authentication failure"
msgstr "Lái xÃc thác tám"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1008
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
msgid "SMTP Greeting"
msgstr "ChÃo hái cáa SMTP"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1035
-#: ../camel/providers/smtp/camel-smtp-transport.c:1052
-#: ../camel/providers/smtp/camel-smtp-transport.c:1060
-#| msgid "HELO command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1147
msgid "HELO command failed: "
msgstr "Lái lánh HELO: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1129
-msgid "SMTP Authentication"
-msgstr "XÃc thác SMTP"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1148
-#: ../camel/providers/smtp/camel-smtp-transport.c:1159
-#: ../camel/providers/smtp/camel-smtp-transport.c:1172
-#| msgid "AUTH command failed: %s"
-msgid "AUTH command failed: "
-msgstr "Lái lánh AUTH: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1280
-#: ../camel/providers/smtp/camel-smtp-transport.c:1294
-#: ../camel/providers/smtp/camel-smtp-transport.c:1303
-#| msgid "MAIL FROM command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
+#: ../camel/providers/smtp/camel-smtp-transport.c:1236
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
msgid "MAIL FROM command failed: "
msgstr "Lái lánh MAIL FROM: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
msgid "RCPT TO command failed: "
msgstr "Lái lánh RCPT TO: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1346
-#: ../camel/providers/smtp/camel-smtp-transport.c:1355
+#: ../camel/providers/smtp/camel-smtp-transport.c:1288
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
#, c-format
-#| msgid "RCPT TO <%s> failed"
msgid "RCPT TO <%s> failed: "
msgstr "RCPT TO <%s> thát bái: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1397
-#: ../camel/providers/smtp/camel-smtp-transport.c:1407
-#: ../camel/providers/smtp/camel-smtp-transport.c:1417
-#: ../camel/providers/smtp/camel-smtp-transport.c:1476
-#: ../camel/providers/smtp/camel-smtp-transport.c:1495
-#: ../camel/providers/smtp/camel-smtp-transport.c:1508
-#: ../camel/providers/smtp/camel-smtp-transport.c:1516
-#| msgid "DATA command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1349
+#: ../camel/providers/smtp/camel-smtp-transport.c:1359
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
msgid "DATA command failed: "
msgstr "Lái lánh DATA: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1541
-#: ../camel/providers/smtp/camel-smtp-transport.c:1555
-#: ../camel/providers/smtp/camel-smtp-transport.c:1563
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1505
msgid "RSET command failed: "
msgstr "Lái lánh RSET: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1588
-#: ../camel/providers/smtp/camel-smtp-transport.c:1602
-#: ../camel/providers/smtp/camel-smtp-transport.c:1609
-#| msgid "QUIT command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1530
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
msgid "QUIT command failed: "
msgstr "Lái lánh QUIT: "
#: ../libedataserver/e-categories.c:47
-#| msgid "Anniversary"
msgctxt "CategoryName"
msgid "Anniversary"
msgstr "Ká niám"
#: ../libedataserver/e-categories.c:48
-#| msgid "Birthday"
msgctxt "CategoryName"
msgid "Birthday"
msgstr "NgÃy sinh"
#: ../libedataserver/e-categories.c:49
-#| msgid "Business"
msgctxt "CategoryName"
msgid "Business"
msgstr "Kinh doanh"
#: ../libedataserver/e-categories.c:50
-#| msgid "Competition"
msgctxt "CategoryName"
msgid "Competition"
msgstr "Tranh Äua"
#: ../libedataserver/e-categories.c:51
-#| msgid "Favorites"
msgctxt "CategoryName"
msgid "Favorites"
msgstr "Æa thÃch"
#: ../libedataserver/e-categories.c:52
-#| msgid "Gifts"
msgctxt "CategoryName"
msgid "Gifts"
msgstr "QuÃ"
#: ../libedataserver/e-categories.c:53
-#| msgid "Goals/Objectives"
msgctxt "CategoryName"
msgid "Goals/Objectives"
msgstr "ÄÃch/Mác tiÃu"
#: ../libedataserver/e-categories.c:54
-#| msgid "Holiday"
msgctxt "CategoryName"
msgid "Holiday"
msgstr "NgÃy nghá"
#: ../libedataserver/e-categories.c:55
-#| msgid "Holiday Cards"
msgctxt "CategoryName"
msgid "Holiday Cards"
msgstr "Thá ngÃy nghá"
#. important people (e.g. new business partners)
#: ../libedataserver/e-categories.c:57
-#| msgid "Hot Contacts"
msgctxt "CategoryName"
msgid "Hot Contacts"
msgstr "LiÃn lác quan tráng"
#: ../libedataserver/e-categories.c:58
-#| msgid "Ideas"
msgctxt "CategoryName"
msgid "Ideas"
msgstr "Ã tÆáng"
#: ../libedataserver/e-categories.c:59
-#| msgid "International"
msgctxt "CategoryName"
msgid "International"
msgstr "Quác tá"
#: ../libedataserver/e-categories.c:60
-#| msgid "Key Customer"
msgctxt "CategoryName"
msgid "Key Customer"
msgstr "KhÃch hÃng chÃnh"
#: ../libedataserver/e-categories.c:61
-#| msgid "Miscellaneous"
msgctxt "CategoryName"
msgid "Miscellaneous"
msgstr "Linh tinh"
#: ../libedataserver/e-categories.c:62
-#| msgid "Personal"
msgctxt "CategoryName"
msgid "Personal"
msgstr "CÃ nhÃn"
#: ../libedataserver/e-categories.c:63
-#| msgid "Phone Calls"
msgctxt "CategoryName"
msgid "Phone Calls"
msgstr "Äián thoái"
#. Translators: "Status" is a category name; it can mean anything user wants to
#: ../libedataserver/e-categories.c:65
-#| msgid "Status"
msgctxt "CategoryName"
msgid "Status"
msgstr "Tráng thÃi"
#: ../libedataserver/e-categories.c:66
-#| msgid "Strategies"
msgctxt "CategoryName"
msgid "Strategies"
msgstr "Chián lÆác"
#: ../libedataserver/e-categories.c:67
-#| msgid "Suppliers"
msgctxt "CategoryName"
msgid "Suppliers"
msgstr "Nhà cung cáp"
#: ../libedataserver/e-categories.c:68
-#| msgid "Time & Expenses"
msgctxt "CategoryName"
msgid "Time & Expenses"
msgstr "Giá và phá phÃ"
#: ../libedataserver/e-categories.c:69
-#| msgid "VIP"
msgctxt "CategoryName"
msgid "VIP"
msgstr "VIP"
#: ../libedataserver/e-categories.c:70
-#| msgid "Waiting"
msgctxt "CategoryName"
msgid "Waiting"
msgstr "Äang chá"
-#: ../libedataserver/e-client.c:120
-#| msgid "URI not loaded"
+#: ../libedataserver/e-client.c:125
msgid "Source not loaded"
msgstr "Nguán chÆa ÄÆác tái"
-#: ../libedataserver/e-client.c:122
-#| msgid "URI already loaded"
+#: ../libedataserver/e-client.c:127
msgid "Source already loaded"
msgstr "Nguán ÄÃ tái rái"
-#: ../libedataserver/e-client.c:130
-#| msgid "Offline mode unavailable"
+#: ../libedataserver/e-client.c:135
msgid "Offline unavailable"
msgstr "Chá Äá ngoái tuyán khÃng sán sÃng"
-#: ../libedataserver/e-client.c:152
-#| msgid "parse error"
+#: ../libedataserver/e-client.c:157
msgid "D-Bus error"
msgstr "lái D-Bus"
@@ -5081,8 +5050,132 @@ msgstr "%H:%M"
msgid "%I %p"
msgstr "%I %p"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "Proxy type to use"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+"means manual proxy."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "Whether to use http-proxy"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Whether to use proxy for HTTP requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "Whether proxy server requires authentication"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+#, fuzzy
+#| msgid "Bad authentication response from server."
+msgid "Whether authentication is required to access proxy server."
+msgstr "Trá lái xÃc thác sai tá mÃy phác vá."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "Host name for HTTP requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "Host name to use for HTTP requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "Port number for HTTP requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Port number to use for HTTP requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+#, fuzzy
+#| msgid "Cannot authenticate user: "
+msgid "Proxy authentication user name"
+msgstr "KhÃng thá xÃc thác ngÆái dÃng: "
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+#, fuzzy
+#| msgid ""
+#| "Unable to authenticate to IMAP server.\n"
+#| "%s\n"
+#| "\n"
+msgid "User name to use to authenticate against proxy server."
+msgstr ""
+"KhÃng thá xÃc thác vái mÃy phác vá IMAP.\n"
+"%s\n"
+"\n"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+#, fuzzy
+#| msgid "Temporary authentication failure"
+msgid "Proxy authentication password"
+msgstr "Lái xÃc thác tám"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+#, fuzzy
+#| msgid "Cannot authenticate to server: %s"
+msgid "Password to use to authenticate against proxy server."
+msgstr "KhÃng thá xÃc thác vái mÃy phác vá: %s"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
+msgid "List of hosts to connect to without proxy"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
+msgid "List of hosts for which do not use proxy."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
+msgid "Host name for HTTPS requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
+msgid "Host name to use for HTTPS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
+msgid "Port number for HTTPS requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
+msgid "Port number to use for HTTPS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
+#, fuzzy
+#| msgid "Host is unreachable from SOCKS server"
+msgid "Host name for SOCKS requests"
+msgstr "KhÃng thá tiáp cán mÃy chá SOCKS"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
+msgid "Host name to use for SOCKS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
+msgid "Port number for SOCKS requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
+msgid "Port number to use for SOCKS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
+msgid "Automatic proxy configuration URL"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
+msgid "Where to read automatic proxy configuration from."
+msgstr ""
+
#: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:662
+#: ../libedataserverui/e-book-auth-util.c:656
msgid "Accessing LDAP Server anonymously"
msgstr "Truy cáp và danh tái mÃy phác vá LDAP"
@@ -5091,48 +5184,48 @@ msgstr "Truy cáp và danh tái mÃy phác vá LDAP"
msgid "Failed to authenticate.\n"
msgstr "Lái xÃc thác.\n"
-#: ../libedataserverui/e-categories-editor.c:221
+#: ../libedataserverui/e-categories-editor.c:228
msgid "Currently _used categories:"
msgstr "PhÃn loái hián Äang _dÃng:"
-#: ../libedataserverui/e-categories-editor.c:230
+#: ../libedataserverui/e-categories-editor.c:237
msgid "_Available Categories:"
msgstr "Loái _sán sáng:"
-#: ../libedataserverui/e-categories-selector.c:320
+#: ../libedataserverui/e-categories-selector.c:322
msgid "Icon"
msgstr "Biáu tÆáng"
-#: ../libedataserverui/e-categories-selector.c:325
+#: ../libedataserverui/e-categories-selector.c:327
msgid "Category"
msgstr "Loái:"
-#: ../libedataserverui/e-category-completion.c:294
+#: ../libedataserverui/e-category-completion.c:299
#, c-format
msgid "Create category \"%s\""
msgstr "Táo loái  %s Â"
-#: ../libedataserverui/e-category-editor.c:132
+#: ../libedataserverui/e-category-editor.c:135
msgid "Category Icon"
msgstr "Biáu tÆáng loái"
-#: ../libedataserverui/e-category-editor.c:136
+#: ../libedataserverui/e-category-editor.c:139
msgid "_No Image"
msgstr "_KhÃng ánh"
-#: ../libedataserverui/e-category-editor.c:173
+#: ../libedataserverui/e-category-editor.c:176
msgid "Category _Name"
msgstr "TÃ_n loái"
-#: ../libedataserverui/e-category-editor.c:181
+#: ../libedataserverui/e-category-editor.c:184
msgid "Category _Icon"
msgstr "_Biáu tÆáng loái"
-#: ../libedataserverui/e-category-editor.c:221
+#: ../libedataserverui/e-category-editor.c:224
msgid "Category Properties"
msgstr "Thuác tÃnh loái"
-#: ../libedataserverui/e-category-editor.c:282
+#: ../libedataserverui/e-category-editor.c:285
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
@@ -5141,7 +5234,6 @@ msgstr "Loái  %s  Äà cà trong cáu hÃnh. HÃy sá dáng tÃn khÃc.
#: ../libedataserverui/e-client-utils.c:856
#, c-format
-#| msgid "Enter password for %s (user %s)"
msgid ""
"Enter password for calendar %s (user %s)\n"
"Reason: %s"
@@ -5151,13 +5243,11 @@ msgstr ""
#: ../libedataserverui/e-client-utils.c:858
#, c-format
-#| msgid "Enter password for %s (user %s)"
msgid "Enter password for calendar %s (user %s)"
msgstr "HÃy nháp mát kháu cho lách %s (ngÆái dÃng %s)"
#: ../libedataserverui/e-client-utils.c:862
#, c-format
-#| msgid "Enter password for %s (user %s)"
msgid ""
"Enter password for task list %s (user %s)\n"
"Reason: %s"
@@ -5167,13 +5257,11 @@ msgstr ""
#: ../libedataserverui/e-client-utils.c:864
#, c-format
-#| msgid "Enter password for %s (user %s)"
msgid "Enter password for task list %s (user %s)"
msgstr "HÃy nháp mát kháu cho danh sÃch tÃc vá %s (ngÆái dÃng %s)"
#: ../libedataserverui/e-client-utils.c:868
#, c-format
-#| msgid "Enter password for %s (user %s)"
msgid ""
"Enter password for memo list %s (user %s)\n"
"Reason: %s"
@@ -5183,118 +5271,96 @@ msgstr ""
#: ../libedataserverui/e-client-utils.c:870
#, c-format
-#| msgid "Enter password for %s (user %s)"
msgid "Enter password for memo list %s (user %s)"
msgstr "HÃy nháp mát kháu cho danh sÃch ghi nhá %s (ngÆái dÃng %s)"
-#: ../libedataserverui/e-client-utils.c:875
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"HÃy nháp mát kháu cho sá Äáa chá %s (ngÆái dÃng %s)\n"
-"NguyÃn nhÃn: %s"
-
-#: ../libedataserverui/e-client-utils.c:877
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for address book %s (user %s)"
-msgstr "HÃy nháp mát kháu cho sá Äáa chá %s (ngÆái dÃng %s)"
-
#: ../libedataserverui/e-client-utils.c:981
-#| msgid "Enter password"
msgid "Enter Passphrase"
msgstr "Nháp mát kháu"
#: ../libedataserverui/e-client-utils.c:983
-#| msgid "Enter password"
msgid "Enter Password"
msgstr "Nháp mát kháu"
-#: ../libedataserverui/e-name-selector-dialog.c:184
-#| msgid "Hot Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:187
msgid "Show Contacts"
msgstr "Hián liÃn lác"
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:209
msgid "Address B_ook:"
msgstr "_Sá Äáa chá:"
-#: ../libedataserverui/e-name-selector-dialog.c:214
+#: ../libedataserverui/e-name-selector-dialog.c:217
msgid "Cate_gory:"
msgstr "L_oái:"
-#: ../libedataserverui/e-name-selector-dialog.c:232
+#: ../libedataserverui/e-name-selector-dialog.c:235
msgid "_Search:"
msgstr "_TÃm:"
-#: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1035
+#: ../libedataserverui/e-name-selector-dialog.c:253
+#: ../libedataserverui/e-name-selector-dialog.c:1038
msgid "Any Category"
msgstr "Bát ká Loái"
-#: ../libedataserverui/e-name-selector-dialog.c:252
-#| msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:255
msgid "Co_ntacts"
msgstr "_LiÃn lác"
-#: ../libedataserverui/e-name-selector-dialog.c:307
+#: ../libedataserverui/e-name-selector-dialog.c:310
msgid "Search"
msgstr "TÃm"
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:313
msgid "Address Book"
msgstr "Sá Äáa chá:"
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:316
msgid "Contacts"
msgstr "LiÃn lác"
-#: ../libedataserverui/e-name-selector-dialog.c:430
+#: ../libedataserverui/e-name-selector-dialog.c:433
msgid "Select Contacts from Address Book"
msgstr "Chán liÃn lác tá sá Äáa chá"
-#: ../libedataserverui/e-name-selector-dialog.c:778
+#: ../libedataserverui/e-name-selector-dialog.c:781
msgid "_Add"
msgstr "T_hÃm"
-#: ../libedataserverui/e-name-selector-dialog.c:782
+#: ../libedataserverui/e-name-selector-dialog.c:785
msgid "_Remove"
msgstr "_Loái bá"
-#: ../libedataserverui/e-name-selector-dialog.c:954
+#: ../libedataserverui/e-name-selector-dialog.c:957
#, c-format
-#| msgid "Error reading mail file: %s"
msgid "Error loading address book: %s"
msgstr "Lái náp sá Äáa chá: %s"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2816
+#: ../libedataserverui/e-name-selector-entry.c:2823
#, c-format
msgid "E_xpand %s Inline"
msgstr "Má _ráng %s trác tiáp"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2831
+#: ../libedataserverui/e-name-selector-entry.c:2838
#, c-format
msgid "Cop_y %s"
msgstr "ChÃ_p %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2841
+#: ../libedataserverui/e-name-selector-entry.c:2848
#, c-format
msgid "C_ut %s"
msgstr "Cá_t %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2858
+#: ../libedataserverui/e-name-selector-entry.c:2865
#, c-format
msgid "_Edit %s"
msgstr "_Sáa %s"
-#: ../libedataserverui/e-name-selector-list.c:520
+#: ../libedataserverui/e-name-selector-list.c:524
#, c-format
msgid "_Delete %s"
msgstr "_XÃa bá %s"
@@ -5330,14 +5396,115 @@ msgid "_Remember this password for the remainder of this session"
msgstr "_Nhá mát kháu nÃy trong khi phiÃn nÃy"
#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:99
+#: ../libedataserverui/e-source-selector-dialog.c:91
msgid "Select destination"
msgstr "Chán ÄÃch"
-#: ../libedataserverui/e-source-selector-dialog.c:174
+#: ../libedataserverui/e-source-selector-dialog.c:166
msgid "_Destination"
msgstr "ÄÃ_ch"
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+msgid "Keep running after the last client is closed"
+msgstr ""
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+msgid "Wait running until at least one client is connected"
+msgstr ""
+
+#~| msgid "Invalid server URI"
+#~ msgid "Invalid URI"
+#~ msgstr "URI khÃng háp lá"
+
+#~ msgid "No backend factory for '%s' of '%s'"
+#~ msgstr "KhÃng cà bá táo háu phÆÆng cho '%s' cáa '%s'"
+
+#~| msgid "Could not create cache file"
+#~ msgid "Could not instantiate backend"
+#~ msgstr "KhÃng thá táo háu phÆÆng"
+
+#~ msgid "Could not connect to %s: %s"
+#~ msgstr "KhÃng thá kát nái tái %s: %s"
+
+#~ msgid "SSL unavailable"
+#~ msgstr "KhÃng cà SSL"
+
+#~| msgid "URL '%s' needs a username component"
+#~ msgid "URL '%s' needs a user component"
+#~ msgstr "URL '%s' cán tÃn ngÆái dÃng"
+
+#~ msgid "URL '%s' needs a host component"
+#~ msgstr "URL '%s' cán phán mÃy phác vá"
+
+#~ msgid "URL '%s' needs a path component"
+#~ msgstr "URL '%s' cán phán ÄÆáng dán"
+
+#~ msgid ""
+#~ "SSL Certificate check for %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept?"
+#~ msgstr ""
+#~ "Kiám tra cháng nhán SSL cho %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Bán cà muán cháp nhán khÃng?"
+
+#~ msgid "Check new messages for Jun_k contents"
+#~ msgstr "_Kiám tra thÆ mái tÃm nái dung rÃc"
+
+#~ msgid "SSL is not available in this build"
+#~ msgstr "PhiÃn bán xÃy dáng nÃy khÃng há trá giao thác SSL"
+
+#~ msgid "Error creating SASL authentication object."
+#~ msgstr "Lái táo Äái tÆáng xÃc thác SASL."
+
+#~ msgid "You did not enter a password."
+#~ msgstr "Bán chÆa nháp mát kháu."
+
+#~ msgid "Use I_dle if the server supports it"
+#~ msgstr "DÃng I_dle náu mÃy chá há trá"
+
+#~ msgid "Authentication requested but no username provided"
+#~ msgstr "Cán xÃc thác nhÆng khÃng ÄÆác cung cáp tÃn ngÆái dÃng"
+
+#~ msgid "TLS is not available in this build"
+#~ msgstr "PhiÃn bán xÃy dáng nÃy khÃng há trá giao thác TLS"
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s: No support for requested "
+#~ "authentication mechanism."
+#~ msgstr ""
+#~ "KhÃng thá kát nái tái mÃy phác vá POP %s: KhÃng há trá cÆ chá xÃc thác "
+#~ "yÃu cáu."
+
+#~| msgid "SASL '%s' Login failed for POP server %s: %s"
+#~ msgid "SASL '%s' Login failed for POP server %s%s"
+#~ msgstr "ÄÄng nháp SASL '%s' thát bái vái mÃy phác vá POP %s%s"
+
+#~| msgid ""
+#~| "Unable to connect to POP server %s.\n"
+#~| "Error sending password: %s"
+#~ msgid ""
+#~ "Unable to connect to POP server %s.\n"
+#~ "Error sending password%s"
+#~ msgstr ""
+#~ "KhÃng thá kát nái tái mÃy phác vá POP %s.\n"
+#~ "Lái gái mát kháu%s"
+
+#~ msgid ""
+#~ "Unable to authenticate to SMTP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "KhÃng thá xÃc thác vái mÃy phác vá SMTP.\n"
+#~ "%s\n"
+#~ "\n"
+
#~ msgid "Updating contacts cache (%d)... "
#~ msgstr "Äang cáp nhát bá nhá tám liÃn lác (%d)... "
@@ -5386,9 +5553,6 @@ msgstr "ÄÃ_ch"
#~ msgid "Calendar"
#~ msgstr "Lách"
-#~ msgid "Verifying message"
-#~ msgstr "Äang xÃc minh thÆ"
-
#~ msgid "Cannot open message"
#~ msgstr "KhÃng thá má thÆ"
@@ -5553,9 +5717,6 @@ msgstr "ÄÃ_ch"
#~ msgid "AKID/Issuer serial mismatch"
#~ msgstr "KhÃng kháp AKID/Nhà phÃt hÃnh"
-#~ msgid "Key usage does not support certificate signing"
-#~ msgstr "CÃch sá dáng khÃa khÃng há trá kà cháng nhán"
-
#~ msgid "Error in application verification"
#~ msgstr "Gáp lái khi thám tra áng dáng"
@@ -5796,9 +5957,6 @@ msgstr "ÄÃ_ch"
#~ msgstr ""
#~ "KhÃng thá sao chÃp thÆ tá thÆ mác  %s  sang thÆ mác  %s Â: lánh sai"
-#~ msgid "Check new messages for _Junk contents"
-#~ msgstr "Kiám tra thÆ mái tÃm nái dung _rÃc"
-
#~ msgid "Only check for Junk messa_ges in the INBOX folder"
#~ msgstr "Chá kiám tra tÃm thÆ rÃc trong thÆ mác Háp nhán"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
