[glib] po/vi: import from Damned Lies



commit f5aad13d8f1fe4fccf128105f9ab50f2e73f7737
Author: Nguyán ThÃi Ngác Duy <pclouds gmail com>
Date:   Sat Mar 3 22:35:16 2012 +0700

    po/vi: import from Damned Lies

 po/vi.po | 1134 ++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 669 insertions(+), 465 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index dcfa2d6..c07b7f7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: glib 2.19.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-19 15:34+0000\n"
-"PO-Revision-Date: 2012-01-06 16:57+0700\n"
+"POT-Creation-Date: 2012-03-01 19:09+0000\n"
+"PO-Revision-Date: 2012-03-03 22:35+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"
@@ -23,19 +23,19 @@ msgstr ""
 #: ../gio/gbufferedinputstream.c:411 ../gio/gbufferedinputstream.c:492
 #: ../gio/ginputstream.c:185 ../gio/ginputstream.c:317
 #: ../gio/ginputstream.c:556 ../gio/ginputstream.c:680
-#: ../gio/goutputstream.c:201 ../gio/goutputstream.c:751
+#: ../gio/goutputstream.c:203 ../gio/goutputstream.c:753
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr "Già trá Äám quà lán ÄÆác gái cho %s"
 
-#: ../gio/gbufferedinputstream.c:881 ../gio/ginputstream.c:888
-#: ../gio/giostream.c:292 ../gio/goutputstream.c:1226
+#: ../gio/gbufferedinputstream.c:882 ../gio/ginputstream.c:888
+#: ../gio/giostream.c:292 ../gio/goutputstream.c:1228
 msgid "Stream is already closed"
 msgstr "Luáng ÄÃ bá ÄÃng"
 
-#: ../gio/gcancellable.c:318 ../gio/gdbusconnection.c:1839
-#: ../gio/gdbusconnection.c:1930 ../gio/gdbusconnection.c:2104
-#: ../gio/gdbusprivate.c:1419 ../gio/glocalfile.c:2100
+#: ../gio/gcancellable.c:318 ../gio/gdbusconnection.c:1834
+#: ../gio/gdbusconnection.c:1925 ../gio/gdbusconnection.c:2099
+#: ../gio/gdbusprivate.c:1413 ../gio/glocalfile.c:2133
 #: ../gio/gsimpleasyncresult.c:810 ../gio/gsimpleasyncresult.c:836
 #, c-format
 msgid "Operation was cancelled"
@@ -54,30 +54,30 @@ msgid "Not enough space in destination"
 msgstr "KhÃng Äá khÃng gian trong ÄÃch Äán"
 
 #: ../gio/gcharsetconverter.c:345 ../gio/gdatainputstream.c:854
-#: ../gio/gdatainputstream.c:1291 ../glib/gconvert.c:767
-#: ../glib/gconvert.c:1159 ../glib/giochannel.c:1583 ../glib/giochannel.c:1625
-#: ../glib/giochannel.c:2468 ../glib/gutf8.c:839 ../glib/gutf8.c:1290
+#: ../gio/gdatainputstream.c:1294 ../glib/gconvert.c:768
+#: ../glib/gconvert.c:1160 ../glib/giochannel.c:1583 ../glib/giochannel.c:1625
+#: ../glib/giochannel.c:2468 ../glib/gutf8.c:841 ../glib/gutf8.c:1292
 msgid "Invalid byte sequence in conversion input"
 msgstr "Byte sequence khÃng háp lá trong phán nháp chuyán Äái"
 
-#: ../gio/gcharsetconverter.c:350 ../glib/gconvert.c:775
-#: ../glib/gconvert.c:1084 ../glib/giochannel.c:1590 ../glib/giochannel.c:2480
+#: ../gio/gcharsetconverter.c:350 ../glib/gconvert.c:776
+#: ../glib/gconvert.c:1085 ../glib/giochannel.c:1590 ../glib/giochannel.c:2480
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Lái khi chuyán Äái: %s"
 
-#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:856
+#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:954
 msgid "Cancellable initialization not supported"
 msgstr "KhÃng há trá thao tÃc khái Äáng cà thá huá bá"
 
-#: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:567
-#: ../glib/gconvert.c:645 ../glib/giochannel.c:1411
+#: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:568
+#: ../glib/gconvert.c:646 ../glib/giochannel.c:1411
 #, c-format
 msgid "Conversion from character set '%s' to '%s' is not supported"
 msgstr "KhÃng há trá  viác chuyán tá Äát kà tá '%s' thÃnh '%s'"
 
-#: ../gio/gcharsetconverter.c:462 ../glib/gconvert.c:571
-#: ../glib/gconvert.c:649
+#: ../gio/gcharsetconverter.c:462 ../glib/gconvert.c:572
+#: ../glib/gconvert.c:650
 #, c-format
 msgid "Could not open converter from '%s' to '%s'"
 msgstr "KhÃng thá má trÃnh chuyán Äái tá '%s' sang '%s'"
@@ -243,7 +243,7 @@ msgstr ""
 "KhÃng thá xÃc Äánh Äáa chá tuyán phiÃn lÃm viác (chÆa ÄÆác há trá trÃn há "
 "Äiáu hÃnh nÃy)"
 
-#: ../gio/gdbusaddress.c:1254 ../gio/gdbusconnection.c:6693
+#: ../gio/gdbusaddress.c:1254 ../gio/gdbusconnection.c:6688
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -252,7 +252,7 @@ msgstr ""
 "KhÃng thá xÃc Äánh Äáa chá tuyán tá bián mÃi trÆáng DBUS_STARTER_BUS_TYPE - "
 "già trá lá `%s'"
 
-#: ../gio/gdbusaddress.c:1263 ../gio/gdbusconnection.c:6702
+#: ../gio/gdbusaddress.c:1263 ../gio/gdbusconnection.c:6697
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -265,27 +265,26 @@ msgstr ""
 msgid "Unknown bus type %d"
 msgstr "KhÃng rà kiáu tuyán %d"
 
-#: ../gio/gdbusauth.c:288
+#: ../gio/gdbusauth.c:287
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Nái dung bá thiáu bát thÆáng khi Äác mát dÃng"
 
-#: ../gio/gdbusauth.c:332
+#: ../gio/gdbusauth.c:331
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr "Nái dung bá thiáu bát thÆáng khi Äác (an toÃn) mát dÃng"
 
-#: ../gio/gdbusauth.c:503
+#: ../gio/gdbusauth.c:502
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
 msgstr "Cán kiát cÃc phÆÆng thác xÃc thác hián cà (thá: %s) (cÃn: %s)"
 
-#: ../gio/gdbusauth.c:1159
+#: ../gio/gdbusauth.c:1158
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "ÄÃ huá thÃng qua GDBusAuthObserver::authorize-authenticated-peer"
 
 #: ../gio/gdbusauthmechanismsha1.c:266
 #, c-format
-#| msgid "Error statting directory `%s': %s"
 msgid "Error when getting information for directory `%s': %s"
 msgstr "Gáp lái khi láy thÃng tin thÆ mác '%s': %s"
 
@@ -359,20 +358,20 @@ msgstr "Gáp lái khi má keyring '%s' Äá ghi: "
 msgid "(Additionally, releasing the lock for `%s' also failed: %s) "
 msgstr "(NgoÃi ra, giái phÃng khoà cho `%s' cÅng thát bái: %s)"
 
-#: ../gio/gdbusconnection.c:594 ../gio/gdbusconnection.c:2407
+#: ../gio/gdbusconnection.c:594 ../gio/gdbusconnection.c:2402
 msgid "The connection is closed"
 msgstr "Kát nái ÄÃ ÄÃng"
 
-#: ../gio/gdbusconnection.c:1884
+#: ../gio/gdbusconnection.c:1879
 msgid "Timeout was reached"
 msgstr "Quà hán"
 
-#: ../gio/gdbusconnection.c:2529
+#: ../gio/gdbusconnection.c:2524
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr "PhÃt hián cá khÃng há trá khi táo kát nái phÃa client"
 
-#: ../gio/gdbusconnection.c:4031 ../gio/gdbusconnection.c:4347
+#: ../gio/gdbusconnection.c:4026 ../gio/gdbusconnection.c:4342
 #, c-format
 msgid ""
 "No such interface `org.freedesktop.DBus.Properties' on object at path %s"
@@ -380,66 +379,66 @@ msgstr ""
 "KhÃng cà giao dián `org.freedesktop.DBus.Properties' trÃn Äái tÆáng tái "
 "ÄÆáng dán %s"
 
-#: ../gio/gdbusconnection.c:4102
+#: ../gio/gdbusconnection.c:4097
 #, c-format
 msgid "Error setting property `%s': Expected type `%s' but got `%s'"
 msgstr "Lái Äát thuác tÃnh `%s': nhán ÄÆác `%s' trong khi lá ra phái là `%s'"
 
-#: ../gio/gdbusconnection.c:4197
+#: ../gio/gdbusconnection.c:4192
 #, c-format
 msgid "No such property `%s'"
 msgstr "KhÃng cà thuác tÃnh `%s'"
 
-#: ../gio/gdbusconnection.c:4209
+#: ../gio/gdbusconnection.c:4204
 #, c-format
 msgid "Property `%s' is not readable"
 msgstr "Thuác tÃnh `%s' khÃng Äác ÄÆác"
 
-#: ../gio/gdbusconnection.c:4220
+#: ../gio/gdbusconnection.c:4215
 #, c-format
 msgid "Property `%s' is not writable"
 msgstr "Thuác tÃnh `%s' khÃng ghi ÄÆác"
 
-#: ../gio/gdbusconnection.c:4290 ../gio/gdbusconnection.c:6136
+#: ../gio/gdbusconnection.c:4285 ../gio/gdbusconnection.c:6131
 #, c-format
 msgid "No such interface `%s'"
 msgstr "KhÃng cà giao dián `%s'"
 
-#: ../gio/gdbusconnection.c:4474
+#: ../gio/gdbusconnection.c:4469
 msgid "No such interface"
 msgstr "KhÃng cà giao dián nhÆ váy"
 
-#: ../gio/gdbusconnection.c:4695 ../gio/gdbusconnection.c:6642
+#: ../gio/gdbusconnection.c:4690 ../gio/gdbusconnection.c:6637
 #, c-format
 msgid "No such interface `%s' on object at path %s"
 msgstr "KhÃng cà giao dián `%s' trÃn Äái tÆáng tái ÄÆáng dán %s"
 
-#: ../gio/gdbusconnection.c:4747
+#: ../gio/gdbusconnection.c:4742
 #, c-format
 msgid "No such method `%s'"
 msgstr "KhÃng cà phÆÆng thác `%s'"
 
-#: ../gio/gdbusconnection.c:4778
+#: ../gio/gdbusconnection.c:4773
 #, c-format
 msgid "Type of message, `%s', does not match expected type `%s'"
 msgstr "Kiáu thÃng Äiáp, `%s', khÃng kháp vái kiáu Äang cán `%s'"
 
-#: ../gio/gdbusconnection.c:4998
+#: ../gio/gdbusconnection.c:4993
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "Äái tÆáng ÄÃ ÄÆác xuát cho giao dián %s tái %s rái"
 
-#: ../gio/gdbusconnection.c:5196
+#: ../gio/gdbusconnection.c:5191
 #, c-format
 msgid "Method `%s' returned type `%s', but expected `%s'"
 msgstr "PhÆÆng thác `%s' trá vá kiáu `%s', nhÆng Äang muán `%s'"
 
-#: ../gio/gdbusconnection.c:6247
+#: ../gio/gdbusconnection.c:6242
 #, c-format
 msgid "Method `%s' on interface `%s' with signature `%s' does not exist"
 msgstr "PhÆÆng thác `%s' trÃn giao dián `%s' vái kà hiáu `%s' khÃng tán tái"
 
-#: ../gio/gdbusconnection.c:6366
+#: ../gio/gdbusconnection.c:6361
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "CÃy con ÄÃ ÄÆác xuát cho %s"
@@ -578,7 +577,7 @@ msgid ""
 "Error serializing GVariant with type string `%s' to the D-Bus wire format"
 msgstr "Lái tuán tá hoà GVariant vái kiáu chuái `%s' sang Äánh dáng D-Bus"
 
-#: ../gio/gdbusmessage.c:2303
+#: ../gio/gdbusmessage.c:2304
 #, c-format
 msgid ""
 "Message has %d file descriptors but the header field indicates %d file "
@@ -586,52 +585,51 @@ msgid ""
 msgstr ""
 "ThÃng Äiáp cà %d bá mà tá táp tin nhÆng header chá ra %d bá mà tá táp tin"
 
-#: ../gio/gdbusmessage.c:2311
+#: ../gio/gdbusmessage.c:2312
 msgid "Cannot serialize message: "
 msgstr "KhÃng thá tuán tá hoà thÃng Äiáp: "
 
-#: ../gio/gdbusmessage.c:2355
+#: ../gio/gdbusmessage.c:2356
 #, c-format
 msgid "Message body has signature `%s' but there is no signature header"
 msgstr "Phán thÃn thÃng Äiáp cà kà hiáu `%s' nhÆng khÃng cà header kà hiáu"
 
-#: ../gio/gdbusmessage.c:2365
+#: ../gio/gdbusmessage.c:2366
 #, c-format
 msgid ""
 "Message body has type signature `%s' but signature in the header field is `"
 "%s'"
 msgstr "Phán thÃn thÃng Äiáp cà kà hiáu `%s' nhÆng header lái cà kà hiáu `%s'"
 
-#: ../gio/gdbusmessage.c:2381
+#: ../gio/gdbusmessage.c:2382
 #, c-format
 msgid "Message body is empty but signature in the header field is `(%s)'"
 msgstr "ThÃn thÃng Äiáp tráng ráng nhÆ kà hiáu trong header là `(%s)'"
 
-#: ../gio/gdbusmessage.c:2938
+#: ../gio/gdbusmessage.c:2939
 #, c-format
 msgid "Error return with body of type `%s'"
 msgstr "Lái tra á thÃn cáa kiáu `%s'"
 
-#: ../gio/gdbusmessage.c:2946
+#: ../gio/gdbusmessage.c:2947
 msgid "Error return with empty body"
 msgstr "Lái trá vá thÃn tráng ráng"
 
-#: ../gio/gdbusprivate.c:2071
-#| msgid "Unable to load /var/lib/dbus/machine-id: "
+#: ../gio/gdbusprivate.c:2065
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr "KhÃng thá náp /var/lib/dbus/machine-id hoác /etc/machine-id: "
 
-#: ../gio/gdbusproxy.c:1529
+#: ../gio/gdbusproxy.c:1624
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Lái gái StartServiceByName cho %s: "
 
-#: ../gio/gdbusproxy.c:1550
+#: ../gio/gdbusproxy.c:1645
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Trá lái %d khÃng mong Äái tá hÃm StartServiceByName(\"%s)"
 
-#: ../gio/gdbusproxy.c:2631 ../gio/gdbusproxy.c:2765
+#: ../gio/gdbusproxy.c:2726 ../gio/gdbusproxy.c:2860
 msgid ""
 "Cannot invoke method; proxy is for a well-known name without an owner and "
 "proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
@@ -652,12 +650,12 @@ msgstr "KhÃng thá xÃc Äánh nonce-file khi táo mÃy chá"
 msgid "Error writing nonce file at `%s': %s"
 msgstr "Lái ghi nonce-file tái `%s': %s"
 
-#: ../gio/gdbusserver.c:1039
+#: ../gio/gdbusserver.c:1038
 #, c-format
 msgid "The string `%s' is not a valid D-Bus GUID"
 msgstr "Chuái '%s' khÃng phái là D-BUS GUID háp lá"
 
-#: ../gio/gdbusserver.c:1079
+#: ../gio/gdbusserver.c:1078
 #, c-format
 msgid "Cannot listen on unsupported transport `%s'"
 msgstr "KhÃng thá listen trÃn phÆÆng thác ván chuyán khÃng há trá `%s'"
@@ -900,26 +898,26 @@ msgstr "Táp tin Desktop khÃng ghi rà trÆáng Exec (thác hián)"
 msgid "Unable to find terminal required for application"
 msgstr "KhÃng tÃm tháy thiát bá cuái cán thiát cho áng dáng"
 
-#: ../gio/gdesktopappinfo.c:1561
+#: ../gio/gdesktopappinfo.c:1563
 #, c-format
 msgid "Can't create user application configuration folder %s: %s"
 msgstr "KhÃng thá táo thÆ mác cáu hÃnh áng dáng ngÆái dÃng %s: %s"
 
-#: ../gio/gdesktopappinfo.c:1565
+#: ../gio/gdesktopappinfo.c:1567
 #, c-format
 msgid "Can't create user MIME configuration folder %s: %s"
 msgstr "KhÃng thá táo thÆ mác cáu hÃnh MIME ngÆái dÃng %s: %s"
 
-#: ../gio/gdesktopappinfo.c:1805 ../gio/gdesktopappinfo.c:1829
+#: ../gio/gdesktopappinfo.c:1807 ../gio/gdesktopappinfo.c:1831
 msgid "Application information lacks an identifier"
 msgstr "ThÃng tin áng dáng thiáu Äánh danh"
 
-#: ../gio/gdesktopappinfo.c:2053
+#: ../gio/gdesktopappinfo.c:2055
 #, c-format
 msgid "Can't create user desktop file %s"
 msgstr "KhÃng thá táo táp tin desktop %s"
 
-#: ../gio/gdesktopappinfo.c:2169
+#: ../gio/gdesktopappinfo.c:2171
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Lái Äánh nghÄa riÃng cho %s"
@@ -963,17 +961,17 @@ msgstr "KhÃng thá quán là phiÃn bán %d cáa báng mà GEmblem"
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "Báng mà GEmblem cháa sá cÃc hiáu bÃi dáng sai (%d)"
 
-#: ../gio/gemblemedicon.c:368
+#: ../gio/gemblemedicon.c:367
 #, c-format
 msgid "Can't handle version %d of GEmblemedIcon encoding"
 msgstr "KhÃng thá quán là phiÃn bán %d cáa báng mà GEmblemedIcon"
 
-#: ../gio/gemblemedicon.c:378
+#: ../gio/gemblemedicon.c:377
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "Báng mà GEmblemedIcon cháa sá cÃc hiáu bÃi dáng sai (%d)"
 
-#: ../gio/gemblemedicon.c:401
+#: ../gio/gemblemedicon.c:400
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "Mong Äái mát GEmblem cho GEmblemedIcon"
 
@@ -998,12 +996,12 @@ msgstr "Thao tÃc khÃng ÄÆác há trá"
 #. Translators: This is an error message when trying to find
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
-#: ../gio/gfile.c:1361 ../gio/glocalfile.c:1051 ../gio/glocalfile.c:1062
-#: ../gio/glocalfile.c:1075
+#: ../gio/gfile.c:1361 ../gio/glocalfile.c:1070 ../gio/glocalfile.c:1081
+#: ../gio/glocalfile.c:1094
 msgid "Containing mount does not exist"
 msgstr "Bá láp cháa khÃng tán tái"
 
-#: ../gio/gfile.c:2414 ../gio/glocalfile.c:2256
+#: ../gio/gfile.c:2414 ../gio/glocalfile.c:2289
 msgid "Can't copy over directory"
 msgstr "KhÃng thá sao chÃp ÄÃ lÃn thÆ mác"
 
@@ -1011,7 +1009,7 @@ msgstr "KhÃng thá sao chÃp ÄÃ lÃn thÆ mác"
 msgid "Can't copy directory over directory"
 msgstr "KhÃng thá sao chÃp thÆ mác ÄÃ lÃn thÆ mác"
 
-#: ../gio/gfile.c:2483 ../gio/glocalfile.c:2265
+#: ../gio/gfile.c:2483 ../gio/glocalfile.c:2298
 msgid "Target file exists"
 msgstr "Táp tin ÄÃch ÄÃ cÃ"
 
@@ -1066,12 +1064,12 @@ msgstr "Bá Äám táp tin cà thao tÃc cÃn cháy"
 msgid "File enumerator is already closed"
 msgstr "Bá Äám táp tin ÄÃ bá ÄÃng"
 
-#: ../gio/gfileicon.c:236
+#: ../gio/gfileicon.c:237
 #, c-format
 msgid "Can't handle version %d of GFileIcon encoding"
 msgstr "KhÃng thá quán là phiÃn bán %d cáa báng mà GFileIcon"
 
-#: ../gio/gfileicon.c:246
+#: ../gio/gfileicon.c:247
 msgid "Malformed input data for GFileIcon"
 msgstr "Dá liáu nháp dáng sai cho GFileIcon"
 
@@ -1128,31 +1126,30 @@ msgstr "Kiáu %s khÃng thác hián 'from_tokens()' trÃn giao dián GIcon"
 msgid "Can't handle the supplied version the icon encoding"
 msgstr "KhÃng thá quán là phiÃn bán Äà cung cáp cáa báng mà biáu tÆáng"
 
-#: ../gio/ginetaddressmask.c:173
+#: ../gio/ginetaddressmask.c:184
 msgid "No address specified"
 msgstr "ChÆa xÃc Äánh Äáa chá"
 
-#: ../gio/ginetaddressmask.c:181
+#: ../gio/ginetaddressmask.c:192
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "%u là quà dÃi cho Äáa chá"
 
-#: ../gio/ginetaddressmask.c:214
+#: ../gio/ginetaddressmask.c:225
 msgid "Address has bits set beyond prefix length"
 msgstr "Äáa chá Äát bit vÆát Äá dÃi prefix"
 
-#: ../gio/ginetaddressmask.c:293
+#: ../gio/ginetaddressmask.c:304
 #, c-format
-#| msgid "could not get local address: %s"
 msgid "Could not parse '%s' as IP address mask"
 msgstr "khÃng thá phÃn tÃch '%s' lÃm mát ná Äáa chá IP"
 
-#: ../gio/ginetsocketaddress.c:181 ../gio/ginetsocketaddress.c:198
+#: ../gio/ginetsocketaddress.c:206 ../gio/ginetsocketaddress.c:223
 #: ../gio/gunixsocketaddress.c:221
 msgid "Not enough space for socket address"
 msgstr "KhÃng Äá khÃng gian cho Äáa chá socket"
 
-#: ../gio/ginetsocketaddress.c:211
+#: ../gio/ginetsocketaddress.c:238
 msgid "Unsupported socket address"
 msgstr "Äáa chá socket khÃng há trá"
 
@@ -1167,20 +1164,155 @@ msgstr "Luáng nháp vÃo khÃng thác hián chác nÄng Äác"
 #. * already an operation running against this stream when
 #. * you try to start one
 #: ../gio/ginputstream.c:898 ../gio/giostream.c:302
-#: ../gio/goutputstream.c:1236
+#: ../gio/goutputstream.c:1238
 msgid "Stream has outstanding operation"
 msgstr "Luáng cà thao tÃc cÃn cháy"
 
-#: ../gio/glib-compile-schemas.c:741
+#: ../gio/glib-compile-resources.c:144 ../gio/glib-compile-schemas.c:1449
+#, c-format
+msgid "Element <%s> not allowed inside <%s>"
+msgstr "KhÃng cho phÃp phán tá <%s> bÃn trong <%s>"
+
+#: ../gio/glib-compile-resources.c:148 ../gio/glib-compile-schemas.c:1453
+#, c-format
+msgid "Element <%s> not allowed at toplevel"
+msgstr "KhÃng cho phÃp phán tá <%s> á cáp cao nhát"
+
+#: ../gio/glib-compile-resources.c:235
+#, c-format
+msgid "File %s appears multiple times in the resource"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:248
+#, c-format
+msgid "Failed to locate '%s' in any source directory"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:259
+#, fuzzy, c-format
+#| msgid "Failed to change to directory '%s' (%s)"
+msgid "Failed to locate '%s' in current directory"
+msgstr "KhÃng thay Äái ÄÆác thÆ mác '%s' (%s)"
+
+#: ../gio/glib-compile-resources.c:287
+#, fuzzy, c-format
+#| msgid "Unknown option %s"
+msgid "Unknown processing option \"%s\""
+msgstr "KhÃng biát tÃy chán %s."
+
+#: ../gio/glib-compile-resources.c:305 ../gio/glib-compile-resources.c:363
+#, fuzzy, c-format
+#| msgid "Failed to create file '%s': %s"
+msgid "Failed to create temp file: %s"
+msgstr "KhÃng táo ÄÆác táp tin '%s': %s"
+
+#: ../gio/glib-compile-resources.c:335
+#, fuzzy
+#| msgid "Error setting symlink: file is not a symlink"
+msgid "Error processing input file with xmllint"
+msgstr ""
+"Gáp lái khi Äát liÃn kát tÆáng trÆng: táp tin khÃng phái là liÃn kát tÆáng "
+"trÆng"
+
+#: ../gio/glib-compile-resources.c:390
+msgid "Error processing input file with to-pixdata"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:403
+#, fuzzy, c-format
+#| msgid "Error reading file '%s': %s"
+msgid "Error reading file %s: %s"
+msgstr "Lái khi Äác táp tin '%s': %s"
+
+#: ../gio/glib-compile-resources.c:423
+#, fuzzy, c-format
+#| msgid "Error opening file: %s"
+msgid "Error compressing file %s"
+msgstr "Gáp lái khi má táp tin: %s"
+
+#: ../gio/glib-compile-resources.c:487 ../gio/glib-compile-schemas.c:1561
+#, c-format
+msgid "text may not appear inside <%s>"
+msgstr "vÄn bán khÃng thá xuát hián bÃn trong <%s>"
+
+#: ../gio/glib-compile-resources.c:610
+#, fuzzy
+#| msgid "removed existing output file.\n"
+msgid "name of the output file"
+msgstr "Äà xoà táp tin kát xuát hián cÃ.\n"
+
+#: ../gio/glib-compile-resources.c:610 ../gio/glib-compile-resources.c:643
+#: ../gio/gresource-tool.c:477 ../gio/gresource-tool.c:543
+msgid "FILE"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:611
+msgid ""
+"The directories where files are to be read from (default to current "
+"directory)"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:611 ../gio/glib-compile-schemas.c:1989
+#: ../gio/glib-compile-schemas.c:2019
+msgid "DIRECTORY"
+msgstr "THÆ MáC"
+
+#: ../gio/glib-compile-resources.c:612
+msgid ""
+"Generate output in the format selected for by the target filename extension"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:613
+msgid "Generate source header"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:614
+msgid "Generate sourcecode used to link in the resource file into your code"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:615
+msgid "Generate dependency list"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:616
+msgid "Don't automatically create and register resource"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:617
+msgid "C identifier name used for the generated source code"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:646
+#, fuzzy
+#| msgid ""
+#| "Compile all GSettings schema files into a schema cache.\n"
+#| "Schema files are required to have the extension .gschema.xml,\n"
+#| "and the cache file is called gschemas.compiled."
+msgid ""
+"Compile a resource specification into a resource file.\n"
+"Resource specification files have the extension .gresource.xml,\n"
+"and the resource file have the extension called .gresource."
+msgstr ""
+"BiÃn dách tát cá táp tin GSettings schema thÃnh schema cache.\n"
+"Táp tin schema cán cà phán má ráng .gschema.xml,\n"
+"và táp tin cache tÃn là gschemas.compiled."
+
+#: ../gio/glib-compile-resources.c:662
+#, fuzzy, c-format
+#| msgid "You should give exactly one directory name\n"
+msgid "You should give exactly one file name\n"
+msgstr "Bán nÃn ÄÆa chÃnh xÃc mát tÃn thÆ mác\n"
+
+#: ../gio/glib-compile-schemas.c:774
 msgid "empty names are not permitted"
 msgstr "khÃng cho phÃp tÃn ráng"
 
-#: ../gio/glib-compile-schemas.c:751
+#: ../gio/glib-compile-schemas.c:784
 #, c-format
 msgid "invalid name '%s': names must begin with a lowercase letter"
 msgstr "tÃn khÃng háp lá '%s': tÃn phái bát Äáu báng chá thÆáng"
 
-#: ../gio/glib-compile-schemas.c:763
+#: ../gio/glib-compile-schemas.c:796
 #, c-format
 msgid ""
 "invalid name '%s': invalid character '%c'; only lowercase letters, numbers "
@@ -1189,38 +1321,37 @@ msgstr ""
 "tÃn khÃng háp lá '%s': kà tá khÃng háp lá '%c'; chá ÄÆác dÃng chá thÆáng, sá "
 "hoác dáu gách ngang ('-')."
 
-#: ../gio/glib-compile-schemas.c:772
+#: ../gio/glib-compile-schemas.c:805
 #, c-format
 msgid "invalid name '%s': two successive dashes ('--') are not permitted."
 msgstr ""
 "tÃn khÃng háp lá '%s': khÃng ÄÆác dÃng hai gách ngang liÃn tiáp ('--')."
 
-#: ../gio/glib-compile-schemas.c:781
+#: ../gio/glib-compile-schemas.c:814
 #, c-format
 msgid "invalid name '%s': the last character may not be a dash ('-')."
 msgstr "tÃn khÃng háp lá '%s': kà tá cuái khÃng thá là gách ngang ('-')."
 
-#: ../gio/glib-compile-schemas.c:789
+#: ../gio/glib-compile-schemas.c:822
 #, c-format
 msgid "invalid name '%s': maximum length is 1024"
 msgstr "tÃn khÃng háp lá '%s': Äá dÃi tái Äa là 1024"
 
-#: ../gio/glib-compile-schemas.c:858
+#: ../gio/glib-compile-schemas.c:891
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> ÄÃ ÄÆác xÃc Äánh rái"
 
-#: ../gio/glib-compile-schemas.c:884
-#| msgid "can not add keys to a 'list-of' schema"
+#: ../gio/glib-compile-schemas.c:917
 msgid "cannot add keys to a 'list-of' schema"
 msgstr "khÃng thá thÃm khoà vÃo schema 'list-of'"
 
-#: ../gio/glib-compile-schemas.c:895
+#: ../gio/glib-compile-schemas.c:928
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> ÄÃ ÄÆác xÃc Äánh rái"
 
-#: ../gio/glib-compile-schemas.c:913
+#: ../gio/glib-compile-schemas.c:946
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -1229,7 +1360,7 @@ msgstr ""
 "<key name='%s'> che <key name='%s'> trong <schema id='%s'>; dÃng <override> "
 "Äá thay Äái già trá"
 
-#: ../gio/glib-compile-schemas.c:924
+#: ../gio/glib-compile-schemas.c:957
 #, c-format
 msgid ""
 "exactly one of 'type', 'enum' or 'flags' must be specified as an attribute "
@@ -1238,56 +1369,56 @@ msgstr ""
 "thuác tÃnh cáa <key> chá cà thá là duy nhát mát trong 'type', 'enum' hoác "
 "'flags'"
 
-#: ../gio/glib-compile-schemas.c:943
+#: ../gio/glib-compile-schemas.c:976
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> chÆa Äánh nghÄa."
 
-#: ../gio/glib-compile-schemas.c:958
+#: ../gio/glib-compile-schemas.c:991
 #, c-format
 msgid "invalid GVariant type string '%s'"
 msgstr "kiáu chuái GVariant khÃng háp lá '%s'"
 
-#: ../gio/glib-compile-schemas.c:988
+#: ../gio/glib-compile-schemas.c:1021
 msgid "<override> given but schema isn't extending anything"
 msgstr "<override> ÄÆác ghi nhÆng schema khÃng cà gà Äá má ráng"
 
-#: ../gio/glib-compile-schemas.c:1001
+#: ../gio/glib-compile-schemas.c:1034
 #, c-format
 msgid "no <key name='%s'> to override"
 msgstr "khÃng cà <key name='%s'> Äá ghi ÄÃ"
 
-#: ../gio/glib-compile-schemas.c:1009
+#: ../gio/glib-compile-schemas.c:1042
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> ÄÃ ÄÆác xÃc Äánh rái"
 
-#: ../gio/glib-compile-schemas.c:1080
+#: ../gio/glib-compile-schemas.c:1113
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> ÄÃ ÄÆác xÃc Äánh rái"
 
-#: ../gio/glib-compile-schemas.c:1092
+#: ../gio/glib-compile-schemas.c:1125
 #, c-format
 msgid "<schema id='%s'> extends not yet existing schema '%s'"
 msgstr "<schema id='%s'> má ráng schema chÆa tán tái '%s'"
 
-#: ../gio/glib-compile-schemas.c:1108
+#: ../gio/glib-compile-schemas.c:1141
 #, c-format
 msgid "<schema id='%s'> is list of not yet existing schema '%s'"
 msgstr "<schema id='%s'> là danh sÃch cáa schema chÆa tán tái '%s'"
 
-#: ../gio/glib-compile-schemas.c:1116
+#: ../gio/glib-compile-schemas.c:1149
 #, c-format
 msgid "Can not be a list of a schema with a path"
 msgstr "KhÃng thá là danh sÃch cáa schema hoác ÄÆáng dán"
 
-#: ../gio/glib-compile-schemas.c:1126
+#: ../gio/glib-compile-schemas.c:1159
 #, c-format
 msgid "Can not extend a schema with a path"
 msgstr "KhÃng thá má ráng schema vái mát ÄÆáng dán"
 
-#: ../gio/glib-compile-schemas.c:1136
+#: ../gio/glib-compile-schemas.c:1169
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
@@ -1295,7 +1426,7 @@ msgstr ""
 "<schema id='%s'> là danh sÃch, má ráng <schema id='%s'> khÃng phái là mát "
 "danh sÃch"
 
-#: ../gio/glib-compile-schemas.c:1146
+#: ../gio/glib-compile-schemas.c:1179
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' "
@@ -1304,73 +1435,58 @@ msgstr ""
 "<schema id='%s' list-of='%s'> má ráng <schema id='%s' list-of='%s'> nhÆng "
 "'%s' khÃng má ráng '%s'"
 
-#: ../gio/glib-compile-schemas.c:1163
+#: ../gio/glib-compile-schemas.c:1196
 #, c-format
 msgid "a path, if given, must begin and end with a slash"
 msgstr "ÄÆáng dán náu cà phái bát Äáu báng dáu '/'"
 
-#: ../gio/glib-compile-schemas.c:1170
+#: ../gio/glib-compile-schemas.c:1203
 #, c-format
 msgid "the path of a list must end with ':/'"
 msgstr "ÄÆáng dán danh sÃch phái bát Äáu báng ':/'"
 
-#: ../gio/glib-compile-schemas.c:1196
+#: ../gio/glib-compile-schemas.c:1229
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> ÄÃ ÄÆác xÃc Äánh rái"
 
-#: ../gio/glib-compile-schemas.c:1416 ../gio/gmenumarkup.c:263
-#, c-format
-msgid "Element <%s> not allowed inside <%s>"
-msgstr "KhÃng cho phÃp phán tá <%s> bÃn trong <%s>"
-
-#: ../gio/glib-compile-schemas.c:1420 ../gio/gmenumarkup.c:268
-#, c-format
-msgid "Element <%s> not allowed at toplevel"
-msgstr "KhÃng cho phÃp phán tá <%s> á cáp cao nhát"
-
-#: ../gio/glib-compile-schemas.c:1511 ../gio/gmenumarkup.c:347
-#, c-format
-msgid "text may not appear inside <%s>"
-msgstr "vÄn bán khÃng thá xuát hián bÃn trong <%s>"
-
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1697 ../gio/glib-compile-schemas.c:1768
-#: ../gio/glib-compile-schemas.c:1844
+#: ../gio/glib-compile-schemas.c:1747 ../gio/glib-compile-schemas.c:1818
+#: ../gio/glib-compile-schemas.c:1894
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "--strict ÄÆác dÃng; thoÃt.\n"
 
-#: ../gio/glib-compile-schemas.c:1705
+#: ../gio/glib-compile-schemas.c:1755
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "ToÃn bá táp tin nÃy bá bá qua.\n"
 
-#: ../gio/glib-compile-schemas.c:1764
+#: ../gio/glib-compile-schemas.c:1814
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Bá qua táp tin nÃy.\n"
 
-#: ../gio/glib-compile-schemas.c:1804
+#: ../gio/glib-compile-schemas.c:1854
 #, c-format
 msgid "No such key `%s' in schema `%s' as specified in override file `%s'"
 msgstr ""
 "KhÃng cà khoà `%s' trong schema `%s' nhÆ ÄÆác xÃc Äánh trong táp tin ghi Äà `"
 "%s'"
 
-#: ../gio/glib-compile-schemas.c:1810 ../gio/glib-compile-schemas.c:1868
-#: ../gio/glib-compile-schemas.c:1896
+#: ../gio/glib-compile-schemas.c:1860 ../gio/glib-compile-schemas.c:1918
+#: ../gio/glib-compile-schemas.c:1946
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr "; bá qua ghi Äà cho khoà nÃy.\n"
 
-#: ../gio/glib-compile-schemas.c:1814 ../gio/glib-compile-schemas.c:1872
-#: ../gio/glib-compile-schemas.c:1900
+#: ../gio/glib-compile-schemas.c:1864 ../gio/glib-compile-schemas.c:1922
+#: ../gio/glib-compile-schemas.c:1950
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr "và cà dÃng --strict; thoÃt.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: ../gio/glib-compile-schemas.c:1880
 #, c-format
 msgid ""
 "error parsing key `%s' in schema `%s' as specified in override file `%s': "
@@ -1379,12 +1495,12 @@ msgstr ""
 "lái phÃn tÃch khoà `%s' trong schema `%s' nhÆ xÃc Äánh trong táp tin ghi Äà `"
 "%s': %s.  "
 
-#: ../gio/glib-compile-schemas.c:1840
+#: ../gio/glib-compile-schemas.c:1890
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Bá qua ghi Äà khoà nÃy.\n"
 
-#: ../gio/glib-compile-schemas.c:1858
+#: ../gio/glib-compile-schemas.c:1908
 #, c-format
 msgid ""
 "override for key `%s' in schema `%s' in override file `%s' is out of the "
@@ -1393,7 +1509,7 @@ msgstr ""
 "ghi Äà khoà `%s' trong schema `%s' trong táp tin ghi Äà `%s' ngoÃi phám vi "
 "schema"
 
-#: ../gio/glib-compile-schemas.c:1886
+#: ../gio/glib-compile-schemas.c:1936
 #, c-format
 msgid ""
 "override for key `%s' in schema `%s' in override file `%s' is not in the "
@@ -1402,27 +1518,23 @@ msgstr ""
 "ghi Äà khoà `%s' trong schema `%s' trong táp tin ghi Äà `%s' khÃng nám trong "
 "danh sÃch láa chán háp lá"
 
-#: ../gio/glib-compile-schemas.c:1939
+#: ../gio/glib-compile-schemas.c:1989
 msgid "where to store the gschemas.compiled file"
 msgstr "nÆi lÆu táp tin gschemas.compiled"
 
-#: ../gio/glib-compile-schemas.c:1939 ../gio/glib-compile-schemas.c:1969
-msgid "DIRECTORY"
-msgstr "THÆ MáC"
-
-#: ../gio/glib-compile-schemas.c:1940
+#: ../gio/glib-compile-schemas.c:1990
 msgid "Abort on any errors in schemas"
 msgstr "Buác huá náu gáp bát cá lái gà trong schema"
 
-#: ../gio/glib-compile-schemas.c:1941
+#: ../gio/glib-compile-schemas.c:1991
 msgid "Do not write the gschema.compiled file"
 msgstr "KhÃng ghi táp tin gschemas.compiled"
 
-#: ../gio/glib-compile-schemas.c:1942
+#: ../gio/glib-compile-schemas.c:1992
 msgid "Do not enforce key name restrictions"
 msgstr "KhÃng Ãp Äát rÃng buác tÃn khoÃ"
 
-#: ../gio/glib-compile-schemas.c:1972
+#: ../gio/glib-compile-schemas.c:2022
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -1432,22 +1544,22 @@ msgstr ""
 "Táp tin schema cán cà phán má ráng .gschema.xml,\n"
 "và táp tin cache tÃn là gschemas.compiled."
 
-#: ../gio/glib-compile-schemas.c:1988
+#: ../gio/glib-compile-schemas.c:2038
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Bán nÃn ÄÆa chÃnh xÃc mát tÃn thÆ mác\n"
 
-#: ../gio/glib-compile-schemas.c:2027
+#: ../gio/glib-compile-schemas.c:2077
 #, c-format
 msgid "No schema files found: "
 msgstr "KhÃng tÃm tháy táp tin schema: "
 
-#: ../gio/glib-compile-schemas.c:2030
+#: ../gio/glib-compile-schemas.c:2080
 #, c-format
 msgid "doing nothing.\n"
 msgstr "khÃng lÃm gà cá.\n"
 
-#: ../gio/glib-compile-schemas.c:2033
+#: ../gio/glib-compile-schemas.c:2083
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "Äà xoà táp tin kát xuát hián cÃ.\n"
@@ -1466,109 +1578,109 @@ msgstr "TÃn táp tin khÃng háp lá: %s"
 msgid "Error getting filesystem info: %s"
 msgstr "Gáp lái khi láy táp tin vá há tháng táp tin: %s"
 
-#: ../gio/glocalfile.c:1097
+#: ../gio/glocalfile.c:1116
 msgid "Can't rename root directory"
 msgstr "KhÃng thá thay Äái tÃn cáa thÆ mác gác"
 
-#: ../gio/glocalfile.c:1117 ../gio/glocalfile.c:1143
+#: ../gio/glocalfile.c:1136 ../gio/glocalfile.c:1162
 #, c-format
 msgid "Error renaming file: %s"
 msgstr "Gáp lái khi thay Äái tÃn cáa táp tin: %s"
 
-#: ../gio/glocalfile.c:1126
+#: ../gio/glocalfile.c:1145
 msgid "Can't rename file, filename already exists"
 msgstr "KhÃng thá Äái tÃn táp tin, tÃn táp tin ÄÃ cÃ"
 
-#: ../gio/glocalfile.c:1139 ../gio/glocalfile.c:2129 ../gio/glocalfile.c:2158
-#: ../gio/glocalfile.c:2318 ../gio/glocalfileoutputstream.c:581
+#: ../gio/glocalfile.c:1158 ../gio/glocalfile.c:2162 ../gio/glocalfile.c:2191
+#: ../gio/glocalfile.c:2351 ../gio/glocalfileoutputstream.c:581
 #: ../gio/glocalfileoutputstream.c:634 ../gio/glocalfileoutputstream.c:679
 #: ../gio/glocalfileoutputstream.c:1167
 msgid "Invalid filename"
 msgstr "TÃn táp tin khÃng háp lá"
 
-#: ../gio/glocalfile.c:1300
+#: ../gio/glocalfile.c:1325 ../gio/glocalfile.c:1349
+msgid "Can't open directory"
+msgstr "KhÃng thá má thÆ mác"
+
+#: ../gio/glocalfile.c:1333
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Gáp lái khi má táp tin: %s"
 
-#: ../gio/glocalfile.c:1316
-msgid "Can't open directory"
-msgstr "KhÃng thá má thÆ mác"
-
-#: ../gio/glocalfile.c:1441
+#: ../gio/glocalfile.c:1474
 #, c-format
 msgid "Error removing file: %s"
 msgstr "Gáp lái khi gá bá táp tin: %s"
 
-#: ../gio/glocalfile.c:1808
+#: ../gio/glocalfile.c:1841
 #, c-format
 msgid "Error trashing file: %s"
 msgstr "Gáp lái khi chuyán táp tin vÃo sát rÃc: %s"
 
-#: ../gio/glocalfile.c:1831
+#: ../gio/glocalfile.c:1864
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "KhÃng thá táo thÆ mác sát rÃc %s: %s"
 
-#: ../gio/glocalfile.c:1852
+#: ../gio/glocalfile.c:1885
 msgid "Unable to find toplevel directory for trash"
 msgstr "KhÃng tÃm tháy thÆ mác cáp Äáu cho sát rÃc"
 
-#: ../gio/glocalfile.c:1931 ../gio/glocalfile.c:1951
+#: ../gio/glocalfile.c:1964 ../gio/glocalfile.c:1984
 msgid "Unable to find or create trash directory"
 msgstr "KhÃng tÃm tháy hay khÃng thá táo thÆ mác sát rÃc"
 
-#: ../gio/glocalfile.c:1985
+#: ../gio/glocalfile.c:2018
 #, c-format
 msgid "Unable to create trashing info file: %s"
 msgstr "KhÃng thá táo táp tin thÃng tin sát rÃc: %s"
 
-#: ../gio/glocalfile.c:2014 ../gio/glocalfile.c:2019 ../gio/glocalfile.c:2099
-#: ../gio/glocalfile.c:2106
+#: ../gio/glocalfile.c:2047 ../gio/glocalfile.c:2052 ../gio/glocalfile.c:2132
+#: ../gio/glocalfile.c:2139
 #, c-format
 msgid "Unable to trash file: %s"
 msgstr "KhÃng thá chuyán táp tin vÃo sát rÃc: %s"
 
-#: ../gio/glocalfile.c:2107 ../glib/gregex.c:213
+#: ../gio/glocalfile.c:2140 ../glib/gregex.c:213
 msgid "internal error"
 msgstr "lái nái bá"
 
-#: ../gio/glocalfile.c:2133
+#: ../gio/glocalfile.c:2166
 #, c-format
 msgid "Error creating directory: %s"
 msgstr "Lái táo thÆ mác: %s"
 
-#: ../gio/glocalfile.c:2162
+#: ../gio/glocalfile.c:2195
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Há táo tin khÃng há trá liÃn kát biáu tÆáng"
 
-#: ../gio/glocalfile.c:2166
+#: ../gio/glocalfile.c:2199
 #, c-format
 msgid "Error making symbolic link: %s"
 msgstr "Gáp lái khi táo liÃn kát tÆáng trÆng: %s"
 
-#: ../gio/glocalfile.c:2228 ../gio/glocalfile.c:2322
+#: ../gio/glocalfile.c:2261 ../gio/glocalfile.c:2355
 #, c-format
 msgid "Error moving file: %s"
 msgstr "Gáp lái khi di chuyán táp tin: %s"
 
-#: ../gio/glocalfile.c:2251
+#: ../gio/glocalfile.c:2284
 msgid "Can't move directory over directory"
 msgstr "KhÃng thá di chuyán thÆ mác ÄÃ lÃn thÆ mác"
 
-#: ../gio/glocalfile.c:2278 ../gio/glocalfileoutputstream.c:965
+#: ../gio/glocalfile.c:2311 ../gio/glocalfileoutputstream.c:965
 #: ../gio/glocalfileoutputstream.c:979 ../gio/glocalfileoutputstream.c:994
 #: ../gio/glocalfileoutputstream.c:1010 ../gio/glocalfileoutputstream.c:1024
 msgid "Backup file creation failed"
 msgstr "Lái táo táp tin sao lÆu"
 
-#: ../gio/glocalfile.c:2297
+#: ../gio/glocalfile.c:2330
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Gáp lái khi gá bá táp tin ÄÃch: %s"
 
-#: ../gio/glocalfile.c:2311
+#: ../gio/glocalfile.c:2344
 msgid "Move between mounts not supported"
 msgstr "KhÃng há trá chác nÄng di chuyán giáa cÃc bá láp"
 
@@ -1595,13 +1707,11 @@ msgstr " (báng mà khÃng háp lá)"
 
 #: ../gio/glocalfileinfo.c:1527 ../gio/glocalfileoutputstream.c:843
 #, c-format
-#| msgid "Error opening nonce file `%s': %s"
 msgid "Error when getting information for file '%s': %s"
 msgstr "Lái láy thÃng tin cho táp tin '%s': %s"
 
 #: ../gio/glocalfileinfo.c:1779
 #, c-format
-#| msgid "Error stating file descriptor: %s"
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Lái láy thÃng tin cho bá mà tá táp tin: %s"
 
@@ -1742,15 +1852,15 @@ msgstr "Táp tin ÄÃ bá sáa Äái bÃn ngoÃi"
 msgid "Error removing old file: %s"
 msgstr "Lái xoà táp tin cÅ: %s"
 
-#: ../gio/gmemoryinputstream.c:494 ../gio/gmemoryoutputstream.c:750
+#: ../gio/gmemoryinputstream.c:492 ../gio/gmemoryoutputstream.c:750
 msgid "Invalid GSeekType supplied"
 msgstr "GSeekType ÄÆác cung cáp khÃng háp lá"
 
-#: ../gio/gmemoryinputstream.c:504
+#: ../gio/gmemoryinputstream.c:502
 msgid "Invalid seek request"
 msgstr "YÃu cáu tÃm khÃng háp lá"
 
-#: ../gio/gmemoryinputstream.c:528
+#: ../gio/gmemoryinputstream.c:526
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "KhÃng thá cát GMemoryInputStream"
 
@@ -1836,7 +1946,6 @@ msgid "Hostname '%s' contains '[' but not ']'"
 msgstr "TÃn mÃy '%s' cà '[' nhÆng khÃng cà ']'"
 
 #: ../gio/gnetworkmonitorbase.c:178
-#| msgid "Network unreachable through SOCKSv5 proxy."
 msgid "Network unreachable"
 msgstr "Máng khÃng thá tiáp cán"
 
@@ -1847,7 +1956,6 @@ msgstr "MÃy khÃng thá tiáp cán"
 #: ../gio/gnetworkmonitornetlink.c:97 ../gio/gnetworkmonitornetlink.c:109
 #: ../gio/gnetworkmonitornetlink.c:120
 #, c-format
-#| msgid "could not get remote address: %s"
 msgid "Could not create network monitor: %s"
 msgstr "khÃng thá táo trÃnh theo dÃi máng: %s"
 
@@ -1856,15 +1964,14 @@ msgid "Could not create network monitor: "
 msgstr "KhÃng thá táo trÃnh theo dÃi máng: "
 
 #: ../gio/gnetworkmonitornetlink.c:177
-#| msgid "could not get remote address: %s"
 msgid "Could not get network status: "
 msgstr "KhÃng thá láy tráng thÃi máng: "
 
-#: ../gio/goutputstream.c:210 ../gio/goutputstream.c:415
+#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:417
 msgid "Output stream doesn't implement write"
 msgstr "Luáng xuát khÃng thác hián hÃm write (ghi)"
 
-#: ../gio/goutputstream.c:376 ../gio/goutputstream.c:874
+#: ../gio/goutputstream.c:378 ../gio/goutputstream.c:876
 msgid "Source stream is already closed"
 msgstr "Luáng nguán ÄÃ bá ÄÃng"
 
@@ -1893,6 +2000,154 @@ msgstr "Tám thái khÃng thá phÃn giái '%s'"
 msgid "Error resolving '%s'"
 msgstr "Lái phÃn giái '%s'"
 
+#: ../gio/gresource.c:294 ../gio/gresource.c:539 ../gio/gresource.c:556
+#: ../gio/gresource.c:679 ../gio/gresource.c:748 ../gio/gresource.c:809
+#: ../gio/gresource.c:889 ../gio/gresourcefile.c:452
+#: ../gio/gresourcefile.c:552 ../gio/gresourcefile.c:654
+#, c-format
+msgid "The resource at '%s' does not exist"
+msgstr ""
+
+#: ../gio/gresource.c:456
+#, c-format
+msgid "The resource at '%s' failed to decompress"
+msgstr ""
+
+#: ../gio/gresourcefile.c:650
+#, fuzzy, c-format
+#| msgid "Target file is a directory"
+msgid "The resource at '%s' is not a directory"
+msgstr "Táp tin ÄÃch là mát thÆ mác"
+
+#: ../gio/gresourcefile.c:858
+#, fuzzy
+#| msgid "Input stream doesn't implement read"
+msgid "Input stream doesn't implement seek"
+msgstr "Luáng nháp vÃo khÃng thác hián chác nÄng Äác"
+
+#: ../gio/gresource-tool.c:470 ../gio/gsettings-tool.c:530
+msgid "Print help"
+msgstr "In trá giÃp"
+
+#: ../gio/gresource-tool.c:471 ../gio/gresource-tool.c:539
+#, fuzzy
+#| msgid "COMMAND"
+msgid "[COMMAND]"
+msgstr "LáNH"
+
+#: ../gio/gresource-tool.c:476
+msgid "List sections containing resources in an elf FILE"
+msgstr ""
+
+#: ../gio/gresource-tool.c:482
+msgid ""
+"List resources\n"
+"If SECTION is given, only list resources in this section\n"
+"If PATH is given, only list matching resources"
+msgstr ""
+
+#: ../gio/gresource-tool.c:485 ../gio/gresource-tool.c:495
+msgid "FILE [PATH]"
+msgstr ""
+
+#: ../gio/gresource-tool.c:486 ../gio/gresource-tool.c:496
+#: ../gio/gresource-tool.c:503
+msgid "SECTION"
+msgstr ""
+
+#: ../gio/gresource-tool.c:491
+msgid ""
+"List resources with details\n"
+"If SECTION is given, only list resources in this section\n"
+"If PATH is given, only list matching resources\n"
+"Details include the section, size and compression"
+msgstr ""
+
+#: ../gio/gresource-tool.c:501
+msgid "Extract a resource file to stdout"
+msgstr ""
+
+#: ../gio/gresource-tool.c:502
+#, fuzzy
+#| msgid "PATH"
+msgid "FILE PATH"
+msgstr "ÄÆáNG DáN"
+
+#: ../gio/gresource-tool.c:508 ../gio/gsettings-tool.c:610
+#, c-format
+msgid ""
+"Unknown command %s\n"
+"\n"
+msgstr ""
+"Lánh lá '%s'\n"
+"\n"
+
+#: ../gio/gresource-tool.c:516
+msgid ""
+"Usage:\n"
+"  gresource [--section SECTION] COMMAND [ARGS...]\n"
+"\n"
+"Commands:\n"
+"  help                      Show this information\n"
+"  sections                  List resource sections\n"
+"  list                      List resources\n"
+"  details                   List resources with details\n"
+"  extract                   Extract a resource\n"
+"\n"
+"Use 'gresource help COMMAND' to get detailed help.\n"
+"\n"
+msgstr ""
+
+#: ../gio/gresource-tool.c:530
+#, c-format
+msgid ""
+"Usage:\n"
+"  gresource %s%s%s %s\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#: ../gio/gresource-tool.c:533 ../gio/gsettings-tool.c:643
+msgid "Arguments:\n"
+msgstr "Äái sá:\n"
+
+#: ../gio/gresource-tool.c:537
+msgid "  SECTION   An (optional) elf section name\n"
+msgstr ""
+
+#: ../gio/gresource-tool.c:541 ../gio/gsettings-tool.c:650
+msgid "  COMMAND   The (optional) command to explain\n"
+msgstr "  COMMAND   Lánh Äá giái thÃch (tuá chán)\n"
+
+#: ../gio/gresource-tool.c:547
+msgid "  FILE      An elf file (a binary or a shared library)\n"
+msgstr ""
+
+#: ../gio/gresource-tool.c:550
+msgid ""
+"  FILE      An elf file (a binary or a shared library)\n"
+"            or a compiled resource file\n"
+msgstr ""
+
+#: ../gio/gresource-tool.c:554
+#, fuzzy
+#| msgid "PATH"
+msgid "[PATH]"
+msgstr "ÄÆáNG DáN"
+
+#: ../gio/gresource-tool.c:556
+msgid "  PATH      An (optional) resource path (may be partial)\n"
+msgstr ""
+
+#: ../gio/gresource-tool.c:557
+msgid "PATH"
+msgstr "ÄÆáNG DáN"
+
+#: ../gio/gresource-tool.c:559
+msgid "  PATH      A resource path\n"
+msgstr ""
+
 #: ../gio/gsettings-tool.c:53 ../gio/gsettings-tool.c:74
 #, c-format
 msgid "No such schema '%s'\n"
@@ -1933,37 +2188,33 @@ msgstr "ÄÆáng dán khÃng ÄÆác cháa hai dáu gách chÃo liÃn ti
 msgid "No such key '%s'\n"
 msgstr "KhÃng cà khoà '%s'\n"
 
-#: ../gio/gsettings-tool.c:500
+#: ../gio/gsettings-tool.c:503
 #, c-format
 msgid "The provided value is outside of the valid range\n"
 msgstr "Già trá cung cáp ngoÃi phám vi háp lá\n"
 
-#: ../gio/gsettings-tool.c:529
-msgid "Print help"
-msgstr "In trá giÃp"
-
-#: ../gio/gsettings-tool.c:535
+#: ../gio/gsettings-tool.c:536
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Danh sÃch schema (khÃng thá tÃi Äánh vá) ÄÃ cÃi Äát"
 
-#: ../gio/gsettings-tool.c:541
+#: ../gio/gsettings-tool.c:542
 msgid "List the installed relocatable schemas"
 msgstr "Danh sÃch schema (cà thá thá tÃi Äánh vá) Äà cÃi Äát"
 
-#: ../gio/gsettings-tool.c:547
+#: ../gio/gsettings-tool.c:548
 msgid "List the keys in SCHEMA"
 msgstr "Liát kà khoà trong SCHEMA"
 
-#: ../gio/gsettings-tool.c:548 ../gio/gsettings-tool.c:554
-#: ../gio/gsettings-tool.c:591
+#: ../gio/gsettings-tool.c:549 ../gio/gsettings-tool.c:555
+#: ../gio/gsettings-tool.c:592
 msgid "SCHEMA[:PATH]"
 msgstr "SCHEMA[:ÄÆáNG DáN]"
 
-#: ../gio/gsettings-tool.c:553
+#: ../gio/gsettings-tool.c:554
 msgid "List the children of SCHEMA"
 msgstr "Liát kà con cáa SCHEMA"
 
-#: ../gio/gsettings-tool.c:559
+#: ../gio/gsettings-tool.c:560
 msgid ""
 "List keys and values, recursively\n"
 "If no SCHEMA is given, list all keys\n"
@@ -1971,44 +2222,44 @@ msgstr ""
 "Danh sÃch khoà và già trá, Äá quy\n"
 "Náu khÃng cho SCHEMA, liát kà mái khoÃ\n"
 
-#: ../gio/gsettings-tool.c:561
+#: ../gio/gsettings-tool.c:562
 msgid "[SCHEMA[:PATH]]"
 msgstr "[SCHEMA[:ÄÆáNG DáN]]"
 
-#: ../gio/gsettings-tool.c:566
+#: ../gio/gsettings-tool.c:567
 msgid "Get the value of KEY"
 msgstr "Láy già trá cáa KHOÃ"
 
-#: ../gio/gsettings-tool.c:567 ../gio/gsettings-tool.c:573
-#: ../gio/gsettings-tool.c:585 ../gio/gsettings-tool.c:597
+#: ../gio/gsettings-tool.c:568 ../gio/gsettings-tool.c:574
+#: ../gio/gsettings-tool.c:586 ../gio/gsettings-tool.c:598
 msgid "SCHEMA[:PATH] KEY"
 msgstr "SCHEMA[:ÄÆáNG DáN] KHOÃ"
 
-#: ../gio/gsettings-tool.c:572
+#: ../gio/gsettings-tool.c:573
 msgid "Query the range of valid values for KEY"
 msgstr "Truy ván khoáng già trá háp lá cho KHOÃ"
 
-#: ../gio/gsettings-tool.c:578
+#: ../gio/gsettings-tool.c:579
 msgid "Set the value of KEY to VALUE"
 msgstr "Äát già trá GIà TRá cho KHOÃ"
 
-#: ../gio/gsettings-tool.c:579
+#: ../gio/gsettings-tool.c:580
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHEMA[:ÄÆáNG DáN] KHOÃ GIÃ-TRá"
 
-#: ../gio/gsettings-tool.c:584
+#: ../gio/gsettings-tool.c:585
 msgid "Reset KEY to its default value"
 msgstr "Phác hái già trá mác Äánh cho KHOÃ"
 
-#: ../gio/gsettings-tool.c:590
+#: ../gio/gsettings-tool.c:591
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "Phác hái mái khoà trong SCHEMA vá mác Äánh"
 
-#: ../gio/gsettings-tool.c:596
+#: ../gio/gsettings-tool.c:597
 msgid "Check if KEY is writable"
 msgstr "Kiám tra quyán ghi cáa KHOÃ"
 
-#: ../gio/gsettings-tool.c:602
+#: ../gio/gsettings-tool.c:603
 msgid ""
 "Monitor KEY for changes.\n"
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -2018,41 +2269,11 @@ msgstr ""
 "Náu khÃng xÃc Äánh KHOÃ, theo dÃi mái khoà trong SCHEMA.\n"
 "Nhán ^C Äá ngÆng.\n"
 
-#: ../gio/gsettings-tool.c:605
+#: ../gio/gsettings-tool.c:606
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMA[:ÄÆáNG DáN] [KHOÃ]"
 
-#: ../gio/gsettings-tool.c:609
-#, c-format
-msgid ""
-"Unknown command %s\n"
-"\n"
-msgstr ""
-"Lánh lá '%s'\n"
-"\n"
-
-#: ../gio/gsettings-tool.c:617
-#| msgid ""
-#| "Usage:\n"
-#| "  gsettings COMMAND [ARGS...]\n"
-#| "\n"
-#| "Commands:\n"
-#| "  help                      Show this information\n"
-#| "  list-schemas              List installed schemas\n"
-#| "  list-relocatable-schemas  List relocatable schemas\n"
-#| "  list-keys                 List keys in a schema\n"
-#| "  list-children             List children of a schema\n"
-#| "  list-recursively          List keys and values, recursively\n"
-#| "  range                     Queries the range of a key\n"
-#| "  get                       Get the value of a key\n"
-#| "  set                       Set the value of a key\n"
-#| "  reset                     Reset the value of a key\n"
-#| "  reset-recursively         Reset all values in a given schema\n"
-#| "  writable                  Check if a key is writable\n"
-#| "  monitor                   Watch for changes\n"
-#| "\n"
-#| "Use 'gsettings help COMMAND' to get detailed help.\n"
-#| "\n"
+#: ../gio/gsettings-tool.c:618
 msgid ""
 "Usage:\n"
 "  gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
@@ -2096,14 +2317,8 @@ msgstr ""
 "DÃng 'gsettings help LáNH' Äá biát chi tiát.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:639
+#: ../gio/gsettings-tool.c:640
 #, c-format
-#| msgid ""
-#| "Usage:\n"
-#| "  gsettings %s %s\n"
-#| "\n"
-#| "%s\n"
-#| "\n"
 msgid ""
 "Usage:\n"
 "  gsettings [--schemadir SCHEMADIR] %s %s\n"
@@ -2117,19 +2332,11 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:642
-msgid "Arguments:\n"
-msgstr "Äái sá:\n"
-
-#: ../gio/gsettings-tool.c:645
+#: ../gio/gsettings-tool.c:646
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr "  SCHEMADIR ThÆ mác cán tÃm schema bá sung\n"
 
-#: ../gio/gsettings-tool.c:649
-msgid "  COMMAND   The (optional) command to explain\n"
-msgstr "  COMMAND   Lánh Äá giái thÃch (tuá chán)\n"
-
-#: ../gio/gsettings-tool.c:653
+#: ../gio/gsettings-tool.c:654
 msgid ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
@@ -2137,156 +2344,170 @@ msgstr ""
 "  SCHEMA    TÃn schema\n"
 "  PATH      ÄÆáng dán, cho schema tÃi Äánh vá\n"
 
-#: ../gio/gsettings-tool.c:658
+#: ../gio/gsettings-tool.c:659
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  KEY       Khoà trong schema (tuá chán)\n"
 
-#: ../gio/gsettings-tool.c:662
+#: ../gio/gsettings-tool.c:663
 msgid "  KEY       The key within the schema\n"
 msgstr "  KEY       Khoà trong schema\n"
 
-#: ../gio/gsettings-tool.c:666
+#: ../gio/gsettings-tool.c:667
 msgid "  VALUE     The value to set\n"
 msgstr "  VALUE     Già trá cán Äát\n"
 
-#: ../gio/gsettings-tool.c:787
+#: ../gio/gsettings-tool.c:788
 #, c-format
 msgid "Empty schema name given\n"
 msgstr "TÃn schema ráng\n"
 
-#: ../gio/gsocket.c:277
+#: ../gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Socket khÃng háp lá, chÆa ÄÆác sÆ khái"
 
-#: ../gio/gsocket.c:284
+#: ../gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Socket khÃng háp lá, khái Äáng thát bái vÃ: %s"
 
-#: ../gio/gsocket.c:292
+#: ../gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Socket ÄÃ ÄÆác ÄÃng"
 
-#: ../gio/gsocket.c:300 ../gio/gsocket.c:2799 ../gio/gsocket.c:2843
+#: ../gio/gsocket.c:305 ../gio/gsocket.c:3520 ../gio/gsocket.c:3575
 msgid "Socket I/O timed out"
 msgstr "Hát giá Socket I/O"
 
-#: ../gio/gsocket.c:466
+#: ../gio/gsocket.c:472
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "táo GSocket tá fd: %s"
 
-#: ../gio/gsocket.c:500 ../gio/gsocket.c:516
+#: ../gio/gsocket.c:506 ../gio/gsocket.c:522
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "KhÃng thá táo socket: %s"
 
-#: ../gio/gsocket.c:500
+#: ../gio/gsocket.c:506
 msgid "Unknown protocol was specified"
 msgstr "Lái giao thác khÃng xÃc Äánh"
 
-#: ../gio/gsocket.c:1270
+#: ../gio/gsocket.c:1713
 #, c-format
 msgid "could not get local address: %s"
 msgstr "khÃng thá láy Äáa chá các bá: %s"
 
-#: ../gio/gsocket.c:1313
+#: ../gio/gsocket.c:1756
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "khÃng thá láy Äáa chá á xa: %s"
 
-#: ../gio/gsocket.c:1374
+#: ../gio/gsocket.c:1817
 #, c-format
 msgid "could not listen: %s"
 msgstr "khÃng thá láng nghe: %s"
 
-#: ../gio/gsocket.c:1448
+#: ../gio/gsocket.c:1891
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Lái liÃn kát Äáa chá: %s"
 
-#: ../gio/gsocket.c:1568
+#: ../gio/gsocket.c:1944 ../gio/gsocket.c:1980
+#, fuzzy, c-format
+#| msgid "Error launching application: %s"
+msgid "Error joining multicast group: %s"
+msgstr "Gáp lái khi khái cháy áng dáng: %s"
+
+#: ../gio/gsocket.c:1945 ../gio/gsocket.c:1981
+#, fuzzy, c-format
+#| msgid "Error launching application: %s"
+msgid "Error leaving multicast group: %s"
+msgstr "Gáp lái khi khái cháy áng dáng: %s"
+
+#: ../gio/gsocket.c:1946
+msgid "No support for source-specific multicast"
+msgstr ""
+
+#: ../gio/gsocket.c:2165
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Lái cháp nhán kát nái: %s"
 
-#: ../gio/gsocket.c:1689
+#: ../gio/gsocket.c:2286
 msgid "Connection in progress"
 msgstr "Kát nái Äang hÃnh thÃnh"
 
-#: ../gio/gsocket.c:1739 ../gio/gsocket.c:3580
+#: ../gio/gsocket.c:2338 ../gio/gsocket.c:4317
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "KhÃng thá láy lái Äang chá: %s"
 
-#: ../gio/gsocket.c:1876
+#: ../gio/gsocket.c:2508
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Lái nhán dá liáu: %s"
 
-#: ../gio/gsocket.c:2051
+#: ../gio/gsocket.c:2686
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Lái gái dá liáu: %s"
 
-#: ../gio/gsocket.c:2164
+#: ../gio/gsocket.c:2800
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "KhÃng thá tát socket: %s"
 
-#: ../gio/gsocket.c:2243
+#: ../gio/gsocket.c:2879
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Lái ÄÃng socket: %s"
 
-#: ../gio/gsocket.c:2792
+#: ../gio/gsocket.c:3513
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Äang chá socket: %s"
 
-#: ../gio/gsocket.c:3057 ../gio/gsocket.c:3138
+#: ../gio/gsocket.c:3791 ../gio/gsocket.c:3872
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Lái gái thÃng Äiáp: %s"
 
-#: ../gio/gsocket.c:3082
+#: ../gio/gsocket.c:3816
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage khÃng ÄÆác há trá trÃn Windows"
 
-#: ../gio/gsocket.c:3359 ../gio/gsocket.c:3495
+#: ../gio/gsocket.c:4096 ../gio/gsocket.c:4232
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Lái nhán thÃng Äiáp: %s"
 
-#: ../gio/gsocket.c:3599
+#: ../gio/gsocket.c:4336
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials khÃng ÄÆác há trá trÃn há Äiáu hÃnh nÃy"
 
-#: ../gio/gsocketclient.c:163
+#: ../gio/gsocketclient.c:174
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "KhÃng thá kát nái Äán mÃy uá nhiám %s: "
 
-#: ../gio/gsocketclient.c:177
+#: ../gio/gsocketclient.c:188
 #, c-format
-#| msgid "Could not open converter from '%s' to '%s': %s"
 msgid "Could not connect to %s: "
 msgstr "KhÃng thá kát nái Äán %s: "
 
-#: ../gio/gsocketclient.c:179
-#| msgid "could not listen: %s"
+#: ../gio/gsocketclient.c:190
 msgid "Could not connect: "
 msgstr "khÃng thá kát nái: "
 
-#: ../gio/gsocketclient.c:834 ../gio/gsocketclient.c:1399
+#: ../gio/gsocketclient.c:976 ../gio/gsocketclient.c:1547
 msgid "Unknown error on connect"
 msgstr "Lái lá khi kát nái"
 
-#: ../gio/gsocketclient.c:874 ../gio/gsocketclient.c:1291
+#: ../gio/gsocketclient.c:1029 ../gio/gsocketclient.c:1486
 msgid "Trying to proxy over non-TCP connection is not supported."
 msgstr "KhÃng há trá uá nhiám thÃng qua kát nái khÃng phái TCP."
 
-#: ../gio/gsocketclient.c:896 ../gio/gsocketclient.c:1311
+#: ../gio/gsocketclient.c:1055 ../gio/gsocketclient.c:1507
 #, c-format
 msgid "Proxy protocol '%s' is not supported."
 msgstr "KhÃng há trá giao thác uá nhiám '%s'."
@@ -2305,13 +2526,11 @@ msgid "SOCKSv4 does not support IPv6 address '%s'"
 msgstr "SOCKSv4 khÃng há trá Äáa chá IPv6 '%s'"
 
 #: ../gio/gsocks4aproxy.c:139
-#| msgid "Username or password is too long for SOCKSv5 protocol (max. is %i)."
 msgid "Username is too long for SOCKSv4 protocol"
 msgstr "TÃn ngÆái dÃng hoác mát kháu quà dÃi cho giao thác SOCKSv4"
 
 #: ../gio/gsocks4aproxy.c:156
 #, c-format
-#| msgid "Hostname '%s' too long for SOCKSv5 protocol (maximum is %i bytes)"
 msgid "Hostname '%s' is too long for SOCKSv4 protocol"
 msgstr "TÃn mÃy '%s' quà dÃi Äái cho giao thác SOCKSv4"
 
@@ -2341,8 +2560,9 @@ msgstr ""
 "GLib."
 
 #: ../gio/gsocks5proxy.c:208
-#| msgid "Username or password is too long for SOCKSv5 protocol (max. is %i)."
-msgid "Username or password is too long for SOCKSv5 protocol)."
+#, fuzzy
+#| msgid "Username or password is too long for SOCKSv5 protocol)."
+msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr "TÃn ngÆái dÃng hoác mát kháu quà dÃi cho giao thác SOCKSv5."
 
 #: ../gio/gsocks5proxy.c:238
@@ -2351,7 +2571,6 @@ msgstr "XÃc thác SOCKSv5 thát bái và sai tÃn ngÆái dÃng hoác má
 
 #: ../gio/gsocks5proxy.c:288
 #, c-format
-#| msgid "Hostname '%s' too long for SOCKSv5 protocol (maximum is %i bytes)"
 msgid "Hostname '%s' is too long for SOCKSv5 protocol"
 msgstr "TÃn mÃy '%s' quà dÃi cho giao thác SOCKSv5"
 
@@ -2397,7 +2616,6 @@ msgid "Can't handle version %d of GThemedIcon encoding"
 msgstr "KhÃng thá quán là phiÃn bán %d cáa báng mà GThemedIcon"
 
 #: ../gio/gtlscertificate.c:249
-#| msgid "Could not parse PEM-encoded private key"
 msgid "Cannot decrypt PEM-encoded private key"
 msgstr "KhÃng thá giái mà khoà riÃng mà hoà dáng PEM"
 
@@ -2435,12 +2653,12 @@ msgstr ""
 msgid "The password entered is incorrect."
 msgstr "Mát kháu nháp sai."
 
-#: ../gio/gunixconnection.c:164 ../gio/gunixconnection.c:521
+#: ../gio/gunixconnection.c:164 ../gio/gunixconnection.c:580
 #, c-format
 msgid "Expecting 1 control message, got %d"
 msgstr "Chá 1 thÃng Äiáp Äiáu khián, nhán ÄÆác %d"
 
-#: ../gio/gunixconnection.c:177 ../gio/gunixconnection.c:531
+#: ../gio/gunixconnection.c:177 ../gio/gunixconnection.c:590
 msgid "Unexpected type of ancillary data"
 msgstr "Gáp dá liáu bá sung kiáu bát thÆáng"
 
@@ -2453,16 +2671,16 @@ msgstr "Chá 1 fd, nhán ÄÆác %d\n"
 msgid "Received invalid fd"
 msgstr "Nhán fd khÃng háp lá"
 
-#: ../gio/gunixconnection.c:371
+#: ../gio/gunixconnection.c:347
 msgid "Error sending credentials: "
 msgstr "Lái gái giáy uá nhiám: "
 
-#: ../gio/gunixconnection.c:452
+#: ../gio/gunixconnection.c:511
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr "Lái kiám tra náu SO_PASSCRED ÄÆác bát cho socket: %s"
 
-#: ../gio/gunixconnection.c:461
+#: ../gio/gunixconnection.c:520
 #, c-format
 msgid ""
 "Unexpected option length while checking if SO_PASSCRED is enabled for "
@@ -2471,23 +2689,23 @@ msgstr ""
 "Chiáu dÃi tuá chán bát thÆáng khi kiám tra SO_PASSCRED cà ÄÆác bát cho "
 "socket. Chá %d byte, nhán %d"
 
-#: ../gio/gunixconnection.c:478
+#: ../gio/gunixconnection.c:537
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "Lái bát SO_PASSCRED: %s"
 
-#: ../gio/gunixconnection.c:509
+#: ../gio/gunixconnection.c:568
 msgid ""
 "Expecting to read a single byte for receiving credentials but read zero bytes"
 msgstr ""
 "Cán Äác mát byte duy nhát Äá nhán giáy uá nhiám nhÆng khÃng Äác ÄÆác byte nÃo"
 
-#: ../gio/gunixconnection.c:545
+#: ../gio/gunixconnection.c:604
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "Chá thÃng Äiáp Äiáu khián, nhán ÄÆác %d"
 
-#: ../gio/gunixconnection.c:571
+#: ../gio/gunixconnection.c:630
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Lái khi tát SO_PASSCRED: %s"
@@ -2495,14 +2713,12 @@ msgstr "Lái khi tát SO_PASSCRED: %s"
 #: ../gio/gunixinputstream.c:392 ../gio/gunixinputstream.c:413
 #: ../gio/gunixinputstream.c:492
 #, c-format
-#| msgid "Error stating file descriptor: %s"
 msgid "Error reading from file descriptor: %s"
 msgstr "Gáp lái khi Äác tá bá mà tá táp tin: %s"
 
 #: ../gio/gunixinputstream.c:447 ../gio/gunixinputstream.c:642
 #: ../gio/gunixoutputstream.c:433 ../gio/gunixoutputstream.c:597
 #, c-format
-#| msgid "Error stating file descriptor: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Gáp lái khi ÄÃng bá mà tá táp tin: %s"
 
@@ -2513,7 +2729,6 @@ msgstr "Gác há tháng táp tin"
 #: ../gio/gunixoutputstream.c:378 ../gio/gunixoutputstream.c:399
 #: ../gio/gunixoutputstream.c:478
 #, c-format
-#| msgid "Error stating file descriptor: %s"
 msgid "Error writing to file descriptor: %s"
 msgstr "Gáp lái khi ghi vÃo bá mà tá táp tin: %s"
 
@@ -2587,342 +2802,342 @@ msgstr "Cán thÃm Äáu vÃo"
 msgid "Invalid compressed data"
 msgstr "Sai nÃn dá liáu"
 
-#: ../glib/gbookmarkfile.c:780
+#: ../glib/gbookmarkfile.c:760
 #, c-format
 msgid "Unexpected attribute '%s' for element '%s'"
 msgstr "Thuác tÃnh bát thÆáng '%s' cho yáu tá '%s'"
 
-#: ../glib/gbookmarkfile.c:791 ../glib/gbookmarkfile.c:862
-#: ../glib/gbookmarkfile.c:872 ../glib/gbookmarkfile.c:979
+#: ../glib/gbookmarkfile.c:771 ../glib/gbookmarkfile.c:842
+#: ../glib/gbookmarkfile.c:852 ../glib/gbookmarkfile.c:959
 #, c-format
 msgid "Attribute '%s' of element '%s' not found"
 msgstr "KhÃng tÃm tháy thuác tÃnh '%s' cáa yáu tá '%s'"
 
-#: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1214
-#: ../glib/gbookmarkfile.c:1278 ../glib/gbookmarkfile.c:1288
+#: ../glib/gbookmarkfile.c:1129 ../glib/gbookmarkfile.c:1194
+#: ../glib/gbookmarkfile.c:1258 ../glib/gbookmarkfile.c:1268
 #, c-format
 msgid "Unexpected tag '%s', tag '%s' expected"
 msgstr "Thá bát thÆáng '%s', mong Äái thá '%s'"
 
-#: ../glib/gbookmarkfile.c:1174 ../glib/gbookmarkfile.c:1188
-#: ../glib/gbookmarkfile.c:1256 ../glib/gbookmarkfile.c:1308
+#: ../glib/gbookmarkfile.c:1154 ../glib/gbookmarkfile.c:1168
+#: ../glib/gbookmarkfile.c:1236 ../glib/gbookmarkfile.c:1288
 #, c-format
 msgid "Unexpected tag '%s' inside '%s'"
 msgstr "Thá bát thÆáng '%s' bÃn trong '%s'"
 
-#: ../glib/gbookmarkfile.c:1834
+#: ../glib/gbookmarkfile.c:1806
 msgid "No valid bookmark file found in data dirs"
 msgstr "KhÃng tÃm tháy táp tin liÃn kát lÆu háp lá trong cÃc thÆ mác dá liáu"
 
-#: ../glib/gbookmarkfile.c:2035
+#: ../glib/gbookmarkfile.c:2007
 #, c-format
 msgid "A bookmark for URI '%s' already exists"
 msgstr "Mát liÃn kát lÆu URI '%s' ÄÃ cÃ"
 
-#: ../glib/gbookmarkfile.c:2081 ../glib/gbookmarkfile.c:2239
-#: ../glib/gbookmarkfile.c:2324 ../glib/gbookmarkfile.c:2404
-#: ../glib/gbookmarkfile.c:2489 ../glib/gbookmarkfile.c:2572
-#: ../glib/gbookmarkfile.c:2650 ../glib/gbookmarkfile.c:2729
-#: ../glib/gbookmarkfile.c:2771 ../glib/gbookmarkfile.c:2868
-#: ../glib/gbookmarkfile.c:2994 ../glib/gbookmarkfile.c:3184
-#: ../glib/gbookmarkfile.c:3260 ../glib/gbookmarkfile.c:3425
-#: ../glib/gbookmarkfile.c:3514 ../glib/gbookmarkfile.c:3604
-#: ../glib/gbookmarkfile.c:3732
+#: ../glib/gbookmarkfile.c:2053 ../glib/gbookmarkfile.c:2211
+#: ../glib/gbookmarkfile.c:2296 ../glib/gbookmarkfile.c:2376
+#: ../glib/gbookmarkfile.c:2461 ../glib/gbookmarkfile.c:2544
+#: ../glib/gbookmarkfile.c:2622 ../glib/gbookmarkfile.c:2701
+#: ../glib/gbookmarkfile.c:2743 ../glib/gbookmarkfile.c:2840
+#: ../glib/gbookmarkfile.c:2960 ../glib/gbookmarkfile.c:3150
+#: ../glib/gbookmarkfile.c:3226 ../glib/gbookmarkfile.c:3391
+#: ../glib/gbookmarkfile.c:3480 ../glib/gbookmarkfile.c:3570
+#: ../glib/gbookmarkfile.c:3698
 #, c-format
 msgid "No bookmark found for URI '%s'"
 msgstr "KhÃng tÃm tháy liÃn kát lÆu URI '%s'"
 
-#: ../glib/gbookmarkfile.c:2413
+#: ../glib/gbookmarkfile.c:2385
 #, c-format
 msgid "No MIME type defined in the bookmark for URI '%s'"
 msgstr "ChÆa xÃc Äánh kiáu MIME trong liÃn kát lÆu URI '%s'"
 
-#: ../glib/gbookmarkfile.c:2498
+#: ../glib/gbookmarkfile.c:2470
 #, c-format
 msgid "No private flag has been defined in bookmark for URI '%s'"
 msgstr "ChÆa xÃc Äánh cá riÃng trong liÃn kát lÆu URI '%s'"
 
-#: ../glib/gbookmarkfile.c:2877
+#: ../glib/gbookmarkfile.c:2849
 #, c-format
 msgid "No groups set in bookmark for URI '%s'"
 msgstr "ChÆa Äát nhÃm trong liÃn kát lÆu URI '%s'"
 
-#: ../glib/gbookmarkfile.c:3278 ../glib/gbookmarkfile.c:3435
+#: ../glib/gbookmarkfile.c:3244 ../glib/gbookmarkfile.c:3401
 #, c-format
 msgid "No application with name '%s' registered a bookmark for '%s'"
 msgstr "KhÃng cà áng dáng tÃn '%s' Äà ÄÄng kà mát liÃn kát lÆu '%s'"
 
-#: ../glib/gbookmarkfile.c:3458
+#: ../glib/gbookmarkfile.c:3424
 #, c-format
 msgid "Failed to expand exec line '%s' with URI '%s'"
 msgstr "Lái má ráng dÃng thác hián '%s' báng URI '%s'"
 
-#: ../glib/gconvert.c:806 ../glib/gutf8.c:835 ../glib/gutf8.c:1045
-#: ../glib/gutf8.c:1182 ../glib/gutf8.c:1286
+#: ../glib/gconvert.c:807 ../glib/gutf8.c:837 ../glib/gutf8.c:1047
+#: ../glib/gutf8.c:1184 ../glib/gutf8.c:1288
 msgid "Partial character sequence at end of input"
 msgstr "Character sequence riÃng phán á cuái Äáu vÃo"
 
-#: ../glib/gconvert.c:1056
+#: ../glib/gconvert.c:1057
 #, c-format
 msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgstr "KhÃng thá chuyán Äái fallback '%s' thÃnh codeset '%s'"
 
-#: ../glib/gconvert.c:1873
+#: ../glib/gconvert.c:1874
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
 msgstr "URI '%s' khÃng phái URI tuyát Äái sá dáng lÆác Äá táp tin"
 
-#: ../glib/gconvert.c:1883
+#: ../glib/gconvert.c:1884
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "URI táp tin các bá '%s' cà thá khÃng bao gám '#'"
 
-#: ../glib/gconvert.c:1900
+#: ../glib/gconvert.c:1901
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "URI '%s' khÃng háp lá"
 
-#: ../glib/gconvert.c:1912
+#: ../glib/gconvert.c:1913
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "TÃn chá cáa URI '%s' khÃng háp lá"
 
-#: ../glib/gconvert.c:1928
+#: ../glib/gconvert.c:1929
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "URI '%s' cháa khÃng háp lá cÃc kà tá thoÃt"
 
-#: ../glib/gconvert.c:2023
+#: ../glib/gconvert.c:2024
 #, c-format
 msgid "The pathname '%s' is not an absolute path"
 msgstr "TÃn ÄÆáng dán '%s' khÃng phái mát ÄÆáng dán tuyát Äái"
 
-#: ../glib/gconvert.c:2033
+#: ../glib/gconvert.c:2034
 msgid "Invalid hostname"
 msgstr "TÃn chá khÃng háp lá"
 
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:203
+#: ../glib/gdatetime.c:205
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "AM"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:205
+#: ../glib/gdatetime.c:207
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "PM"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:208
+#: ../glib/gdatetime.c:210
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%A, %d %B NÄm %Y %T %Z"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:211
+#: ../glib/gdatetime.c:213
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:214
+#: ../glib/gdatetime.c:216
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:217
+#: ../glib/gdatetime.c:219
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M %p"
 
-#: ../glib/gdatetime.c:230
+#: ../glib/gdatetime.c:232
 msgctxt "full month name"
 msgid "January"
 msgstr "ThÃng giÃng"
 
-#: ../glib/gdatetime.c:232
+#: ../glib/gdatetime.c:234
 msgctxt "full month name"
 msgid "February"
 msgstr "ThÃng hai"
 
-#: ../glib/gdatetime.c:234
+#: ../glib/gdatetime.c:236
 msgctxt "full month name"
 msgid "March"
 msgstr "ThÃng ba"
 
-#: ../glib/gdatetime.c:236
+#: ../glib/gdatetime.c:238
 msgctxt "full month name"
 msgid "April"
 msgstr "ThÃng tÆ"
 
-#: ../glib/gdatetime.c:238
+#: ../glib/gdatetime.c:240
 msgctxt "full month name"
 msgid "May"
 msgstr "ThÃng nÄm"
 
-#: ../glib/gdatetime.c:240
+#: ../glib/gdatetime.c:242
 msgctxt "full month name"
 msgid "June"
 msgstr "ThÃng sÃu"
 
-#: ../glib/gdatetime.c:242
+#: ../glib/gdatetime.c:244
 msgctxt "full month name"
 msgid "July"
 msgstr "ThÃng báy"
 
-#: ../glib/gdatetime.c:244
+#: ../glib/gdatetime.c:246
 msgctxt "full month name"
 msgid "August"
 msgstr "ThÃng tÃm"
 
-#: ../glib/gdatetime.c:246
+#: ../glib/gdatetime.c:248
 msgctxt "full month name"
 msgid "September"
 msgstr "ThÃng chÃn"
 
-#: ../glib/gdatetime.c:248
+#: ../glib/gdatetime.c:250
 msgctxt "full month name"
 msgid "October"
 msgstr "ThÃng mÆái"
 
-#: ../glib/gdatetime.c:250
+#: ../glib/gdatetime.c:252
 msgctxt "full month name"
 msgid "November"
 msgstr "ThÃng mÆái mát"
 
-#: ../glib/gdatetime.c:252
+#: ../glib/gdatetime.c:254
 msgctxt "full month name"
 msgid "December"
 msgstr "ThÃng mÆái hai"
 
-#: ../glib/gdatetime.c:267
+#: ../glib/gdatetime.c:269
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "Th1"
 
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:271
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "Th2"
 
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:273
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "Th3"
 
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:275
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "Th4"
 
-#: ../glib/gdatetime.c:275
+#: ../glib/gdatetime.c:277
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "Th5"
 
-#: ../glib/gdatetime.c:277
+#: ../glib/gdatetime.c:279
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "Th6"
 
-#: ../glib/gdatetime.c:279
+#: ../glib/gdatetime.c:281
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "Th7"
 
-#: ../glib/gdatetime.c:281
+#: ../glib/gdatetime.c:283
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "Th8"
 
-#: ../glib/gdatetime.c:283
+#: ../glib/gdatetime.c:285
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "Th9"
 
-#: ../glib/gdatetime.c:285
+#: ../glib/gdatetime.c:287
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "Th10"
 
-#: ../glib/gdatetime.c:287
+#: ../glib/gdatetime.c:289
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "Th11"
 
-#: ../glib/gdatetime.c:289
+#: ../glib/gdatetime.c:291
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "Th12"
 
-#: ../glib/gdatetime.c:304
+#: ../glib/gdatetime.c:306
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "Thá hai"
 
-#: ../glib/gdatetime.c:306
+#: ../glib/gdatetime.c:308
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "Thá ba"
 
-#: ../glib/gdatetime.c:308
+#: ../glib/gdatetime.c:310
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "Thá tÆ"
 
-#: ../glib/gdatetime.c:310
+#: ../glib/gdatetime.c:312
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "Thá nÄm"
 
-#: ../glib/gdatetime.c:312
+#: ../glib/gdatetime.c:314
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "Thá sÃu"
 
-#: ../glib/gdatetime.c:314
+#: ../glib/gdatetime.c:316
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "Thá báy"
 
-#: ../glib/gdatetime.c:316
+#: ../glib/gdatetime.c:318
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "Chá Nhát"
 
-#: ../glib/gdatetime.c:331
+#: ../glib/gdatetime.c:333
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "T2"
 
-#: ../glib/gdatetime.c:333
+#: ../glib/gdatetime.c:335
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "T3"
 
-#: ../glib/gdatetime.c:335
+#: ../glib/gdatetime.c:337
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "T4"
 
-#: ../glib/gdatetime.c:337
+#: ../glib/gdatetime.c:339
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "T5"
 
-#: ../glib/gdatetime.c:339
+#: ../glib/gdatetime.c:341
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "T6"
 
-#: ../glib/gdatetime.c:341
+#: ../glib/gdatetime.c:343
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "T7"
 
-#: ../glib/gdatetime.c:343
+#: ../glib/gdatetime.c:345
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "CN"
@@ -3049,15 +3264,15 @@ msgstr "KÃnh tán hát trong kà tá riÃng phán"
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "KhÃng thá thác hián Äác thà trong g_io_channel_read_to_end"
 
-#: ../glib/gkeyfile.c:730
+#: ../glib/gkeyfile.c:726
 msgid "Valid key file could not be found in search dirs"
 msgstr "KhÃng tÃm tháy táp tin khoà háp lá nám trong thÆ mác tÃm kiám"
 
-#: ../glib/gkeyfile.c:765
+#: ../glib/gkeyfile.c:762
 msgid "Not a regular file"
 msgstr "KhÃng phái là mát táp tin chuán."
 
-#: ../glib/gkeyfile.c:1167
+#: ../glib/gkeyfile.c:1162
 #, c-format
 msgid ""
 "Key file contains line '%s' which is not a key-value pair, group, or comment"
@@ -3065,110 +3280,102 @@ msgstr ""
 "Táp tin khÃa cháa dÃng  %s  mà khÃng phái là cáp già trá khÃa, nhÃm, hoác "
 "chà thÃch."
 
-#: ../glib/gkeyfile.c:1227
+#: ../glib/gkeyfile.c:1222
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "TÃn nhÃm khÃng háp lá: %s"
 
-#: ../glib/gkeyfile.c:1249
+#: ../glib/gkeyfile.c:1244
 msgid "Key file does not start with a group"
 msgstr "Táp tin khÃa khÃng bát Äáu vái nhÃm."
 
-#: ../glib/gkeyfile.c:1275
+#: ../glib/gkeyfile.c:1270
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "TÃn khoà khÃng háp lá: %s"
 
-#: ../glib/gkeyfile.c:1302
+#: ../glib/gkeyfile.c:1297
 #, c-format
 msgid "Key file contains unsupported encoding '%s'"
 msgstr "Táp tin khÃa cháa báng mà khÃng ÄÆác há trá  %s Â."
 
-#: ../glib/gkeyfile.c:1548 ../glib/gkeyfile.c:1710 ../glib/gkeyfile.c:3088
-#: ../glib/gkeyfile.c:3154 ../glib/gkeyfile.c:3289 ../glib/gkeyfile.c:3422
-#: ../glib/gkeyfile.c:3564 ../glib/gkeyfile.c:3802 ../glib/gkeyfile.c:3871
+#: ../glib/gkeyfile.c:1541 ../glib/gkeyfile.c:1703 ../glib/gkeyfile.c:3081
+#: ../glib/gkeyfile.c:3147 ../glib/gkeyfile.c:3273 ../glib/gkeyfile.c:3406
+#: ../glib/gkeyfile.c:3548 ../glib/gkeyfile.c:3778 ../glib/gkeyfile.c:3846
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "Táp tin khÃa khÃng cà nhÃm  %s Â."
 
-#: ../glib/gkeyfile.c:1722
+#: ../glib/gkeyfile.c:1715
 #, c-format
 msgid "Key file does not have key '%s'"
 msgstr "Táp tin khÃa khÃng cà khÃa  %s Â."
 
-#: ../glib/gkeyfile.c:1829 ../glib/gkeyfile.c:1945
+#: ../glib/gkeyfile.c:1822 ../glib/gkeyfile.c:1938
 #, c-format
 msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
 msgstr "Táp tin khÃa cháa khÃa  %s  cà già trá  %s  khÃng phái là UTF-8."
 
-#: ../glib/gkeyfile.c:1849 ../glib/gkeyfile.c:1965 ../glib/gkeyfile.c:2334
+#: ../glib/gkeyfile.c:1842 ../glib/gkeyfile.c:1958 ../glib/gkeyfile.c:2327
 #, c-format
 msgid ""
 "Key file contains key '%s' which has a value that cannot be interpreted."
 msgstr "KhÃng thá phÃn tÃch già trá '%s' cháa trong táp tin khoÃ."
 
-#: ../glib/gkeyfile.c:2551 ../glib/gkeyfile.c:2917
+#: ../glib/gkeyfile.c:2544 ../glib/gkeyfile.c:2910
 #, c-format
-#| msgid ""
-#| "Key file contains key '%s' in group '%s' which has value that cannot be "
-#| "interpreted."
 msgid ""
 "Key file contains key '%s' in group '%s' which has a value that cannot be "
 "interpreted."
 msgstr ""
 "Táp tin khÃa cháa khÃa '%s' trong nhÃm '%s' cà già trá khÃng thá dián giái."
 
-#: ../glib/gkeyfile.c:2629 ../glib/gkeyfile.c:2705
+#: ../glib/gkeyfile.c:2622 ../glib/gkeyfile.c:2698
 #, c-format
-#| msgid ""
-#| "Key file contains key '%s' in group '%s' which has value that cannot be "
-#| "interpreted."
 msgid "Key '%s' in group '%s' has value '%s' where %s was expected"
 msgstr "Khoà '%s' trong nhÃm '%s' cà già trá '%s' trong khi cán %s"
 
-#: ../glib/gkeyfile.c:3103 ../glib/gkeyfile.c:3304 ../glib/gkeyfile.c:3882
+#: ../glib/gkeyfile.c:3096 ../glib/gkeyfile.c:3288 ../glib/gkeyfile.c:3857
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
 msgstr "Táp tin khÃa khÃng cháa khÃa  %s  trong nhÃm  %s Â."
 
-#: ../glib/gkeyfile.c:4116
+#: ../glib/gkeyfile.c:4089
 msgid "Key file contains escape character at end of line"
 msgstr "Táp tin khÃa cháa kà tá thoát tái kát thác dÃng."
 
-#: ../glib/gkeyfile.c:4138
+#: ../glib/gkeyfile.c:4111
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "URI '%s' cháa khÃng háp lá cÃc kà tá thoÃt"
 
-#: ../glib/gkeyfile.c:4280
+#: ../glib/gkeyfile.c:4253
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "KhÃng thá giái dách già trá '%s' dáng con sá."
 
-#: ../glib/gkeyfile.c:4294
+#: ../glib/gkeyfile.c:4267
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "Già trá sá nguyÃn '%s' á ngoÃi phám vi"
 
-#: ../glib/gkeyfile.c:4327
+#: ../glib/gkeyfile.c:4300
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "KhÃng thá giái dách già trá '%s' dáng con sá nái."
 
-#: ../glib/gkeyfile.c:4351
+#: ../glib/gkeyfile.c:4324
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "KhÃng thá giái dách già trá '%s' dáng bun (ÄÃng/sai)."
 
 #: ../glib/gmappedfile.c:128
 #, c-format
-#| msgid "Failed to get attributes of file '%s': fstat() failed: %s"
 msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s"
 msgstr "KhÃng láy ÄÆác cÃc thuác tÃnh cáa táp tin '%s%s%s%s': fstat() lái: %s"
 
 #: ../glib/gmappedfile.c:194
 #, c-format
-#| msgid "Failed to map file '%s': mmap() failed: %s"
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "KhÃng Ãnh xá ÄÆác táp tin '%s%s%s%s': mmap() lái: %s"
 
@@ -3386,61 +3593,61 @@ msgstr ""
 "TÃi liáu ÄÆác kát thÃc khÃng mong muán bÃn trong mát ghi chà hay hÆáng dán "
 "tián trÃnh"
 
-#: ../glib/goption.c:760
+#: ../glib/goption.c:766
 msgid "Usage:"
 msgstr "Sá dáng:"
 
-#: ../glib/goption.c:760
+#: ../glib/goption.c:766
 msgid "[OPTION...]"
 msgstr "[TÃY_CHáN...]"
 
-#: ../glib/goption.c:866
+#: ../glib/goption.c:872
 msgid "Help Options:"
 msgstr "TÃy chán trá giÃp:"
 
-#: ../glib/goption.c:867
+#: ../glib/goption.c:873
 msgid "Show help options"
 msgstr "Hián thá cÃc tÃy chán trá giÃp"
 
-#: ../glib/goption.c:873
+#: ../glib/goption.c:879
 msgid "Show all help options"
 msgstr "Hián thá mái tÃy chán trá giÃp"
 
-#: ../glib/goption.c:935
+#: ../glib/goption.c:941
 msgid "Application Options:"
 msgstr "TÃy chán áng dáng:"
 
-#: ../glib/goption.c:997 ../glib/goption.c:1067
+#: ../glib/goption.c:1003 ../glib/goption.c:1073
 #, c-format
 msgid "Cannot parse integer value '%s' for %s"
 msgstr "KhÃng phÃn tÃch già trá sá nguyÃn  %s  cho %s."
 
-#: ../glib/goption.c:1007 ../glib/goption.c:1075
+#: ../glib/goption.c:1013 ../glib/goption.c:1081
 #, c-format
 msgid "Integer value '%s' for %s out of range"
 msgstr "Già trá sá nguyÃn '%s' cho %s á ngoÃi phám vi."
 
-#: ../glib/goption.c:1032
+#: ../glib/goption.c:1038
 #, c-format
 msgid "Cannot parse double value '%s' for %s"
 msgstr "KhÃng thá phÃn tÃch già trá ÄÃi '%s' cho %s"
 
-#: ../glib/goption.c:1040
+#: ../glib/goption.c:1046
 #, c-format
 msgid "Double value '%s' for %s out of range"
 msgstr "Già trá ÄÃi '%s' cho %s á ngoÃi phám vi"
 
-#: ../glib/goption.c:1303 ../glib/goption.c:1382
+#: ../glib/goption.c:1309 ../glib/goption.c:1388
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Gáp lái khi phÃn tÃch tÃy chán %s"
 
-#: ../glib/goption.c:1413 ../glib/goption.c:1526
+#: ../glib/goption.c:1419 ../glib/goption.c:1532
 #, c-format
 msgid "Missing argument for %s"
 msgstr "Thiáu Äái sá cho %s"
 
-#: ../glib/goption.c:1957
+#: ../glib/goption.c:1985
 #, c-format
 msgid "Unknown option %s"
 msgstr "KhÃng biát tÃy chán %s."
@@ -3685,66 +3892,66 @@ msgstr "trÃn vÃng lÃm viác biÃn dách"
 msgid "previously-checked referenced subpattern not found"
 msgstr "khÃng tÃm tháy máu phá Äà tham chiáu mà Äà kiám tra trÆác"
 
-#: ../glib/gregex.c:631 ../glib/gregex.c:1754
+#: ../glib/gregex.c:631 ../glib/gregex.c:1753
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Gáp lái trong khi kháp biáu thác chÃnh quy %s: %s"
 
-#: ../glib/gregex.c:1207
+#: ../glib/gregex.c:1206
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "ThÆ vián PCRE Äà biÃn dách khÃng cà khá nÄng há trá UTF-8"
 
-#: ../glib/gregex.c:1216
+#: ../glib/gregex.c:1215
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "ThÆ vián PCRE Äà biÃn dách khÃng cà khá nÄng há trá tÃi sán UTF-8"
 
-#: ../glib/gregex.c:1272
+#: ../glib/gregex.c:1271
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Gáp lái trong khi biÃn dách biáu thác chÃnh quy %s á kà tá %d: %s"
 
-#: ../glib/gregex.c:1308
+#: ../glib/gregex.c:1307
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Gáp lái trong khi tái hÆu hoà biáu thác chÃnh quy %s: %s"
 
-#: ../glib/gregex.c:2184
+#: ../glib/gregex.c:2182
 msgid "hexadecimal digit or '}' expected"
 msgstr "Äái chá sá tháp lác hay dáu ngoác mÃc ÄÃng '}'"
 
-#: ../glib/gregex.c:2200
+#: ../glib/gregex.c:2198
 msgid "hexadecimal digit expected"
 msgstr "Äái chá sá tháp lác"
 
-#: ../glib/gregex.c:2240
+#: ../glib/gregex.c:2238
 msgid "missing '<' in symbolic reference"
 msgstr "thiáu dáu ngoác nhán má '<' trong tham chiáu tÆáng trÆng"
 
-#: ../glib/gregex.c:2249
+#: ../glib/gregex.c:2247
 msgid "unfinished symbolic reference"
 msgstr "tham chiáu tÆáng trÆng chÆa hoÃn thÃnh"
 
-#: ../glib/gregex.c:2256
+#: ../glib/gregex.c:2254
 msgid "zero-length symbolic reference"
 msgstr "tham chiáu tÆáng trÆng cà Äá dÃi sá khÃng"
 
-#: ../glib/gregex.c:2267
+#: ../glib/gregex.c:2265
 msgid "digit expected"
 msgstr "Äái chá sá"
 
-#: ../glib/gregex.c:2285
+#: ../glib/gregex.c:2283
 msgid "illegal symbolic reference"
 msgstr "tham chiáu tÆáng trÆng khÃng cho phÃp"
 
-#: ../glib/gregex.c:2347
+#: ../glib/gregex.c:2345
 msgid "stray final '\\'"
 msgstr "dáu xuyác ngÆác kát thÃc rái rÃc '\\'"
 
-#: ../glib/gregex.c:2351
+#: ../glib/gregex.c:2349
 msgid "unknown escape sequence"
 msgstr "dÃy thoÃt lá"
 
-#: ../glib/gregex.c:2361
+#: ../glib/gregex.c:2359
 #, c-format
 msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
 msgstr "Gáp lái trong khi phÃn tÃch vÄn bán thay thá '%s' á kà tá %lu: %s"
@@ -3877,93 +4084,93 @@ msgstr ""
 "Lái khÃng mong muán trong g_io_channel_win32_poll() Äác dá liáu tá tián "
 "trÃnh con"
 
-#: ../glib/gutf8.c:913
+#: ../glib/gutf8.c:915
 msgid "Character out of range for UTF-8"
 msgstr "KÃ tá nám ngoÃi vÃng UTF-8"
 
-#: ../glib/gutf8.c:1013 ../glib/gutf8.c:1022 ../glib/gutf8.c:1152
-#: ../glib/gutf8.c:1161 ../glib/gutf8.c:1300 ../glib/gutf8.c:1396
+#: ../glib/gutf8.c:1015 ../glib/gutf8.c:1024 ../glib/gutf8.c:1154
+#: ../glib/gutf8.c:1163 ../glib/gutf8.c:1302 ../glib/gutf8.c:1398
 msgid "Invalid sequence in conversion input"
 msgstr "Sequence bát háp lá trong Äáu vÃo chuyán Äái"
 
-#: ../glib/gutf8.c:1311 ../glib/gutf8.c:1407
+#: ../glib/gutf8.c:1313 ../glib/gutf8.c:1409
 msgid "Character out of range for UTF-16"
 msgstr "KÃ tá nám ngoÃi vÃng UTF-16"
 
-#: ../glib/gutils.c:2167 ../glib/gutils.c:2194 ../glib/gutils.c:2298
+#: ../glib/gutils.c:2166 ../glib/gutils.c:2193 ../glib/gutils.c:2297
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 
-#: ../glib/gutils.c:2173
+#: ../glib/gutils.c:2172
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2175
+#: ../glib/gutils.c:2174
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2178
+#: ../glib/gutils.c:2177
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2181
+#: ../glib/gutils.c:2180
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2184
+#: ../glib/gutils.c:2183
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2187
+#: ../glib/gutils.c:2186
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2200
+#: ../glib/gutils.c:2199
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2203 ../glib/gutils.c:2311
+#: ../glib/gutils.c:2202 ../glib/gutils.c:2310
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2206 ../glib/gutils.c:2316
+#: ../glib/gutils.c:2205 ../glib/gutils.c:2315
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2208 ../glib/gutils.c:2321
+#: ../glib/gutils.c:2207 ../glib/gutils.c:2320
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2211 ../glib/gutils.c:2326
+#: ../glib/gutils.c:2210 ../glib/gutils.c:2325
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2214 ../glib/gutils.c:2331
+#: ../glib/gutils.c:2213 ../glib/gutils.c:2330
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2251
+#: ../glib/gutils.c:2250
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
 msgstr[0] "%s byte"
 
-#: ../glib/gutils.c:2306
+#: ../glib/gutils.c:2305
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
@@ -4055,9 +4262,6 @@ msgstr "%.1f KB"
 #~ msgid "Specify the path for the schema"
 #~ msgstr "XÃc Äánh ÄÆáng dán cho schema"
 
-#~ msgid "PATH"
-#~ msgstr "ÄÆáNG DáN"
-
 #~ msgid ""
 #~ "Arguments:\n"
 #~ "  SCHEMA      The id of the schema\n"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]