[glib] Update Simplified Chinese translation.



commit 3d1c463b48a6d54b671d7c8f39a7b4efba636d2b
Author: Aron Xu <aronxu gnome org>
Date:   Tue Sep 14 16:35:31 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1307 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 827 insertions(+), 480 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ddfd8e0..18fa9a5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-09 14:12+0800\n"
-"PO-Revision-Date: 2010-08-09 14:26+0800\n"
+"POT-Creation-Date: 2010-09-14 11:56+0800\n"
+"PO-Revision-Date: 2010-09-14 16:34+0800\n"
 "Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -95,206 +95,432 @@ msgstr "没æ??å??为â??%sâ??ç??åº?ç?¨ç¨?åº?为â??%sâ??注å??书签"
 msgid "Failed to expand exec line '%s' with URI '%s'"
 msgstr "ç?¨ URIâ??%2$sâ??å±?å¼? exec è¡?â??%1$sâ??失败"
 
-#: ../glib/gconvert.c:557 ../glib/gconvert.c:635 ../glib/giochannel.c:1403
+#: ../glib/gconvert.c:567 ../glib/gconvert.c:645 ../glib/giochannel.c:1403
 #: ../gio/gcharsetconverter.c:458
 #, c-format
 msgid "Conversion from character set '%s' to '%s' is not supported"
 msgstr "ä¸?æ?¯æ??ä»?å­?符é??â??%sâ??å?°â??%sâ??ç??转æ?¢"
 
-#: ../glib/gconvert.c:561 ../glib/gconvert.c:639
+#: ../glib/gconvert.c:571 ../glib/gconvert.c:649
 #: ../gio/gcharsetconverter.c:462
 #, c-format
 msgid "Could not open converter from '%s' to '%s'"
 msgstr "æ? æ³?æ??å¼?ä»?â??%sâ??å?°â??%sâ??ç??转æ?¢å?¨"
 
-#: ../glib/gconvert.c:758 ../glib/gconvert.c:1151 ../glib/giochannel.c:1575
-#: ../glib/giochannel.c:1617 ../glib/giochannel.c:2461 ../glib/gutf8.c:988
-#: ../glib/gutf8.c:1443 ../gio/gcharsetconverter.c:345
+#: ../glib/gconvert.c:768 ../glib/gconvert.c:1161 ../glib/giochannel.c:1575
+#: ../glib/giochannel.c:1617 ../glib/giochannel.c:2461 ../glib/gutf8.c:992
+#: ../glib/gutf8.c:1447 ../gio/gcharsetconverter.c:345
 msgid "Invalid byte sequence in conversion input"
 msgstr "转æ?¢è¾?å?¥ä¸­å?ºç?°æ? æ??å­?符åº?å??"
 
-#: ../glib/gconvert.c:766 ../glib/gconvert.c:1076 ../glib/giochannel.c:1582
+#: ../glib/gconvert.c:776 ../glib/gconvert.c:1086 ../glib/giochannel.c:1582
 #: ../glib/giochannel.c:2473 ../gio/gcharsetconverter.c:350
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "转æ?¢è¿?ç¨?中å?ºé??ï¼?%s"
 
-#: ../glib/gconvert.c:798 ../glib/gutf8.c:984 ../glib/gutf8.c:1194
-#: ../glib/gutf8.c:1335 ../glib/gutf8.c:1439
+#: ../glib/gconvert.c:808 ../glib/gutf8.c:988 ../glib/gutf8.c:1198
+#: ../glib/gutf8.c:1339 ../glib/gutf8.c:1443
 msgid "Partial character sequence at end of input"
 msgstr "è¾?å?¥æ?«å°¾å?ºç?°æ?ªå°½å­?符åº?å??"
 
-#: ../glib/gconvert.c:1048
+#: ../glib/gconvert.c:1058
 #, c-format
 msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgstr "æ? æ³?转æ?¢å??å¤?å­?符é??â??%sâ??å?°å­?符é??â??%sâ??"
 
-#: ../glib/gconvert.c:1871
+#: ../glib/gconvert.c:1881
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
 msgstr "URIâ??%sâ??ä¸?æ?¯â??fileâ??æ ¼å¼?ç??ç»?对 URI"
 
-#: ../glib/gconvert.c:1881
+#: ../glib/gconvert.c:1891
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "æ?¬å?°æ??件 URIâ??%sâ??ä¸?è?½å??å?«â??#â??"
 
-#: ../glib/gconvert.c:1898
+#: ../glib/gconvert.c:1908
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "URIâ??%sâ??æ? æ??"
 
-#: ../glib/gconvert.c:1910
+#: ../glib/gconvert.c:1920
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "URI中ç??主æ?ºå??â??%sâ??æ? æ??"
 
-#: ../glib/gconvert.c:1926
+#: ../glib/gconvert.c:1936
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "URIâ??%sâ??中å??å?«æ? æ??ç??转ä¹?å­?符"
 
-#: ../glib/gconvert.c:2021
+#: ../glib/gconvert.c:2031
 #, c-format
 msgid "The pathname '%s' is not an absolute path"
 msgstr "è·¯å¾?å??â??%sâ??ä¸?æ?¯ç»?对路å¾?"
 
-#: ../glib/gconvert.c:2031
+#: ../glib/gconvert.c:2041
 msgid "Invalid hostname"
 msgstr "æ? æ??ç??主æ?ºå??"
 
-#: ../glib/gdir.c:111 ../glib/gdir.c:134
+#. Translators: 'before midday' indicator
+#: ../glib/gdatetime.c:105
+msgctxt "GDateTime"
+msgid "am"
+msgstr "�"
+
+#. Translators: 'before midday' indicator
+#: ../glib/gdatetime.c:107
+msgctxt "GDateTime"
+msgid "AM"
+msgstr "ä¸?å??"
+
+#. Translators: 'after midday' indicator
+#: ../glib/gdatetime.c:109
+msgctxt "GDateTime"
+msgid "pm"
+msgstr "�"
+
+#. Translators: 'after midday' indicator
+#: ../glib/gdatetime.c:111
+msgctxt "GDateTime"
+msgid "PM"
+msgstr "ä¸?å??"
+
+#. Translators: this is the preferred format for expressing the date
+#: ../glib/gdatetime.c:120
+msgctxt "GDateTime"
+msgid "%m/%d/%y"
+msgstr "%m/%d/%y"
+
+#. Translators: this is the preferred format for expressing the time
+#: ../glib/gdatetime.c:123
+msgctxt "GDateTime"
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#: ../glib/gdatetime.c:168
+msgctxt "full month name"
+msgid "January"
+msgstr "ä¸?æ??"
+
+#: ../glib/gdatetime.c:170
+msgctxt "full month name"
+msgid "February"
+msgstr "äº?æ??"
+
+#: ../glib/gdatetime.c:172
+msgctxt "full month name"
+msgid "March"
+msgstr "ä¸?æ??"
+
+#: ../glib/gdatetime.c:174
+msgctxt "full month name"
+msgid "April"
+msgstr "å??æ??"
+
+#: ../glib/gdatetime.c:176
+msgctxt "full month name"
+msgid "May"
+msgstr "äº?æ??"
+
+#: ../glib/gdatetime.c:178
+msgctxt "full month name"
+msgid "June"
+msgstr "å?­æ??"
+
+#: ../glib/gdatetime.c:180
+msgctxt "full month name"
+msgid "July"
+msgstr "ä¸?æ??"
+
+#: ../glib/gdatetime.c:182
+msgctxt "full month name"
+msgid "August"
+msgstr "å?«æ??"
+
+#: ../glib/gdatetime.c:184
+msgctxt "full month name"
+msgid "September"
+msgstr "ä¹?æ??"
+
+#: ../glib/gdatetime.c:186
+msgctxt "full month name"
+msgid "October"
+msgstr "å??æ??"
+
+#: ../glib/gdatetime.c:188
+msgctxt "full month name"
+msgid "November"
+msgstr "å??ä¸?æ??"
+
+#: ../glib/gdatetime.c:190
+msgctxt "full month name"
+msgid "December"
+msgstr "å??äº?æ??"
+
+#: ../glib/gdatetime.c:205
+msgctxt "abbreviated month name"
+msgid "Jan"
+msgstr "01æ??"
+
+#: ../glib/gdatetime.c:207
+msgctxt "abbreviated month name"
+msgid "Feb"
+msgstr "02æ??"
+
+#: ../glib/gdatetime.c:209
+msgctxt "abbreviated month name"
+msgid "Mar"
+msgstr "03æ??"
+
+#: ../glib/gdatetime.c:211
+msgctxt "abbreviated month name"
+msgid "Apr"
+msgstr "04æ??"
+
+#: ../glib/gdatetime.c:213
+msgctxt "abbreviated month name"
+msgid "May"
+msgstr "05æ??"
+
+#: ../glib/gdatetime.c:215
+msgctxt "abbreviated month name"
+msgid "Jun"
+msgstr "06æ??"
+
+#: ../glib/gdatetime.c:217
+msgctxt "abbreviated month name"
+msgid "Jul"
+msgstr "07æ??"
+
+#: ../glib/gdatetime.c:219
+msgctxt "abbreviated month name"
+msgid "Aug"
+msgstr "08æ??"
+
+#: ../glib/gdatetime.c:221
+msgctxt "abbreviated month name"
+msgid "Sep"
+msgstr "09æ??"
+
+#: ../glib/gdatetime.c:223
+msgctxt "abbreviated month name"
+msgid "Oct"
+msgstr "10æ??"
+
+#: ../glib/gdatetime.c:225
+msgctxt "abbreviated month name"
+msgid "Nov"
+msgstr "11æ??"
+
+#: ../glib/gdatetime.c:227
+msgctxt "abbreviated month name"
+msgid "Dec"
+msgstr "12æ??"
+
+#: ../glib/gdatetime.c:242
+msgctxt "full weekday name"
+msgid "Monday"
+msgstr "æ??æ??ä¸?"
+
+#: ../glib/gdatetime.c:244
+msgctxt "full weekday name"
+msgid "Tuesday"
+msgstr "æ??æ??äº?"
+
+#: ../glib/gdatetime.c:246
+msgctxt "full weekday name"
+msgid "Wednesday"
+msgstr "æ??æ??ä¸?"
+
+#: ../glib/gdatetime.c:248
+msgctxt "full weekday name"
+msgid "Thursday"
+msgstr "æ??æ??å??"
+
+#: ../glib/gdatetime.c:250
+msgctxt "full weekday name"
+msgid "Friday"
+msgstr "æ??æ??äº?"
+
+#: ../glib/gdatetime.c:252
+msgctxt "full weekday name"
+msgid "Saturday"
+msgstr "æ??æ??å?­"
+
+#: ../glib/gdatetime.c:254
+msgctxt "full weekday name"
+msgid "Sunday"
+msgstr "æ??æ??æ?¥"
+
+#: ../glib/gdatetime.c:269
+msgctxt "abbreviated weekday name"
+msgid "Mon"
+msgstr "�"
+
+#: ../glib/gdatetime.c:271
+msgctxt "abbreviated weekday name"
+msgid "Tue"
+msgstr "�"
+
+#: ../glib/gdatetime.c:273
+msgctxt "abbreviated weekday name"
+msgid "Wed"
+msgstr "�"
+
+#: ../glib/gdatetime.c:275
+msgctxt "abbreviated weekday name"
+msgid "Thu"
+msgstr "å??"
+
+#: ../glib/gdatetime.c:277
+msgctxt "abbreviated weekday name"
+msgid "Fri"
+msgstr "�"
+
+#: ../glib/gdatetime.c:279
+msgctxt "abbreviated weekday name"
+msgid "Sat"
+msgstr "å?­"
+
+#: ../glib/gdatetime.c:281
+msgctxt "abbreviated weekday name"
+msgid "Sun"
+msgstr "æ?¥"
+
+#: ../glib/gdir.c:114 ../glib/gdir.c:137
 #, c-format
 msgid "Error opening directory '%s': %s"
 msgstr "æ??å¼?ç?®å½?â??%sâ??æ?¶å??ç??é??误ï¼?%s"
 
-#: ../glib/gfileutils.c:535 ../glib/gfileutils.c:623
+#: ../glib/gfileutils.c:536 ../glib/gfileutils.c:624
 #, c-format
 msgid "Could not allocate %lu bytes to read file \"%s\""
 msgstr "æ? æ³?å??é?? %lu å­?è??以读å??æ??件â??%sâ??"
 
-#: ../glib/gfileutils.c:550
+#: ../glib/gfileutils.c:551
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "读å??æ??件â??%sâ??å?ºé??ï¼?%s"
 
-#: ../glib/gfileutils.c:564
+#: ../glib/gfileutils.c:565
 #, c-format
 msgid "File \"%s\" is too large"
 msgstr "æ??件â??%sâ??太大"
 
-#: ../glib/gfileutils.c:647
+#: ../glib/gfileutils.c:648
 #, c-format
 msgid "Failed to read from file '%s': %s"
 msgstr "读å??æ??件â??%sâ??失败ï¼?%s"
 
-#: ../glib/gfileutils.c:698 ../glib/gfileutils.c:785
+#: ../glib/gfileutils.c:699 ../glib/gfileutils.c:786
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "æ??å¼?æ??件â??%sâ??失败ï¼?%s"
 
-#: ../glib/gfileutils.c:715 ../glib/gmappedfile.c:169
+#: ../glib/gfileutils.c:716 ../glib/gmappedfile.c:169
 #, c-format
 msgid "Failed to get attributes of file '%s': fstat() failed: %s"
 msgstr "è?·å¾?æ??件â??%sâ??ç??å±?æ?§å¤±è´¥ï¼?fstat() 失败ï¼?%s"
 
-#: ../glib/gfileutils.c:749
+#: ../glib/gfileutils.c:750
 #, c-format
 msgid "Failed to open file '%s': fdopen() failed: %s"
 msgstr "æ??å¼?æ??件â??%sâ??失败ï¼?fdopen() 失败ï¼?%s"
 
-#: ../glib/gfileutils.c:857
+#: ../glib/gfileutils.c:858
 #, c-format
 msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
 msgstr "å°?æ??件â??%sâ??é??å?½å??为â??%sâ??失败ï¼?g_rename() 失败ï¼?%s"
 
-#: ../glib/gfileutils.c:899 ../glib/gfileutils.c:1365
+#: ../glib/gfileutils.c:900 ../glib/gfileutils.c:1369
 #, c-format
 msgid "Failed to create file '%s': %s"
 msgstr "å??建æ??件â??%sâ??失败ï¼?%s"
 
-#: ../glib/gfileutils.c:913
+#: ../glib/gfileutils.c:914
 #, c-format
 msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
 msgstr "æ??å¼?æ??件â??%sâ??å??å?¥å¤±è´¥ï¼?fdopen() 失败ï¼?%s"
 
-#: ../glib/gfileutils.c:938
+#: ../glib/gfileutils.c:939
 #, c-format
 msgid "Failed to write file '%s': fwrite() failed: %s"
 msgstr "å??å?¥æ??件â??%sâ??失败ï¼?fwrite() 失败ï¼?%s"
 
-#: ../glib/gfileutils.c:957
+#: ../glib/gfileutils.c:958
 #, c-format
 msgid "Failed to write file '%s': fflush() failed: %s"
 msgstr "å??å?¥æ??件â??%sâ??失败ï¼?fflush() 失败ï¼?%s"
 
-#: ../glib/gfileutils.c:986
+#: ../glib/gfileutils.c:987
 #, c-format
 msgid "Failed to write file '%s': fsync() failed: %s"
 msgstr "å??å?¥æ??件â??%sâ??失败ï¼?fsync() 失败ï¼?%s"
 
-#: ../glib/gfileutils.c:1005
+#: ../glib/gfileutils.c:1006
 #, c-format
 msgid "Failed to close file '%s': fclose() failed: %s"
 msgstr "å?³é?­æ??件â??%sâ??失败ï¼?fclose() 失败ï¼?%s"
 
-#: ../glib/gfileutils.c:1123
+#: ../glib/gfileutils.c:1127
 #, c-format
 msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
 msgstr "æ? æ³?å? é?¤å·²æ??æ??件â??%sâ??ï¼?g_unlink() 失败ï¼?%s"
 
-#: ../glib/gfileutils.c:1327
+#: ../glib/gfileutils.c:1331
 #, c-format
 msgid "Template '%s' invalid, should not contain a '%s'"
 msgstr "模æ?¿â??%sâ??æ? æ??ï¼?ä¸?åº?该å??å?«â??%sâ??"
 
-#: ../glib/gfileutils.c:1340
+#: ../glib/gfileutils.c:1344
 #, c-format
 msgid "Template '%s' doesn't contain XXXXXX"
 msgstr "模æ?¿â??%sâ??ä¸?å??å?« XXXXXX"
 
-#: ../glib/gfileutils.c:1773
+#: ../glib/gfileutils.c:1777
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u å­?è??"
 
-#: ../glib/gfileutils.c:1781
+#: ../glib/gfileutils.c:1785
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../glib/gfileutils.c:1786
+#: ../glib/gfileutils.c:1790
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gfileutils.c:1791
+#: ../glib/gfileutils.c:1795
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gfileutils.c:1796
+#: ../glib/gfileutils.c:1800
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gfileutils.c:1801
+#: ../glib/gfileutils.c:1805
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gfileutils.c:1806
+#: ../glib/gfileutils.c:1810
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../glib/gfileutils.c:1849
+#: ../glib/gfileutils.c:1853
 #, c-format
 msgid "Failed to read the symbolic link '%s': %s"
 msgstr "读å??符å?·é?¾æ?¥â??%sâ??失败ï¼?%s"
 
-#: ../glib/gfileutils.c:1870
+#: ../glib/gfileutils.c:1874
 msgid "Symbolic links not supported"
 msgstr "ä¸?æ?¯æ??符å?·é?¾æ?¥"
 
@@ -330,32 +556,32 @@ msgstr "æ??å¼?æ??件â??%sâ??失败ï¼?open() 失败ï¼?%s"
 msgid "Failed to map file '%s': mmap() failed: %s"
 msgstr "æ? å°?æ??件â??%sâ??失败ï¼?mmap() 失败ï¼?%s"
 
-#: ../glib/gmarkup.c:302 ../glib/gmarkup.c:342
+#: ../glib/gmarkup.c:307 ../glib/gmarkup.c:347
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "第 %d è¡?第 %d 个å­?符å?ºé??ï¼?"
 
-#: ../glib/gmarkup.c:362 ../glib/gmarkup.c:440
+#: ../glib/gmarkup.c:367 ../glib/gmarkup.c:445
 #, c-format
 msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
 msgstr "æ? æ??ç?? UTF-8 ç¼?ç ?ç??æ??æ?¬å??称 -â??%sâ??æ? æ??"
 
-#: ../glib/gmarkup.c:373
+#: ../glib/gmarkup.c:378
 #, c-format
 msgid "'%s' is not a valid name "
 msgstr "â??%sâ??ä¸?æ?¯æ??æ??ç??å??称"
 
-#: ../glib/gmarkup.c:389
+#: ../glib/gmarkup.c:394
 #, c-format
 msgid "'%s' is not a valid name: '%c' "
 msgstr "â??%sâ??ä¸?æ?¯æ??æ??ç??å??称ï¼?â??%câ??"
 
-#: ../glib/gmarkup.c:493
+#: ../glib/gmarkup.c:498
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "第 %d è¡?å?ºé??ï¼?%s"
 
-#: ../glib/gmarkup.c:577
+#: ../glib/gmarkup.c:582
 #, c-format
 msgid ""
 "Failed to parse '%-.*s', which should have been a digit inside a character "
@@ -363,7 +589,7 @@ msgid ""
 msgstr ""
 "解æ??â??%-.*sâ??失败ã??å®?åº?该æ?¯å­?符å¼?ç?¨ä¸­ç??æ?°å­?(å¦? &#234;) - å?¯è?½è¯¥æ?°å­?太大äº?"
 
-#: ../glib/gmarkup.c:589
+#: ../glib/gmarkup.c:594
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
 "ampersand character without intending to start an entity - escape ampersand "
@@ -372,22 +598,22 @@ msgstr ""
 "å­?符å¼?ç?¨æ²¡æ??以å??å?·ç»?æ??ã??å¾?å?¯è?½æ?¨ä½¿ç?¨äº? & å­?符è??å??ä¸?æ?¯ä¸?个å®?ä½? - å°?è¿?个 & å??"
 "为 &amp;"
 
-#: ../glib/gmarkup.c:615
+#: ../glib/gmarkup.c:620
 #, c-format
 msgid "Character reference '%-.*s' does not encode a permitted character"
 msgstr "å­?符å¼?ç?¨â??%-.*sâ??ä¸?æ?¯ç¼?ç ?ä¸?个被å??许ç??å­?符"
 
-#: ../glib/gmarkup.c:653
+#: ../glib/gmarkup.c:658
 msgid ""
 "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr "å??ç?°ç©ºç??å®?ä½?â??&;â??ã??æ??æ??ç??å®?ä½?为ï¼?&amp; &quot; &lt; &gt; &apos;"
 
-#: ../glib/gmarkup.c:661
+#: ../glib/gmarkup.c:666
 #, c-format
 msgid "Entity name '%-.*s' is not known"
 msgstr "æ?ªç?¥ç??å®?ä½?å??â??%-.*sâ??"
 
-#: ../glib/gmarkup.c:666
+#: ../glib/gmarkup.c:671
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
 "character without intending to start an entity - escape ampersand as &amp;"
@@ -395,31 +621,31 @@ msgstr ""
 "å®?ä½?没æ??以å??å?·ç»?æ??ã??å¾?å?¯è?½æ?¨ä½¿ç?¨äº? & å­?符è??å??ä¸?æ?¯ä¸?个å®?ä½? - å°?è¿?个 & å??为 "
 "&amp;"
 
-#: ../glib/gmarkup.c:1013
+#: ../glib/gmarkup.c:1018
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "æ??æ¡£å¿?须以ä¸?个å??ç´ å¼?å§?(ä¾?å¦? <book>)"
 
-#: ../glib/gmarkup.c:1053
+#: ../glib/gmarkup.c:1058
 #, c-format
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
 "element name"
 msgstr "â??%sâ??å?ºç?°å?¨å­?符â??<â??å??æ?¯æ? æ??å­?符ï¼?å®?ä¸?è?½ä½?为å??ç´ å??ç??å¼?头"
 
-#: ../glib/gmarkup.c:1121
+#: ../glib/gmarkup.c:1126
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' character to end the empty-element tag '%"
 "s'"
 msgstr "å­?符â??%sâ??æ? æ??ï¼?åº?该以å­?符â??>â??æ?¥ç»?æ??空å??ç´ æ ?è®°â??%sâ??"
 
-#: ../glib/gmarkup.c:1205
+#: ../glib/gmarkup.c:1210
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
 msgstr "å­?符â??%sâ??æ? æ??ï¼?å?¨å±?æ?§å??â??%sâ??(å??ç´ â??%sâ??)ç??å??åº?该æ?¯å­?符â??=â??"
 
-#: ../glib/gmarkup.c:1246
+#: ../glib/gmarkup.c:1251
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' or '/' character to end the start tag of "
@@ -429,87 +655,87 @@ msgstr ""
 "å­?符â??%sâ??æ? æ??ï¼?åº?该以â??>â??æ??â??/â??ç»?æ??å??ç´ â??%sâ??ç??èµ·å§?æ ?è®°ï¼?æ??ç´§è·?该å??ç´ ç??å±?æ?§ï¼?å?¯è?½"
 "æ?¨å?¨å±?æ?§å??中使ç?¨äº?æ? æ??å­?符"
 
-#: ../glib/gmarkup.c:1290
+#: ../glib/gmarkup.c:1295
 #, c-format
 msgid ""
 "Odd character '%s', expected an open quote mark after the equals sign when "
 "giving value for attribute '%s' of element '%s'"
 msgstr "å­?符â??%sâ??æ? æ??ï¼?å?¨ç»?å±?æ?§â??%sâ??(å??ç´ â??%sâ??)èµ?å?¼æ?¶ï¼?å?¨ç­?å?·å??åº?该æ?¯å¼?å?·"
 
-#: ../glib/gmarkup.c:1424
+#: ../glib/gmarkup.c:1429
 #, c-format
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
 msgstr "â??%sâ??å?ºç?°å?¨å­?符â??</â??å??æ? æ??ï¼?â??%sâ??ä¸?è?½ä½?为å??ç´ å??ç??å¼?头"
 
-#: ../glib/gmarkup.c:1460
+#: ../glib/gmarkup.c:1465
 #, c-format
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
 "allowed character is '>'"
 msgstr "â??%sâ??å?ºç?°å?¨ç»?æ??ç??å??ç´ å??â??%sâ??å??æ? æ??ï¼?å??许ç??å­?符æ?¯â??>â??"
 
-#: ../glib/gmarkup.c:1471
+#: ../glib/gmarkup.c:1476
 #, c-format
 msgid "Element '%s' was closed, no element is currently open"
 msgstr "å??ç´ â??%sâ??å·²ç»?ç»?æ??ï¼?没æ??æ?ªç»?æ??ç??å??ç´ "
 
-#: ../glib/gmarkup.c:1480
+#: ../glib/gmarkup.c:1485
 #, c-format
 msgid "Element '%s' was closed, but the currently open element is '%s'"
 msgstr "å??ç´ â??%sâ??å·²ç»?ç»?æ??ï¼?å½?å??æ?ªç»?æ??ç??å??ç´ æ?¯â??%sâ??"
 
-#: ../glib/gmarkup.c:1647
+#: ../glib/gmarkup.c:1652
 msgid "Document was empty or contained only whitespace"
 msgstr "æ??档为空æ??ä»?å?«ç©ºç?½å­?符"
 
-#: ../glib/gmarkup.c:1661
+#: ../glib/gmarkup.c:1666
 msgid "Document ended unexpectedly just after an open angle bracket '<'"
 msgstr "æ??æ¡£å?¨ä¸?个æ??å¼?ç??å°?æ?¬å?·â??<â??å??æ??å¤?ç»?æ??"
 
-#: ../glib/gmarkup.c:1669 ../glib/gmarkup.c:1714
+#: ../glib/gmarkup.c:1674 ../glib/gmarkup.c:1719
 #, c-format
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
 msgstr "æ??æ¡£å?¨è¿?å­?å?¨æ?ªç»?æ??å??ç´ æ?¶æ??å¤?ç»?æ?? - æ??å??ç??æ?ªç»?æ??å??ç´ æ?¯â??%sâ??"
 
-#: ../glib/gmarkup.c:1677
+#: ../glib/gmarkup.c:1682
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
 "the tag <%s/>"
 msgstr "æ??æ¡£æ??å¤?ç»?æ??ï¼?åº?该以å?³å°?æ?¬å?·â??>â??æ?¥ç»?æ??æ ?è®° <%s/>"
 
-#: ../glib/gmarkup.c:1683
+#: ../glib/gmarkup.c:1688
 msgid "Document ended unexpectedly inside an element name"
 msgstr "æ??æ¡£å?¨å??ç´ å??中æ??å¤?ç»?æ??"
 
-#: ../glib/gmarkup.c:1689
+#: ../glib/gmarkup.c:1694
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "æ??æ¡£å?¨å±?æ?§å??中æ??å¤?ç»?æ??"
 
-#: ../glib/gmarkup.c:1694
+#: ../glib/gmarkup.c:1699
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "æ??æ¡£å?¨å??ç´ èµ·å§?æ ?记中æ??å¤?ç»?æ??"
 
-#: ../glib/gmarkup.c:1700
+#: ../glib/gmarkup.c:1705
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
 msgstr "æ??æ¡£å?¨è·?å?¨å±?æ?§å??å??ç??ç­?å?·å??æ??å¤?ç»?æ??ï¼?没æ??å±?æ?§å?¼"
 
-#: ../glib/gmarkup.c:1707
+#: ../glib/gmarkup.c:1712
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "æ??æ¡£å?¨å±?æ?§å?¼ä¸­æ??å¤?ç»?æ??"
 
-#: ../glib/gmarkup.c:1723
+#: ../glib/gmarkup.c:1728
 #, c-format
 msgid "Document ended unexpectedly inside the close tag for element '%s'"
 msgstr "æ??æ¡£å?¨å??ç´ â??%sâ??ç»?æ??æ ?记中æ??å¤?ç»?æ??"
 
-#: ../glib/gmarkup.c:1729
+#: ../glib/gmarkup.c:1734
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr "æ??æ¡£å?¨æ³¨é??æ??å¤?ç??æ??令中æ??å¤?ç»?æ??"
 
@@ -835,17 +1061,17 @@ msgstr "æ??æ?¬ä¸ºç©º(æ??ä»?å?«ç©ºç?½å­?符)"
 msgid "Failed to read data from child process"
 msgstr "ä»?å­?è¿?ç¨?中读å??æ?°æ?®å¤±è´¥"
 
-#: ../glib/gspawn-win32.c:299 ../glib/gspawn.c:1479
+#: ../glib/gspawn-win32.c:299 ../glib/gspawn.c:1486
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "å??建ä¸?å­?è¿?ç¨?é??讯ç??管é??失败(%s)"
 
-#: ../glib/gspawn-win32.c:338 ../glib/gspawn-win32.c:346 ../glib/gspawn.c:1138
+#: ../glib/gspawn-win32.c:338 ../glib/gspawn-win32.c:346 ../glib/gspawn.c:1145
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "ä»?å­?管é??中读å??失败(%s)"
 
-#: ../glib/gspawn-win32.c:369 ../glib/gspawn.c:1345
+#: ../glib/gspawn-win32.c:369 ../glib/gspawn.c:1352
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "æ?´æ?¹å?°ç?®å½?â??%sâ??失败(%s)"
@@ -888,119 +1114,119 @@ msgid ""
 "process"
 msgstr "g_io_channel_win32_poll() ä»?å­?è¿?ç¨?中读å??æ?°æ?®æ?¶å?ºç?°å¼?常é??误"
 
-#: ../glib/gspawn.c:189
+#: ../glib/gspawn.c:196
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "ä»?å­?è¿?ç¨?中读å??æ?°æ?®å¤±è´¥(%s)"
 
-#: ../glib/gspawn.c:328
+#: ../glib/gspawn.c:335
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "select() å?¨ä»?å­?è¿?ç¨?中读å??æ?°æ?®æ?¶å?ºç?°å¼?常é??误 (%s)"
 
-#: ../glib/gspawn.c:413
+#: ../glib/gspawn.c:420
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "waitpid() å?ºç?°å¼?常é??误 (%s)"
 
-#: ../glib/gspawn.c:1205
+#: ../glib/gspawn.c:1212
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "fork 失败(%s)"
 
-#: ../glib/gspawn.c:1355
+#: ../glib/gspawn.c:1362
 #, c-format
 msgid "Failed to execute child process \"%s\" (%s)"
 msgstr "æ?§è¡?å­?è¿?ç¨?â??%sâ??失败(%s)"
 
-#: ../glib/gspawn.c:1365
+#: ../glib/gspawn.c:1372
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "é??å®?å??å­?è¿?ç¨?(%s)ç??è¾?å?¥æ??è¾?å?ºå¤±è´¥"
 
-#: ../glib/gspawn.c:1374
+#: ../glib/gspawn.c:1381
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "fork ���失败 (%s)"
 
-#: ../glib/gspawn.c:1382
+#: ../glib/gspawn.c:1389
 #, c-format
 msgid "Unknown error executing child process \"%s\""
 msgstr "æ?§è¡?å­?è¿?ç¨?â??%sâ??æ?¶å?ºç?°æ?ªç?¥é??误"
 
-#: ../glib/gspawn.c:1406
+#: ../glib/gspawn.c:1413
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "ä»?å­?è¿?ç¨?管é??中读å??足å¤?ç??æ?°æ?®å¤±è´¥(%s)"
 
-#: ../glib/gutf8.c:1062
+#: ../glib/gutf8.c:1066
 msgid "Character out of range for UTF-8"
 msgstr "å­?符è¶?å?º UTF-8 è??å?´"
 
-#: ../glib/gutf8.c:1162 ../glib/gutf8.c:1171 ../glib/gutf8.c:1303
-#: ../glib/gutf8.c:1312 ../glib/gutf8.c:1453 ../glib/gutf8.c:1549
+#: ../glib/gutf8.c:1166 ../glib/gutf8.c:1175 ../glib/gutf8.c:1307
+#: ../glib/gutf8.c:1316 ../glib/gutf8.c:1457 ../glib/gutf8.c:1553
 msgid "Invalid sequence in conversion input"
 msgstr "转æ?¢è¾?å?¥ä¸­å?ºç?°æ? æ??åº?å??"
 
-#: ../glib/gutf8.c:1464 ../glib/gutf8.c:1560
+#: ../glib/gutf8.c:1468 ../glib/gutf8.c:1564
 msgid "Character out of range for UTF-16"
 msgstr "å­?符è¶?å?º UTF-16 è??å?´"
 
-#: ../glib/goption.c:756
+#: ../glib/goption.c:760
 msgid "Usage:"
 msgstr "���"
 
-#: ../glib/goption.c:756
+#: ../glib/goption.c:760
 msgid "[OPTION...]"
 msgstr "[é??项...]"
 
-#: ../glib/goption.c:862
+#: ../glib/goption.c:866
 msgid "Help Options:"
 msgstr "帮å?©é??项ï¼?"
 
-#: ../glib/goption.c:863
+#: ../glib/goption.c:867
 msgid "Show help options"
 msgstr "æ?¾ç¤ºå¸®å?©é??项"
 
-#: ../glib/goption.c:869
+#: ../glib/goption.c:873
 msgid "Show all help options"
 msgstr "æ?¾ç¤ºå?¨é?¨å¸®å?©é??项"
 
-#: ../glib/goption.c:931
+#: ../glib/goption.c:935
 msgid "Application Options:"
 msgstr "åº?ç?¨ç¨?åº?é??项ï¼?"
 
-#: ../glib/goption.c:993 ../glib/goption.c:1063
+#: ../glib/goption.c:997 ../glib/goption.c:1067
 #, c-format
 msgid "Cannot parse integer value '%s' for %s"
 msgstr "æ? æ³?å¤?ç?? %2$s æ??ç?¨ç??æ?´æ?°å?¼â??%1$sâ??"
 
-#: ../glib/goption.c:1003 ../glib/goption.c:1071
+#: ../glib/goption.c:1007 ../glib/goption.c:1075
 #, c-format
 msgid "Integer value '%s' for %s out of range"
 msgstr "%2$s æ??ç?¨ç??æ?´æ?°å?¼â??%1$sâ??è¶?å?ºè??å?´"
 
-#: ../glib/goption.c:1028
+#: ../glib/goption.c:1032
 #, c-format
 msgid "Cannot parse double value '%s' for %s"
 msgstr "æ? æ³?å¤?ç?? %2$s æ??ç?¨ç??å??精度å?¼â??%1$sâ??"
 
-#: ../glib/goption.c:1036
+#: ../glib/goption.c:1040
 #, c-format
 msgid "Double value '%s' for %s out of range"
 msgstr "%2$s æ??ç?¨ç??å??精度å?¼â??%1$sâ??è¶?å?ºè??å?´"
 
-#: ../glib/goption.c:1299 ../glib/goption.c:1378
+#: ../glib/goption.c:1303 ../glib/goption.c:1382
 #, c-format
 msgid "Error parsing option %s"
 msgstr "解æ??é??项 %s æ?¶å?ºé??"
 
-#: ../glib/goption.c:1409 ../glib/goption.c:1523
+#: ../glib/goption.c:1413 ../glib/goption.c:1527
 #, c-format
 msgid "Missing argument for %s"
 msgstr "缺å°? %s ç??å??æ?°"
 
-#: ../glib/goption.c:1918
+#: ../glib/goption.c:1922
 #, c-format
 msgid "Unknown option %s"
 msgstr "æ?ªç?¥é??项 %s"
@@ -1114,20 +1340,20 @@ msgstr "æ? æ³?å°?å?¼â??%sâ??解é??为å¸?å°?å?¼ã??"
 #: ../gio/gbufferedinputstream.c:411 ../gio/gbufferedinputstream.c:492
 #: ../gio/ginputstream.c:185 ../gio/ginputstream.c:317
 #: ../gio/ginputstream.c:556 ../gio/ginputstream.c:681
-#: ../gio/goutputstream.c:197 ../gio/goutputstream.c:720
+#: ../gio/goutputstream.c:197 ../gio/goutputstream.c:724
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr "ä¼ é??ç»? %s ç??计æ?°å?¼å¤ªå¤§äº?"
 
 #: ../gio/gbufferedinputstream.c:881 ../gio/ginputstream.c:891
-#: ../gio/giostream.c:306 ../gio/goutputstream.c:1195
+#: ../gio/giostream.c:306 ../gio/goutputstream.c:1199
 msgid "Stream is already closed"
 msgstr "�已���"
 
-#: ../gio/gcancellable.c:432 ../gio/gdbusconnection.c:1544
-#: ../gio/gdbusconnection.c:1633 ../gio/gdbusconnection.c:1811
-#: ../gio/glocalfile.c:2102 ../gio/gsimpleasyncresult.c:650
-#: ../gio/gsimpleasyncresult.c:676
+#: ../gio/gcancellable.c:432 ../gio/gdbusconnection.c:1549
+#: ../gio/gdbusconnection.c:1638 ../gio/gdbusconnection.c:1820
+#: ../gio/glocalfile.c:2102 ../gio/gsimpleasyncresult.c:755
+#: ../gio/gsimpleasyncresult.c:781
 msgid "Operation was cancelled"
 msgstr "æ??ä½?被å??æ¶?"
 
@@ -1143,7 +1369,7 @@ msgstr "è¾?å?¥ä¸­æ??ä¸?å®?æ?´ç??å¤?å­?è??åº?å??"
 msgid "Not enough space in destination"
 msgstr "ç?®æ ?没æ??足å¤?ç??空é?´"
 
-#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:805
+#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:810
 msgid "Cancellable initialization not supported"
 msgstr "ä¸?æ?¯æ??å?¯æ?¤é??ç??å??å§?å??"
 
@@ -1161,15 +1387,15 @@ msgstr "%s æ??件类å??"
 msgid "%s type"
 msgstr "%s ç±»å??"
 
-#: ../gio/gcredentials.c:220 ../gio/gcredentials.c:388
+#: ../gio/gcredentials.c:246 ../gio/gcredentials.c:441
 msgid "GCredentials is not implemented on this OS"
 msgstr "æ­¤æ??ä½?ç³»ç»?ä¸?没æ??å®?ç?° GCredentials"
 
-#: ../gio/gcredentials.c:346
+#: ../gio/gcredentials.c:396
 msgid "There is no GCredentials support for your platform"
 msgstr "æ?¨ç??ç³»ç»?å°?ä¸?æ?¯æ?? GCredentials"
 
-#: ../gio/gdatainputstream.c:310
+#: ../gio/gdatainputstream.c:311
 msgid "Unexpected early end-of-stream"
 msgstr "é??é¢?æ??ç??è¿?æ?©ç??æµ?ç»?æ??符"
 
@@ -1298,14 +1524,14 @@ msgstr "å?½ä»¤ %s 以é??é?¶ç?¶æ??æ?° %d é??å?ºï¼?%s"
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr "æ? æ³?ç¡®å®?ä¼?è¯?æ?»çº¿å?°å??(å°?æ?ªå?¨æ­¤æ??ä½?ç³»ç»?ä¸?å®?ç?°)"
 
-#: ../gio/gdbusaddress.c:1245 ../gio/gdbusconnection.c:5986
+#: ../gio/gdbusaddress.c:1245 ../gio/gdbusconnection.c:6013
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
 "- unknown value `%s'"
 msgstr "æ? æ³?ä»? DBUS_STARTER_BUS_TYPE ç?¯å¢?å??é??ç¡®å®?æ?»çº¿å?°å?? - æ?ªç?¥ç??å?¼â??%sâ??"
 
-#: ../gio/gdbusaddress.c:1254 ../gio/gdbusconnection.c:5995
+#: ../gio/gdbusaddress.c:1254 ../gio/gdbusconnection.c:6022
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -1330,7 +1556,7 @@ msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
 msgstr "ç?¨å°½äº?æ??æ??å?¯ç?¨ç??认è¯?æ?ºå?¶(å·²å°?è¯?ï¼?%s)(å?¯ç?¨ç??ï¼?%s)"
 
-#: ../gio/gdbusauth.c:1149
+#: ../gio/gdbusauth.c:1150
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "é??è¿? GDBusAuthObserver::authorize-authenticated-peer å??æ¶?"
 
@@ -1379,23 +1605,23 @@ msgstr "æ?ªå?¨ %2$s å¤?ç??å¯?é?¥ç?¯ä¸­æ?¾å?° ID 为 %1$d ç?? cookie"
 
 #: ../gio/gdbusauthmechanismsha1.c:535
 #, c-format
-msgid "Error deleting stale lock-file `%s': %s"
-msgstr "å? é?¤è¿?æ??ç??é??æ??件â??%sâ??å?ºé??ï¼?%s"
+msgid "Error deleting stale lock file `%s': %s"
+msgstr "å? é?¤å¤±æ??ç??é??æ??件â??%sâ??å?ºé??ï¼?%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:566
 #, c-format
-msgid "Error creating lock-file `%s': %s"
+msgid "Error creating lock file `%s': %s"
 msgstr "å??建é??æ??件â??%sâ??å?ºé??ï¼?%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:596
 #, c-format
-msgid "Error closing (unlinked) lock-file `%s': %s"
+msgid "Error closing (unlinked) lock file `%s': %s"
 msgstr "å?³é?­(å? é?¤)é??æ??件â??%sâ??å?ºé??ï¼?%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:606
 #, c-format
-msgid "Error unlinking lock-file `%s': %s"
-msgstr "å? é?¤é??â??%sâ??æ??件å?ºé??ï¼?%s"
+msgid "Error unlinking lock file `%s': %s"
+msgstr "å? é?¤é??æ??件â??%sâ??å?ºé??ï¼?%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:682
 #, c-format
@@ -1408,238 +1634,236 @@ msgid "(Additionally, releasing the lock for `%s' also failed: %s) "
 msgstr "(æ­¤å¤?ï¼?é??æ?¾ %s ç??é??失败ï¼?%s)"
 
 #: ../gio/gdbusconnection.c:1058 ../gio/gdbusconnection.c:1287
-#: ../gio/gdbusconnection.c:1326 ../gio/gdbusconnection.c:1644
+#: ../gio/gdbusconnection.c:1326 ../gio/gdbusconnection.c:1649
 msgid "The connection is closed"
 msgstr "��已��"
 
-#: ../gio/gdbusconnection.c:1588
+#: ../gio/gdbusconnection.c:1593
 msgid "Timeout was reached"
 msgstr "å·²å?°è¶?æ?¶é??å?¶"
 
-#: ../gio/gdbusconnection.c:2149
+#: ../gio/gdbusconnection.c:2170
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr "æ??建客æ?·ç«¯è¿?æ?¥æ?¶é??å?°ä¸?æ?¯æ??ç??æ ?å¿?"
 
-#: ../gio/gdbusconnection.c:3574 ../gio/gdbusconnection.c:3890
+#: ../gio/gdbusconnection.c:3596 ../gio/gdbusconnection.c:3914
 #, c-format
 msgid ""
 "No such interface `org.freedesktop.DBus.Properties' on object at path %s"
 msgstr "è·¯å¾? %s ç??对象ä¸?没æ?? org.freedesktop.DBus.Properties æ?¥å?£"
 
-#: ../gio/gdbusconnection.c:3645
+#: ../gio/gdbusconnection.c:3668
 #, c-format
 msgid "Error setting property `%s': Expected type `%s' but got `%s'"
 msgstr "设置å±?æ?§ %s å?ºé??ï¼?æ??æ?? %s ç±»å??ä½?å¾?å?° %s ç±»å??"
 
-#: ../gio/gdbusconnection.c:3739
+#: ../gio/gdbusconnection.c:3763
 #, c-format
 msgid "No such property `%s'"
 msgstr "�此���%s"
 
-#: ../gio/gdbusconnection.c:3751
+#: ../gio/gdbusconnection.c:3775
 #, c-format
 msgid "Property `%s' is not readable"
 msgstr "�� %s ��读"
 
-#: ../gio/gdbusconnection.c:3762
+#: ../gio/gdbusconnection.c:3786
 #, c-format
 msgid "Property `%s' is not writable"
 msgstr "å±?æ?§ %s ä¸?å?¯å??"
 
-#: ../gio/gdbusconnection.c:3832 ../gio/gdbusconnection.c:5420
+#: ../gio/gdbusconnection.c:3856 ../gio/gdbusconnection.c:5447
 #, c-format
 msgid "No such interface `%s'"
 msgstr "�此���%s"
 
-#: ../gio/gdbusconnection.c:4017
+#: ../gio/gdbusconnection.c:4044
 msgid "No such interface"
 msgstr "�此��"
 
-#: ../gio/gdbusconnection.c:4233 ../gio/gdbusconnection.c:5936
+#: ../gio/gdbusconnection.c:4260 ../gio/gdbusconnection.c:5963
 #, c-format
 msgid "No such interface `%s' on object at path %s"
 msgstr "å?¨è·¯å¾? %s ç??对象ä¸?没æ?? %s æ?¥å?£"
 
-#: ../gio/gdbusconnection.c:4285
+#: ../gio/gdbusconnection.c:4312
 #, c-format
 msgid "No such method `%s'"
 msgstr "�此���%s"
 
-#: ../gio/gdbusconnection.c:4316
+#: ../gio/gdbusconnection.c:4343
 #, c-format
 msgid "Type of message, `%s', does not match expected type `%s'"
 msgstr "æ¶?æ?¯ç??ç±»å??â??%sâ??ï¼?ä¸?é¢?æ??ç??ç±»å??â??%sâ??ä¸?å?¹é??"
 
-#: ../gio/gdbusconnection.c:4535
+#: ../gio/gdbusconnection.c:4562
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "%2$s å¤?ç??æ?¥å?£ %1$s å·²ç»?导å?ºäº?ä¸?个对象"
 
-#: ../gio/gdbusconnection.c:4729
+#: ../gio/gdbusconnection.c:4756
 #, c-format
 msgid "Method `%s' returned type `%s', but expected `%s'"
 msgstr "æ?¹æ³?â??%sâ??è¿?å??ç±»å??â??%sâ??ï¼?ä½?é¢?æ??ç??æ?¯â??%sâ??"
 
-#: ../gio/gdbusconnection.c:5531
+#: ../gio/gdbusconnection.c:5558
 #, c-format
 msgid "Method `%s' on interface `%s' with signature `%s' does not exist"
 msgstr "带æ?? %3$s ç­¾å??ç??æ?¥å?£ %2$s ä¸?ä¸?å­?å?¨ %1$s æ?¹æ³?"
 
-#: ../gio/gdbusconnection.c:5649
+#: ../gio/gdbusconnection.c:5676
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "已�为 %s 导��个��"
 
-#: ../gio/gdbusmessage.c:763
+#: ../gio/gdbusmessage.c:856
 msgid "type is INVALID"
 msgstr "ç±»å??æ? æ??"
 
-#: ../gio/gdbusmessage.c:774
+#: ../gio/gdbusmessage.c:867
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr "METHOD_CALL æ¶?æ?¯ï¼?PATH æ?? MEMBER 头å??缺失"
 
-#: ../gio/gdbusmessage.c:785
+#: ../gio/gdbusmessage.c:878
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
 msgstr "METHOD_CALL æ¶?æ?¯ï¼?REPLY_SERIAL 头å??缺失"
 
-#: ../gio/gdbusmessage.c:797
+#: ../gio/gdbusmessage.c:890
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr "é??误æ¶?æ?¯ï¼?REPLY_SERIAL æ?? ERROR_NAME 头å??缺失"
 
-#: ../gio/gdbusmessage.c:810
+#: ../gio/gdbusmessage.c:903
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr "ä¿¡å?·æ¶?æ?¯ï¼?PATHã??INTERFACE æ?? MEMBER 头å??缺失"
 
-#: ../gio/gdbusmessage.c:818
+#: ../gio/gdbusmessage.c:911
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
-msgstr ""
-"ä¿¡å?·æ¶?æ?¯ï¼?PATH 头å??æ­£å?¨ä½¿ç?¨ä¿?ç??å?¼ /org/freedesktop/DBus/Local"
+msgstr "ä¿¡å?·æ¶?æ?¯ï¼?PATH 头å??æ­£å?¨ä½¿ç?¨ä¿?ç??å?¼ /org/freedesktop/DBus/Local"
 
-#: ../gio/gdbusmessage.c:826
+#: ../gio/gdbusmessage.c:919
 msgid ""
 "SIGNAL message: The INTERFACE header field is using the reserved value org."
 "freedesktop.DBus.Local"
-msgstr ""
-"ä¿¡å?·æ¶?æ?¯ï¼?INTERFACE 头å??æ­£å?¨ä½¿ç?¨ä¿?ç??å?¼ org.freedesktop.DBus.Local"
+msgstr "ä¿¡å?·æ¶?æ?¯ï¼?INTERFACE 头å??æ­£å?¨ä½¿ç?¨ä¿?ç??å?¼ org.freedesktop.DBus.Local"
 
-#: ../gio/gdbusmessage.c:901
+#: ../gio/gdbusmessage.c:994
 #, c-format
 msgid "Wanted to read %lu bytes but got EOF"
 msgstr "æ??æ??读å?? %lu å­?è??ä½?å¾?å?° EOF"
 
-#: ../gio/gdbusmessage.c:926
+#: ../gio/gdbusmessage.c:1019
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
-"(length of string is %d). The valid UTF-8 string up until that that point "
-"was `%s'"
+"(length of string is %d). The valid UTF-8 string up until that point was `%s'"
 msgstr ""
-"æ??æ??å¾?å?°æ??æ??ç?? UTF-8 å­?符串ï¼?ä½?å?¨å­?è??å??移 %d å¤?(å­?符串é?¿åº¦ä¸º %d)å¾?å?°äº?æ? æ??ç??å­?è??ã??该ç?¹ç??æ??æ?? UTF-8 å­?符串æ?¾æ?¯ %sã??"
+"æ??æ??å¾?å?°æ??æ??ç?? UTF-8 å­?符串ï¼?ä½?å?¨å­?è??å??移 %d å¤?(å­?符串é?¿åº¦ä¸º %d)å¾?å?°äº?æ? æ??ç??"
+"å­?è??ã??该ç?¹ç??æ??æ?? UTF-8 å­?符串æ?¾æ?¯ %sã??"
 
-#: ../gio/gdbusmessage.c:939
+#: ../gio/gdbusmessage.c:1032
 #, c-format
 msgid "Expected NUL byte after the string `%s' but found byte %d"
 msgstr "æ??æ?? %s å??为 NUL å­?è??ä½?å¾?å?°å­?è?? %d"
 
-#: ../gio/gdbusmessage.c:1138
+#: ../gio/gdbusmessage.c:1231
 #, c-format
 msgid "Parsed value `%s' is not a valid D-Bus object path"
 msgstr "已解æ??ç??å?¼ %s ä¸?æ?¯æ??æ??ç?? D-Bus 对象路å¾?"
 
-#: ../gio/gdbusmessage.c:1164
+#: ../gio/gdbusmessage.c:1257
 #, c-format
 msgid "Parsed value `%s' is not a valid D-Bus signature"
 msgstr "已解æ??ç??å?¼ %s ä¸?æ?¯æ??æ??ç?? D-Bus ç­¾å??"
 
-#: ../gio/gdbusmessage.c:1218
+#: ../gio/gdbusmessage.c:1311
 #, c-format
 msgid ""
 "Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)."
 msgstr "以å¤?å¾?å?°é?¿åº¦ä¸º %u å­?è??ç??æ?°ç»?ï¼?æ??大é?¿åº¦åº?为 2<<26 å­?è??(64 MiB)ã??"
 
-#: ../gio/gdbusmessage.c:1379
+#: ../gio/gdbusmessage.c:1472
 #, c-format
 msgid "Parsed value `%s' for variant is not a valid D-Bus signature"
 msgstr "已解æ??ç??è¡?ç??å±?æ?§å?¼ %s ä¸?æ?¯æ??æ??ç?? D-Bus ç­¾å??"
 
-#: ../gio/gdbusmessage.c:1406
+#: ../gio/gdbusmessage.c:1499
 #, c-format
 msgid ""
-"Error deserializing GVariant with type-string `%s' from the D-Bus wire format"
+"Error deserializing GVariant with type string `%s' from the D-Bus wire format"
 msgstr "å?¨ä»¥ D-Bus 线格å¼?ç?¨ç±»å??å­?符串â??%sâ??å??åº?å??å?? GVariant æ?¶å??ç??é??误"
 
-#: ../gio/gdbusmessage.c:1590
+#: ../gio/gdbusmessage.c:1683
 #, c-format
 msgid ""
 "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value "
 "0x%02x"
 msgstr "æ? æ??ç??å­?è??åº?å?¼ã??æ??æ??为 0x6c (â??lâ??)æ?? 0x42 (â??Bâ??)ä½?æ?¯å??ç?°äº?å?¼ 0x%02x"
 
-#: ../gio/gdbusmessage.c:1604
+#: ../gio/gdbusmessage.c:1697
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr "æ? æ??ç??主å??è®®ç??æ?¬ã??æ??æ?? 1ï¼?ä½?æ?¯æ?¾å?°äº? %d"
 
-#: ../gio/gdbusmessage.c:1661
+#: ../gio/gdbusmessage.c:1754
 #, c-format
 msgid "Signature header with signature `%s' found but message body is empty"
 msgstr "头é?¨å¸¦æ?? %s ç­¾å??ä½?æ¶?æ?¯ä¸»ä½?为空"
 
-#: ../gio/gdbusmessage.c:1675
+#: ../gio/gdbusmessage.c:1768
 #, c-format
 msgid "Parsed value `%s' is not a valid D-Bus signature (for body)"
 msgstr "已解æ??ç??å?¼ %s ä¸?æ?¯æ??æ??ç?? D-Bus ç­¾å??(é??对æ¶?æ?¯ä¸»ä½?)"
 
-#: ../gio/gdbusmessage.c:1705
+#: ../gio/gdbusmessage.c:1798
 #, c-format
 msgid "No signature header in message but the message body is %u bytes"
 msgstr "æ¶?æ?¯ä¸­æ²¡æ??ç­¾å??ç??头é?¨ï¼?ä½?æ¶?æ?¯ä¸»ä½?为 %u å­?è??"
 
-#: ../gio/gdbusmessage.c:1713
+#: ../gio/gdbusmessage.c:1806
 msgid "Cannot deserialize message: "
 msgstr "��解串���"
 
-#: ../gio/gdbusmessage.c:2038
+#: ../gio/gdbusmessage.c:2131
 #, c-format
 msgid ""
-"Error serializing GVariant with type-string `%s' to the D-Bus wire format"
+"Error serializing GVariant with type string `%s' to the D-Bus wire format"
 msgstr "å?¨ä»¥ D-Bus 线格å¼?ç?¨ç±»å??å­?符串â??%sâ??åº?å??å?? GVariant æ?¶å??ç??é??误"
 
-#: ../gio/gdbusmessage.c:2178
+#: ../gio/gdbusmessage.c:2272
 #, c-format
 msgid "Message has %d fds but the header field indicates %d fds"
 msgstr "æ¶?æ?¯æ?¥æ?? %d 个æ??件æ??述符ï¼?ä½?æ?¯å¤´å?ºå??æ??å?º %d 个æ??件æ??述符"
 
-#: ../gio/gdbusmessage.c:2186
+#: ../gio/gdbusmessage.c:2280
 msgid "Cannot serialize message: "
 msgstr "��串����"
 
-#: ../gio/gdbusmessage.c:2230
+#: ../gio/gdbusmessage.c:2324
 #, c-format
 msgid "Message body has signature `%s' but there is no signature header"
 msgstr "æ¶?æ?¯ä¸»ä½?æ??ç­¾å?? %s ä½?头é?¨æ²¡æ??ç­¾å??"
 
-#: ../gio/gdbusmessage.c:2240
+#: ../gio/gdbusmessage.c:2334
 #, c-format
 msgid ""
 "Message body has type signature `%s' but signature in the header field is `%"
 "s'"
 msgstr "æ¶?æ?¯ä¸»ä½?æ??ç±»å??ç­¾å?? %s ä½?头é?¨ç??ç­¾å??为 %s"
 
-#: ../gio/gdbusmessage.c:2256
+#: ../gio/gdbusmessage.c:2350
 #, c-format
 msgid "Message body is empty but signature in the header field is `(%s)'"
 msgstr "æ¶?æ?¯ä¸»ä½?为空ï¼?ä½?头é?¨æ??ç­¾å?? %s"
 
-#: ../gio/gdbusmessage.c:2810
+#: ../gio/gdbusmessage.c:2907
 #, c-format
 msgid "Error return with body of type `%s'"
 msgstr "è¿?å??主ä½?ç±»å?? %s å?ºé??"
 
-#: ../gio/gdbusmessage.c:2818
+#: ../gio/gdbusmessage.c:2915
 msgid "Error return with empty body"
 msgstr "è¿?å??空主ä½?å?ºé??"
 
@@ -1648,56 +1872,60 @@ msgstr "è¿?å??空主ä½?å?ºé??"
 msgid "Type of return value is incorrect, got `%s', expected `%s'"
 msgstr "è¿?å??å?¼ç±»å??ä¸?正确ï¼?è?·å¾?äº?â??%sâ??ï¼?ä½?æ?¯æ??æ??â??%sâ??"
 
-#: ../gio/gdbusmethodinvocation.c:406 ../gio/gsocket.c:2871
-#: ../gio/gsocket.c:2952
+#: ../gio/gdbusmethodinvocation.c:406 ../gio/gsocket.c:2974
+#: ../gio/gsocket.c:3055
 #, c-format
 msgid "Error sending message: %s"
 msgstr "å??é??ä¿¡æ?¯å?ºé??ï¼?%s"
 
-#: ../gio/gdbusprivate.c:885
-msgid "Error writing first 16 bytes of message to socket: "
-msgstr "å??å?¥æ¶?æ?¯ç??å?? 16 å­?è??å?°å¥?æ?¥å­?å?ºé??ï¼?"
-
-#: ../gio/gdbusprivate.c:1415
+#: ../gio/gdbusprivate.c:1766
 msgid "Unable to load /var/lib/dbus/machine-id: "
 msgstr "æ? æ³?å? è½½ /var/lib/dbus/machine-idï¼?"
 
-#: ../gio/gdbusproxy.c:710
+#: ../gio/gdbusproxy.c:714
 #, c-format
 msgid ""
 "Trying to set property %s of type %s but according to the expected interface "
 "the type is %s"
 msgstr "å°?è¯?设置类å?? %s ç??å±?æ?§ %sï¼?ä½?æ?¯æ ¹æ?®æ??æ??ç??æ?¥å?£ï¼?ç±»å??æ?¯ %s"
 
-#: ../gio/gdbusproxy.c:1231
+#: ../gio/gdbusproxy.c:1235
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "为 %s è°?ç?¨ StartServiceByName å?ºé??ï¼?"
 
-#: ../gio/gdbusproxy.c:1252
+#: ../gio/gdbusproxy.c:1256
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
-msgstr "ä»? StartServiceByName(\"%2$s\") æ?¹å¼?å¤?è?·å¾?以å¤?å??å¤? %1$d"
+msgstr "ä»? StartServiceByName(%2$s) æ?¹å¼?å¤?è?·å¾?æ??å¤?å??å¤? %1$d"
+
+#: ../gio/gdbusproxy.c:2315 ../gio/gdbusproxy.c:2472
+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"
+msgstr ""
+"æ? æ³?è°?ç?¨æ?¹æ³?ï¼?代ç??å??称为常è§?ç??æ? æ??æ??è??ç??å??称ï¼?è??代ç??使ç?¨ "
+"G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START æ ?è®°æ??建ã??"
 
-#: ../gio/gdbusserver.c:710
+#: ../gio/gdbusserver.c:715
 msgid "Abstract name space not supported"
 msgstr "ä¸?æ?¯æ??æ?½è±¡å?½å??空é?´"
 
-#: ../gio/gdbusserver.c:800
+#: ../gio/gdbusserver.c:805
 msgid "Cannot specify nonce file when creating a server"
 msgstr "å??建æ??å?¡å?¨æ?¶æ? æ³?æ??å®?临æ?¶æ??件"
 
-#: ../gio/gdbusserver.c:877
+#: ../gio/gdbusserver.c:882
 #, c-format
 msgid "Error writing nonce file at `%s': %s"
 msgstr "å??å?¥â??%sâ??å¤?ç??临æ?¶æ??件å?ºé??ï¼?%s"
 
-#: ../gio/gdbusserver.c:1033
+#: ../gio/gdbusserver.c:1044
 #, c-format
 msgid "The string `%s' is not a valid D-Bus GUID"
 msgstr "å­?符串â??%sâ??ä¸?æ?¯æ??æ?? D-Bus GUID"
 
-#: ../gio/gdbusserver.c:1073
+#: ../gio/gdbusserver.c:1084
 #, c-format
 msgid "Cannot listen on unsupported transport `%s'"
 msgstr "æ? æ³?ç??å?¬ä¸?æ?¯æ??ç??ä¼ è¾? %s"
@@ -1928,17 +2156,17 @@ msgstr "æ? æ³?å¤?ç?? GEmblem ç¼?ç ?ç??ç??æ?¬ %d "
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "GEmblem ç¼?ç ?中æ??ä¸?正确ç??符å?·æ?°é??(%d)"
 
-#: ../gio/gemblemedicon.c:295
+#: ../gio/gemblemedicon.c:292
 #, c-format
 msgid "Can't handle version %d of GEmblemedIcon encoding"
 msgstr "æ? æ³?å¤?ç?? GEmblemedIcon ç¼?ç ?ç??ç??æ?¬ %d"
 
-#: ../gio/gemblemedicon.c:305
+#: ../gio/gemblemedicon.c:302
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "GEmblemedIcon ç¼?ç ?中æ??ä¸?正确ç??符å?·æ?°é??(%d)"
 
-#: ../gio/gemblemedicon.c:328
+#: ../gio/gemblemedicon.c:325
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "GEmblemedIcon 中�为 GEmblem"
 
@@ -1950,7 +2178,7 @@ msgstr "GEmblemedIcon 中�为 GEmblem"
 #: ../gio/gfile.c:4259 ../gio/gfile.c:4345 ../gio/gfile.c:4434
 #: ../gio/gfile.c:4532 ../gio/gfile.c:4619 ../gio/gfile.c:4712
 #: ../gio/gfile.c:5042 ../gio/gfile.c:5322 ../gio/gfile.c:5391
-#: ../gio/gfile.c:6982 ../gio/gfile.c:7072 ../gio/gfile.c:7158
+#: ../gio/gfile.c:6983 ../gio/gfile.c:7073 ../gio/gfile.c:7159
 #: ../gio/win32/gwinhttpfile.c:439
 msgid "Operation not supported"
 msgstr "ä¸?æ?¯æ??该æ??ä½?"
@@ -2010,11 +2238,11 @@ msgstr "ä¸?æ?¯æ??å??æ?¶ç«?"
 msgid "File names cannot contain '%c'"
 msgstr "æ??件å??ä¸?è?½å??å?«â??%câ??"
 
-#: ../gio/gfile.c:6039 ../gio/gvolume.c:330
+#: ../gio/gfile.c:6040 ../gio/gvolume.c:330
 msgid "volume doesn't implement mount"
 msgstr "å?·æ?ªå®?ç?°æ??è½½"
 
-#: ../gio/gfile.c:6150
+#: ../gio/gfile.c:6151
 msgid "No application is registered as handling this file"
 msgstr "没æ??为此类å??æ??件注å??ç?¸åº?ç??å¤?ç??ç¨?åº?"
 
@@ -2104,7 +2332,7 @@ msgstr "è¾?å?¥æµ?æ?ªå®?ç?°è¯»å??"
 #. * already an operation running against this stream when
 #. * you try to start one
 #: ../gio/ginputstream.c:901 ../gio/giostream.c:316
-#: ../gio/goutputstream.c:1205
+#: ../gio/goutputstream.c:1209
 msgid "Stream has outstanding operation"
 msgstr "æµ?æ??å¼?常æ??ä½?"
 
@@ -2117,6 +2345,239 @@ msgstr "没æ??足å¤?ç??空é?´å¥?æ?¥å­?å?°å??"
 msgid "Unsupported socket address"
 msgstr "ä¸?æ?¯æ??ç??å¥?æ?¥å­?å?°å??"
 
+#: ../gio/glib-compile-schemas.c:702
+msgid "empty names are not permitted"
+msgstr "ä¸?å??许空å??称"
+
+#: ../gio/glib-compile-schemas.c:712
+#, c-format
+msgid "invalid name '%s': names must begin with a lowercase letter"
+msgstr "æ? æ??å??称 %sï¼?å??称å¿?须以å°?å??å­?æ¯?å¼?å§?"
+
+#: ../gio/glib-compile-schemas.c:724
+#, c-format
+msgid ""
+"invalid name '%s': invalid character '%c'; only lowercase letters, numbers "
+"and dash ('-') are permitted."
+msgstr "æ? æ??å??称 %sï¼?æ? æ??ç??å­?符 %cï¼?ä»?å°?å??å­?æ¯?ã??æ?°å­?å??横线(â??-â??)å?¯ä»¥ä½¿ç?¨ã??"
+
+#: ../gio/glib-compile-schemas.c:733
+#, c-format
+msgid "invalid name '%s': two successive dashes ('--') are not permitted."
+msgstr "æ? æ??å??称 %sï¼?ä¸?å??许使ç?¨è¿?ç»­ç??横è¡?(â??--â??)ã??"
+
+#: ../gio/glib-compile-schemas.c:742
+#, c-format
+msgid "invalid name '%s': the last character may not be a dash ('-')."
+msgstr "æ? æ??å??称 %sï¼?æ??å??ä¸?个å­?符串ä¸?åº?为横线(â??-â??)ã??"
+
+#: ../gio/glib-compile-schemas.c:750
+#, c-format
+msgid "invalid name '%s': maximum length is 32"
+msgstr "æ? æ??å??称 %sï¼?æ??大é?¿åº¦ä¸º 32"
+
+#: ../gio/glib-compile-schemas.c:819
+#, c-format
+msgid "<child name='%s'> already specified"
+msgstr "<child name='%s'> å·²æ??å®?"
+
+#: ../gio/glib-compile-schemas.c:845
+msgid "can not add keys to a 'list-of' schema"
+msgstr "��添����个 list-of 大纲"
+
+#: ../gio/glib-compile-schemas.c:856
+#, c-format
+msgid "<key name='%s'> already specified"
+msgstr "<key name='%s'> å·²æ??å®?"
+
+#: ../gio/glib-compile-schemas.c:874
+#, c-format
+msgid ""
+"<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
+"to modify value"
+msgstr ""
+"<key name='%s'> ä¸? <key name='%s'> å?¨ <schema id='%s'> é??å??; 请使ç?¨ "
+"<override> ä¿®æ?¹å?¶å?¼ã??"
+
+#: ../gio/glib-compile-schemas.c:885
+#, c-format
+msgid ""
+"exactly one of 'type', 'enum' or 'flags' must be specified as an attribute "
+"to <key>"
+msgstr ""
+"typeã??enum æ?? flags 中å¿?é¡»æ??ä¸?个被æ??å®?为 <key> ç??å±?æ?§ã??"
+
+#: ../gio/glib-compile-schemas.c:904
+#, c-format
+msgid "<%s id='%s'> not (yet) defined."
+msgstr "<%s id='%s'> å°?æ?ªå®?ä¹?ã??"
+
+#: ../gio/glib-compile-schemas.c:919
+#, c-format
+msgid "invalid GVariant type string '%s'"
+msgstr "æ? æ??ç?? GVariant ç±»å??å­?符串 %s"
+
+#: ../gio/glib-compile-schemas.c:949
+msgid "<override> given but schema isn't extending anything"
+msgstr "��� <override> �大纲���"
+
+#: ../gio/glib-compile-schemas.c:962
+#, c-format
+msgid "no <key name='%s'> to override"
+msgstr "æ?  <key name='%s'> å?¯è¦?ç??"
+
+#: ../gio/glib-compile-schemas.c:970
+#, c-format
+msgid "<override name='%s'> already specified"
+msgstr "<override name='%s'> å·²æ??å®?"
+
+#: ../gio/glib-compile-schemas.c:1036
+#, c-format
+msgid "<schema id='%s'> already specified"
+msgstr "<schema id='%s'> å·²æ??å®?"
+
+#: ../gio/glib-compile-schemas.c:1048
+#, c-format
+msgid "<schema id='%s'> extends not yet existing schema '%s'"
+msgstr "<schema id='%s'> æ?©å±?äº?å°?ä¸?å­?å?¨ç??大纲 %s"
+
+#: ../gio/glib-compile-schemas.c:1064
+#, c-format
+msgid "<schema id='%s'> is list of not yet existing schema '%s'"
+msgstr "<schema id='%s'> æ?¯å°?ä¸?å­?å?¨ç??大纲 %s ç??å??表"
+
+#: ../gio/glib-compile-schemas.c:1072
+#, c-format
+msgid "Can not be a list of a schema with a path"
+msgstr "ä¸?è?½æ?¯ä¸?ç³»å??带æ??è·¯å¾?ç??大纲"
+
+#: ../gio/glib-compile-schemas.c:1082
+#, c-format
+msgid "Can not extend a schema with a path"
+msgstr "��使�路���大纲"
+
+#: ../gio/glib-compile-schemas.c:1092
+#, c-format
+msgid ""
+"<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
+msgstr ""
+"<schema id='%s'> æ?¯ä¸?个å??表ï¼?æ?©å±?ç?? <schema id='%s'> ä¸?æ?¯å??表"
+
+#: ../gio/glib-compile-schemas.c:1102
+#, c-format
+msgid ""
+"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' "
+"does not extend '%s'"
+msgstr ""
+"<schema id='%s' list-of='%s'> æ?©å±? <schema id='%s' list-of='%s'>ï¼?ä½?â??%sâ??"
+"��� %s"
+
+#: ../gio/glib-compile-schemas.c:1119
+#, c-format
+msgid "a path, if given, must begin and end with a slash"
+msgstr "ä¸?个路å¾?ï¼?å¦?æ??ç»?å?ºå??å¿?须以æ??线(/)å¼?å§?å??ç»?æ??"
+
+#: ../gio/glib-compile-schemas.c:1126
+#, c-format
+msgid "the path of a list must end with ':/'"
+msgstr "ä¸?个å??表ç??è·¯å¾?å¿?须以 :/ ç»?æ??"
+
+#: ../gio/glib-compile-schemas.c:1148
+#, c-format
+msgid "<%s id='%s'> already specified"
+msgstr "<%s id='%s'> å·²æ??å®?"
+
+#: ../gio/glib-compile-schemas.c:1362
+#, c-format
+msgid "Element <%s> not allowed inside <%s>"
+msgstr "å?¨ <%2$s> 中ä¸?å??许å??ç´  <%1$s>"
+
+#: ../gio/glib-compile-schemas.c:1366
+#, c-format
+msgid "Element <%s> not allowed at toplevel"
+msgstr "顶å±?中ä¸?å??许å??ç´  <%s>"
+
+#: ../gio/glib-compile-schemas.c:1460
+#, c-format
+msgid "text may not appear inside <%s>"
+msgstr "<%s> å??ä¸?åº?å?ºç?°æ??æ?¬"
+
+#: ../gio/glib-compile-schemas.c:1674
+#, c-format
+msgid "No such schema `%s' specified in override file `%s'"
+msgstr "è¦?ç??æ??件 %2$s 中æ?ªæ??å®?大纲 %1$s"
+
+#: ../gio/glib-compile-schemas.c:1698
+#, c-format
+msgid "No such key `%s' in schema `%s' as specified in override file `%s'"
+msgstr "è¦?ç??æ??件 %3$s 中æ??å®?ç??大纲 %2$s 中没æ??é?® %1$s"
+
+#: ../gio/glib-compile-schemas.c:1731
+#, c-format
+msgid ""
+"override for key `%s' in schema `%s' in override file `%s' is out of the "
+"range given in the schema"
+msgstr ""
+"è¦?ç??æ??件 %3$s 中大纲 %2$s ç??é?® %1$s ç??è¦?ç??è¶?å?ºäº?大纲ç»?å?ºç??è??å?´"
+
+#: ../gio/glib-compile-schemas.c:1752
+#, c-format
+msgid ""
+"override for key `%s' in schema `%s' in override file `%s' is not in the "
+"list of valid choices"
+msgstr ""
+"è¦?ç??æ??件 %3$s 中大纲 %2$s ç??é?® %1$s ç??è¦?ç??ç??å?¼ä¸?å?¨æ??æ??å?¼å??表å??"
+
+#: ../gio/glib-compile-schemas.c:1797
+msgid "where to store the gschemas.compiled file"
+msgstr "gschemas.compiled æ??件å­?å?¨äº?ä½?å¤?"
+
+#: ../gio/glib-compile-schemas.c:1797 ../gio/glib-compile-schemas.c:1809
+msgid "DIRECTORY"
+msgstr "��"
+
+#: ../gio/glib-compile-schemas.c:1798
+msgid "Do not write the gschema.compiled file"
+msgstr "ä¸?è¦?对 gschema.compiled è¿?è¡?å??æ??ä½?"
+
+#: ../gio/glib-compile-schemas.c:1799
+msgid "This option will be removed soon."
+msgstr "æ­¤é??项å°?å?¨ä¸?ä¹?å? é?¤ã??"
+
+#: ../gio/glib-compile-schemas.c:1800
+msgid "Do not enforce key name restrictions"
+msgstr "ä¸?è¦?强å?¶é?®å??ç??é??å?¶"
+
+#: ../gio/glib-compile-schemas.c:1812
+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."
+msgstr ""
+"ç¼?è¯?æ??æ??ç?? GSettings 模å¼?æ??件为模å¼?ç¼?å­?ã??\n"
+"è¦?使ç?¨æ?©å±? .gschema.xmlï¼?é??è¦?æ??模å¼?æ??件ï¼?\n"
+"ç¼?å­?æ??件被称为 gschemas.compiledã??"
+
+#: ../gio/glib-compile-schemas.c:1828
+#, c-format
+msgid "You should give exactly one directory name\n"
+msgstr "æ?¨åº?该ç»?å?ºä¸?å?ªè?½ç»?å?ºä¸?个ç?®å½?å??\n"
+
+#: ../gio/glib-compile-schemas.c:1867
+#, c-format
+msgid "No schema files found: "
+msgstr "没æ??æ?¾å?°æ¨¡å¼?æ??件ï¼?"
+
+#: ../gio/glib-compile-schemas.c:1870
+#, c-format
+msgid "doing nothing.\n"
+msgstr "ä»?ä¹?é?½æ²¡å??ã??\n"
+
+#: ../gio/glib-compile-schemas.c:1873
+#, c-format
+msgid "removed existing output file.\n"
+msgstr "å·²å? é?¤å­?å?¨ç??è¾?å?ºæ??件ã??\n"
+
 #: ../gio/glocaldirectorymonitor.c:287
 msgid "Unable to find default local directory monitor type"
 msgstr "æ? æ³?æ?¾å?°é»?认ç??æ?¬å?°ç?®å½?ç??è§?å?¨ç±»å??"
@@ -2399,7 +2860,7 @@ msgstr "æ??件已ç»?被å?¶ä»?ç¨?åº?ä¿®æ?¹"
 msgid "Error removing old file: %s"
 msgstr "移é?¤æ?§æ??件å?ºé??ï¼?%s"
 
-#: ../gio/gmemoryinputstream.c:486 ../gio/gmemoryoutputstream.c:717
+#: ../gio/gmemoryinputstream.c:486 ../gio/gmemoryoutputstream.c:746
 msgid "Invalid GSeekType supplied"
 msgstr "æ??ä¾?ç?? GSeekType æ? æ??"
 
@@ -2411,25 +2872,25 @@ msgstr "æ? æ??ç??æ?¥æ?¾è¯·æ±?"
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "���� GMemoryInputStream"
 
-#: ../gio/gmemoryoutputstream.c:467
+#: ../gio/gmemoryoutputstream.c:496
 msgid "Memory output stream not resizable"
 msgstr "å??å­?è¾?å?ºæµ?æ? æ³?æ?¹å??大å°?"
 
-#: ../gio/gmemoryoutputstream.c:483
+#: ../gio/gmemoryoutputstream.c:512
 msgid "Failed to resize memory output stream"
 msgstr "æ?¹å??å??å­?è¾?å?ºæµ?大å°?失败"
 
-#: ../gio/gmemoryoutputstream.c:571
+#: ../gio/gmemoryoutputstream.c:600
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
 msgstr "å¤?ç??å??å?¥æ??é??è¦?ç??å??å­?è¶?è¿?äº?å?¯ç?¨ç??空é?´"
 
-#: ../gio/gmemoryoutputstream.c:727
+#: ../gio/gmemoryoutputstream.c:756
 msgid "Requested seek before the beginning of the stream"
 msgstr "请æ±?ç??å®?ä½?å?¼å?¨æµ?ç??å¼?å§?ä¹?å??"
 
-#: ../gio/gmemoryoutputstream.c:736
+#: ../gio/gmemoryoutputstream.c:765
 msgid "Requested seek beyond the end of the stream"
 msgstr "请æ±?ç??å®?ä½?å?¼å?¨æµ?ç??ç»?æ??ä¹?å??"
 
@@ -2482,7 +2943,7 @@ msgstr "æ??è½½æ?ªå®?ç?°å??容类å??ç??æµ?"
 msgid "mount doesn't implement synchronous content type guessing"
 msgstr "æ??è½½æ?ªå®?ç?°å??æ­¥å??容类å??ç??æµ?"
 
-#: ../gio/gnetworkaddress.c:293
+#: ../gio/gnetworkaddress.c:318
 #, c-format
 msgid "Hostname '%s' contains '[' but not ']'"
 msgstr "主æ?ºå??â??%sâ??å??å?«â??[â??ä½?æ?¯ç¼ºå°?â??]â??"
@@ -2491,7 +2952,7 @@ msgstr "主æ?ºå??â??%sâ??å??å?«â??[â??ä½?æ?¯ç¼ºå°?â??]â??"
 msgid "Output stream doesn't implement write"
 msgstr "è¾?å?ºæµ?æ?ªå®?ç?°å??å?¥"
 
-#: ../gio/goutputstream.c:368 ../gio/goutputstream.c:844
+#: ../gio/goutputstream.c:368 ../gio/goutputstream.c:848
 msgid "Source stream is already closed"
 msgstr "���已���"
 
@@ -2520,217 +2981,6 @@ msgstr "æ??æ?¶æ? æ³?解æ??â??%sâ??"
 msgid "Error resolving '%s'"
 msgstr "é??误解æ??â??%sâ??"
 
-#: ../gio/gschema-compile.c:702
-msgid "empty names are not permitted"
-msgstr "ä¸?å??许空å??称"
-
-#: ../gio/gschema-compile.c:712
-#, c-format
-msgid "invalid name '%s': names must begin with a lowercase letter"
-msgstr "æ? æ??å??称 %sï¼?å??称å¿?须以å°?å??å­?æ¯?å¼?å§?"
-
-#: ../gio/gschema-compile.c:724
-#, c-format
-msgid ""
-"invalid name '%s': invalid character '%c'; only lowercase letters, numbers "
-"and dash ('-') are permitted."
-msgstr ""
-"æ? æ??å??称 %sï¼?æ? æ??ç??å­?符 %cï¼?ä»?å°?å??å­?æ¯?ã??æ?°å­?å??横线(â??-â??)å?¯ä»¥ä½¿ç?¨ã??"
-
-#: ../gio/gschema-compile.c:733
-#, c-format
-msgid "invalid name '%s': two successive dashes ('--') are not permitted."
-msgstr "æ? æ??å??称 %sï¼?ä¸?å??许使ç?¨è¿?ç»­ç??横è¡?(â??--â??)ã??"
-
-#: ../gio/gschema-compile.c:742
-#, c-format
-msgid "invalid name '%s': the last character may not be a dash ('-')."
-msgstr "æ? æ??å??称 %sï¼?æ??å??ä¸?个å­?符串ä¸?åº?为横线(â??-â??)ã??"
-
-#: ../gio/gschema-compile.c:750
-#, c-format
-msgid "invalid name '%s': maximum length is 32"
-msgstr "æ? æ??å??称 %sï¼?æ??大é?¿åº¦ä¸º 32"
-
-#: ../gio/gschema-compile.c:819
-#, c-format
-msgid "<child name='%s'> already specified"
-msgstr "<child name='%s'> å·²æ??å®?"
-
-#: ../gio/gschema-compile.c:845
-msgid "can not add keys to a 'list-of' schema"
-msgstr "��添����个 list-of 大纲"
-
-#: ../gio/gschema-compile.c:856
-#, c-format
-msgid "<key name='%s'> already specified"
-msgstr "<key name='%s'> å·²æ??å®?"
-
-#: ../gio/gschema-compile.c:874
-#, c-format
-msgid ""
-"<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
-"to modify value"
-msgstr ""
-
-#: ../gio/gschema-compile.c:885
-#, c-format
-msgid ""
-"exactly one of 'type', 'enum' or 'flags' must be specified as an attribute "
-"to <key>"
-msgstr ""
-
-#: ../gio/gschema-compile.c:904
-#, c-format
-msgid "<%s id='%s'> not (yet) defined."
-msgstr "<%s id='%s'> å°?æ?ªå®?ä¹?ã??"
-
-#: ../gio/gschema-compile.c:919
-#, c-format
-msgid "invalid GVariant type string '%s'"
-msgstr "æ? æ??ç?? GVariant ç±»å??å­?符串 %s"
-
-#: ../gio/gschema-compile.c:949
-msgid "<override> given but schema isn't extending anything"
-msgstr ""
-
-#: ../gio/gschema-compile.c:962
-#, c-format
-msgid "no <key name='%s'> to override"
-msgstr ""
-
-#: ../gio/gschema-compile.c:970
-#, c-format
-msgid "<override name='%s'> already specified"
-msgstr "<override name='%s'> å·²æ??å®?"
-
-#: ../gio/gschema-compile.c:1036
-#, c-format
-msgid "<schema id='%s'> already specified"
-msgstr "<schema id='%s'> å·²æ??å®?"
-
-#: ../gio/gschema-compile.c:1048
-#, c-format
-msgid "<schema id='%s'> extends not yet existing schema '%s'"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1062
-#, c-format
-msgid "<schema id='%s'> is list of not yet existing schema '%s'"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1076
-#, c-format
-msgid ""
-"<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1086
-#, c-format
-msgid ""
-"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' "
-"does not extend '%s'"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1103
-#, c-format
-msgid "a path, if given, must begin and end with a slash"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1125
-#, c-format
-msgid "<%s id='%s'> already specified"
-msgstr "<%s id='%s'> å·²æ??å®?"
-
-#: ../gio/gschema-compile.c:1339
-#, c-format
-msgid "Element <%s> not allowed inside <%s>"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1343
-#, c-format
-msgid "Element <%s> not allowed at toplevel"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1437
-#, c-format
-msgid "text may not appear inside <%s>"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1651
-#, c-format
-msgid "No such schema `%s' specified in override file `%s'"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1675
-#, c-format
-msgid "No such key `%s' in schema `%s' as specified in override file `%s'"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1708
-#, c-format
-msgid ""
-"override for key `%s' in schema `%s' in override file `%s' is out of the "
-"range given in the schema"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1729
-#, c-format
-msgid ""
-"override for key `%s' in schema `%s' in override file `%s' is not in the "
-"list of valid choices"
-msgstr ""
-
-#: ../gio/gschema-compile.c:1774
-msgid "where to store the gschemas.compiled file"
-msgstr "gschemas.compiled æ??件å­?å?¨äº?ä½?å¤?"
-
-#: ../gio/gschema-compile.c:1774 ../gio/gschema-compile.c:1786
-msgid "DIRECTORY"
-msgstr "��"
-
-#: ../gio/gschema-compile.c:1775
-msgid "Do not write the gschema.compiled file"
-msgstr "ä¸?è¦?对 gschema.compiled è¿?è¡?å??æ??ä½?"
-
-#: ../gio/gschema-compile.c:1776
-msgid "This option will be removed soon."
-msgstr "æ­¤é??项å°?å?¨ä¸?ä¹?å? é?¤ã??"
-
-#: ../gio/gschema-compile.c:1777
-msgid "Do not enforce key name restrictions"
-msgstr "ä¸?è¦?强å?¶é?®å??ç??é??å?¶"
-
-#: ../gio/gschema-compile.c:1789
-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."
-msgstr ""
-"ç¼?è¯?æ??æ??ç?? GSettings 模å¼?æ??件为模å¼?ç¼?å­?ã??\n"
-"è¦?使ç?¨æ?©å±? .gschema.xmlï¼?é??è¦?æ??模å¼?æ??件ï¼?\n"
-"ç¼?å­?æ??件被称为 gschemas.compiledã??"
-
-#: ../gio/gschema-compile.c:1805
-#, c-format
-msgid "You should give exactly one directory name\n"
-msgstr "æ?¨åº?该ç»?å?ºä¸?å?ªè?½ç»?å?ºä¸?个ç?®å½?å??\n"
-
-#: ../gio/gschema-compile.c:1844
-#, c-format
-msgid "No schema files found: "
-msgstr "没æ??æ?¾å?°æ¨¡å¼?æ??件ï¼?"
-
-#: ../gio/gschema-compile.c:1847
-#, c-format
-msgid "doing nothing.\n"
-msgstr "ä»?ä¹?é?½æ²¡å??ã??\n"
-
-#: ../gio/gschema-compile.c:1850
-#, c-format
-msgid "removed existing output file.\n"
-msgstr "å·²å? é?¤å­?å?¨ç??è¾?å?ºæ??件ã??\n"
-
 #: ../gio/gsettings-tool.c:79
 #, c-format
 msgid ""
@@ -2754,29 +3004,29 @@ msgstr ""
 "\n"
 "使ç?¨â??%s å?½ä»¤ --helpâ??æ?¥è?·å??å?³äº?æ¯?ä¸?个å?½ä»¤ç??帮å?©ã??\n"
 
-#: ../gio/gsettings-tool.c:222 ../gio/gsettings-tool.c:322
-#: ../gio/gsettings-tool.c:438 ../gio/gsettings-tool.c:533
-#: ../gio/gsettings-tool.c:646
+#: ../gio/gsettings-tool.c:220 ../gio/gsettings-tool.c:320
+#: ../gio/gsettings-tool.c:436 ../gio/gsettings-tool.c:531
+#: ../gio/gsettings-tool.c:644
 msgid "Specify the path for the schema"
 msgstr "为模å¼?æ??å®?è·¯å¾?"
 
-#: ../gio/gsettings-tool.c:222 ../gio/gsettings-tool.c:322
-#: ../gio/gsettings-tool.c:438 ../gio/gsettings-tool.c:533
-#: ../gio/gsettings-tool.c:646
+#: ../gio/gsettings-tool.c:220 ../gio/gsettings-tool.c:320
+#: ../gio/gsettings-tool.c:436 ../gio/gsettings-tool.c:531
+#: ../gio/gsettings-tool.c:644
 msgid "PATH"
 msgstr "PATH"
 
-#: ../gio/gsettings-tool.c:230 ../gio/gsettings-tool.c:541
-#: ../gio/gsettings-tool.c:654
+#: ../gio/gsettings-tool.c:228 ../gio/gsettings-tool.c:539
+#: ../gio/gsettings-tool.c:652
 msgid "SCHEMA KEY"
 msgstr "模�  �"
 
-#: ../gio/gsettings-tool.c:232
+#: ../gio/gsettings-tool.c:230
 msgid "Get the value of KEY"
 msgstr "è?·å??é?®ç??å?¼"
 
-#: ../gio/gsettings-tool.c:234 ../gio/gsettings-tool.c:450
-#: ../gio/gsettings-tool.c:545 ../gio/gsettings-tool.c:661
+#: ../gio/gsettings-tool.c:232 ../gio/gsettings-tool.c:448
+#: ../gio/gsettings-tool.c:543 ../gio/gsettings-tool.c:659
 msgid ""
 "Arguments:\n"
 "  SCHEMA      The id of the schema\n"
@@ -2786,15 +3036,15 @@ msgstr ""
 "  模å¼?        模å¼?ç??æ ?è¯?\n"
 "  é?®          é?®ç??å??称\n"
 
-#: ../gio/gsettings-tool.c:330 ../gio/gsettings-tool.c:446
+#: ../gio/gsettings-tool.c:328 ../gio/gsettings-tool.c:444
 msgid "SCHEMA KEY VALUE"
 msgstr "模� � �"
 
-#: ../gio/gsettings-tool.c:332
+#: ../gio/gsettings-tool.c:330
 msgid "Set the value of KEY"
 msgstr "设置é?®ç??å?¼"
 
-#: ../gio/gsettings-tool.c:334
+#: ../gio/gsettings-tool.c:332
 msgid ""
 "Arguments:\n"
 "  SCHEMA      The id of the schema\n"
@@ -2806,20 +3056,20 @@ msgstr ""
 "  é?®          é?®å??\n"
 "  å?¼          é?®è¦?设置为ç??å?¼ï¼?ä¸?个串è¡?å??ç?? GVariant\n"
 
-#: ../gio/gsettings-tool.c:407
+#: ../gio/gsettings-tool.c:405
 #, c-format
 msgid "Key %s is not writable\n"
 msgstr "é?® %s ä¸?å?¯å??\n"
 
-#: ../gio/gsettings-tool.c:448
+#: ../gio/gsettings-tool.c:446
 msgid "Sets KEY to its default value"
 msgstr "设置 KEY 为��认�"
 
-#: ../gio/gsettings-tool.c:543
+#: ../gio/gsettings-tool.c:541
 msgid "Find out whether KEY is writable"
 msgstr "æ?¥ç??é?®æ?¯å?¦å?¯å??"
 
-#: ../gio/gsettings-tool.c:657
+#: ../gio/gsettings-tool.c:655
 msgid ""
 "Monitor KEY for changes and print the changed values.\n"
 "Monitoring will continue until the process is terminated."
@@ -2827,122 +3077,131 @@ msgstr ""
 "ç??è§?é?®ç??æ?´æ?¹å¹¶æ?¾ç¤ºæ?´æ?¹è¿?ç??å?¼ã??\n"
 "ç??è§?å°?æ??ç»­å?°è¿?ç¨?ç»?æ??ã??"
 
-#: ../gio/gsettings-tool.c:833
+#: ../gio/gsettings-tool.c:831
 #, c-format
 msgid "Unknown command '%s'\n"
 msgstr "æ?ªç?¥å?½ä»¤â??%sâ??\n"
 
-#: ../gio/gsocket.c:274
+#: ../gio/gsocket.c:276
 msgid "Invalid socket, not initialized"
 msgstr "æ? æ??ç??å¥?æ?¥å­?ï¼?å°?æ?ªå??å§?å??"
 
-#: ../gio/gsocket.c:281
+#: ../gio/gsocket.c:283
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "æ? æ??ç??å¥?æ?¥å­?ï¼?å??å§?å??失败ç??å??å? æ?¯ï¼?%s"
 
-#: ../gio/gsocket.c:289
+#: ../gio/gsocket.c:291
 msgid "Socket is already closed"
 msgstr "���已���"
 
-#: ../gio/gsocket.c:297 ../gio/gsocket.c:2619 ../gio/gsocket.c:2663
+#: ../gio/gsocket.c:299 ../gio/gsocket.c:2716 ../gio/gsocket.c:2760
 msgid "Socket I/O timed out"
 msgstr "��� I/O ��"
 
-#: ../gio/gsocket.c:419
+#: ../gio/gsocket.c:421
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "ä»?æ??件æ??述符å??建 GSocketï¼?%s"
 
-#: ../gio/gsocket.c:453 ../gio/gsocket.c:469 ../gio/gsocket.c:2021
+#: ../gio/gsocket.c:455 ../gio/gsocket.c:471 ../gio/gsocket.c:2113
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "æ? æ³?å??建å¥?æ?¥å­?ï¼?%s"
 
-#: ../gio/gsocket.c:453
+#: ../gio/gsocket.c:455
 msgid "Unknown protocol was specified"
 msgstr "æ??å®?äº?æ?ªç?¥å??è®®"
 
-#: ../gio/gsocket.c:1219
+#: ../gio/gsocket.c:1224
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ä¸?è?½è?·å??æ?¬å?°å?°å??ï¼?%s"
 
-#: ../gio/gsocket.c:1252
+#: ../gio/gsocket.c:1267
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ä¸?è?½è?·å??è¿?ç¨?å?°å??ï¼? %s"
 
-#: ../gio/gsocket.c:1310
+#: ../gio/gsocket.c:1328
 #, c-format
 msgid "could not listen: %s"
 msgstr "æ? æ³?ç??å?¬ï¼?%s"
 
-#: ../gio/gsocket.c:1384
+#: ../gio/gsocket.c:1402
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "é??误ç»?å®?å?°å??ï¼?%s"
 
-#: ../gio/gsocket.c:1504
+#: ../gio/gsocket.c:1522
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "æ?¥å??è¿?æ?¥æ?¶å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:1617
+#: ../gio/gsocket.c:1639
 msgid "Error connecting: "
 msgstr "è¿?æ?¥å?ºé??ï¼?"
 
-#: ../gio/gsocket.c:1621
+#: ../gio/gsocket.c:1644
 msgid "Connection in progress"
 msgstr "正���"
 
-#: ../gio/gsocket.c:1626
+#: ../gio/gsocket.c:1651
 #, c-format
 msgid "Error connecting: %s"
 msgstr "è¿?æ?¥æ?¶å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:1669 ../gio/gsocket.c:3376
+#: ../gio/gsocket.c:1694 ../gio/gsocket.c:3479
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "æ? æ³?è?·å??æ?ªå?³ç??é??误ï¼?%s"
 
-#: ../gio/gsocket.c:1765
+#: ../gio/gsocket.c:1826
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "æ?¥æ?¶æ?°æ?®å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:1908
+#: ../gio/gsocket.c:2000
 #, c-format
 msgid "Error sending data: %s"
 msgstr "å??é??æ?°æ?®å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:2100
+#: ../gio/gsocket.c:2192
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "å?³é?­å¥?æ?¥å­?å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:2612
+#: ../gio/gsocket.c:2709
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "ç­?å¾?å¥?æ?¥å­?ç?¶æ??ï¼?%s"
 
-#: ../gio/gsocket.c:2896
+#: ../gio/gsocket.c:2999
 msgid "GSocketControlMessage not supported on windows"
 msgstr "Windows ä¸?æ?¯æ?? GSocketControlMessage"
 
-#: ../gio/gsocket.c:3155 ../gio/gsocket.c:3296
+#: ../gio/gsocket.c:3258 ../gio/gsocket.c:3399
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "æ?¥å??ä¿¡æ?¯å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:3391
+#: ../gio/gsocket.c:3494
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "æ­¤æ??ä½?ç³»ç»?ä¸?没æ??å®?ç?° g_socket_get_credentials"
 
-#: ../gio/gsocketclient.c:520 ../gio/gsocketclient.c:769
+#: ../gio/gsocketclient.c:674 ../gio/gsocketclient.c:1153
 msgid "Unknown error on connect"
 msgstr "è¿?æ?¥æ?¶å?ºç?°æ?ªç?¥é??误"
 
+#: ../gio/gsocketclient.c:711 ../gio/gsocketclient.c:1038
+msgid "Trying to proxy over non-TCP connection is not supported."
+msgstr "ä¸?æ?¯æ??é??è¿?é?? TCP è¿?æ?¥ç??代ç??ã??"
+
+#: ../gio/gsocketclient.c:749 ../gio/gsocketclient.c:1061
+#, c-format
+msgid "Proxy protocol '%s' is not supported."
+msgstr "ä¸?æ?¯æ?? %s 代ç??å??è®®ã??"
+
 #: ../gio/gsocketlistener.c:191
 msgid "Listener is already closed"
 msgstr "ç??å?¬å?¨å·²å?³é?­"
@@ -2951,17 +3210,105 @@ msgstr "ç??å?¬å?¨å·²å?³é?­"
 msgid "Added socket is closed"
 msgstr "�����已��"
 
+#: ../gio/gsocks4aproxy.c:121
+#, c-format
+msgid "SOCKSv4 does not support IPv6 address '%s'"
+msgstr "SOCKSv4 ä¸?æ?¯æ?? IPv6 å?°å?? %s"
+
+#: ../gio/gsocks4aproxy.c:139
+#, c-format
+msgid "SOCKSv4 implementation limits username to %i characters"
+msgstr "SOCKv4 ç??å®?ç?°é??å?¶ç?¨æ?·å??å?¨ %i 个å­?符串å??"
+
+#: ../gio/gsocks4aproxy.c:157
+#, c-format
+msgid "SOCKSv4a implementation limits hostname to %i characters"
+msgstr "SOCKv4a ç??å®?ç?°é??å?¶ä¸»æ?ºå??å?¨ %i 个å­?符串å??"
+
+#: ../gio/gsocks4aproxy.c:183
+msgid "The server is not a SOCKSv4 proxy server."
+msgstr "æ­¤æ??å?¡å?¨ä¸?æ?¯ SOCKSv4 代ç??æ??å?¡å?¨ã??"
+
+#: ../gio/gsocks4aproxy.c:190
+msgid "Connection through SOCKSv4 server was rejected"
+msgstr "é??è¿? SOCKSv4 æ??å?¡å?¨è¿?æ?¥è¢«æ??ç»?"
+
+#: ../gio/gsocks5proxy.c:155 ../gio/gsocks5proxy.c:328
+#: ../gio/gsocks5proxy.c:338
+msgid "The server is not a SOCKSv5 proxy server."
+msgstr "æ­¤æ??å?¡å?¨ä¸?æ?¯ SOCKSv5 代ç??æ??å?¡å?¨ã??"
+
+#: ../gio/gsocks5proxy.c:169
+msgid "The SOCKSv5 proxy requires authentication."
+msgstr "SOCKSv5 代ç??æ??å?¡å?¨é??è¦?认è¯?ã??"
+
+#: ../gio/gsocks5proxy.c:179
+msgid ""
+"The SOCKSv5 require an authentication method that is not supported by GLib."
+msgstr ""
+"æ­¤ SOCKSv5 è¿?æ?¥é??è¦?ä¸?ç§? GLib æ?ªæ?¯æ??ç??认è¯?æ?¹æ³?ã??"
+
+#: ../gio/gsocks5proxy.c:208
+#, c-format
+msgid "Username or password is too long for SOCKSv5 protocol (max. is %i)."
+msgstr "ç?¨æ?·å??æ??å¯?ç ?对äº? SOCKSv5 å??议太é?¿(æ??大é?¿åº¦ä¸º %i)ã??"
+
+#: ../gio/gsocks5proxy.c:239
+msgid "SOCKSv5 authentication failed due to wrong username or password."
+msgstr "SOCKSv5 认è¯?失败ï¼?ç?¨æ?·å??æ??å¯?ç ?é??误ã??"
+
+#: ../gio/gsocks5proxy.c:289
+#, c-format
+msgid "Hostname '%s' too long for SOCKSv5 protocol (maximum is %i bytes)"
+msgstr "主æ?ºå?? %s 对äº? SOCKSv5 å??议太é?¿(æ??大é?¿åº¦ä¸º %i)ã??"
+
+#: ../gio/gsocks5proxy.c:352
+msgid "The SOCKSv5 proxy server uses unkown address type."
+msgstr "SOCKSv5 代ç??æ??å?¡å?¨ä½¿ç?¨æ?ªç?¥å?°å??ç±»å??ã??"
+
+#: ../gio/gsocks5proxy.c:359
+msgid "Internal SOCKSv5 proxy server error."
+msgstr "SOCKSv5 代ç??æ??å?¡å?¨å??é?¨é??误ã??"
+
+#: ../gio/gsocks5proxy.c:365
+msgid "SOCKSv5 connection not allowed by ruleset."
+msgstr "è§?å??ä¸?å??许 SOCKSv5 è¿?æ?¥ã??"
+
+#: ../gio/gsocks5proxy.c:372
+msgid "Host unreachable through SOCKSv5 server."
+msgstr "é??è¿? SOCKSv5 æ??å?¡å?¨ä¸»æ?ºä¸?å?¯è¾¾ã??"
+
+#: ../gio/gsocks5proxy.c:378
+msgid "Network unreachable through SOCKSv5 proxy."
+msgstr "é??è¿? SOCKSv5 代ç??ç½?ç»?ä¸?å?¯è¾¾ã??"
+
+#: ../gio/gsocks5proxy.c:384
+msgid "Connection refused through SOCKSv5 proxy."
+msgstr "é??è¿? SOCKSv5 代ç??è¿?æ?¥è¢«æ??ç»?ã??"
+
+#: ../gio/gsocks5proxy.c:390
+msgid "SOCKSv5 proxy does not support 'connect' command."
+msgstr "SOCKSv5 代ç??ä¸?æ?¯æ?? connect å?½ä»¤ã??"
+
+#: ../gio/gsocks5proxy.c:396
+msgid "SOCKSv5 proxy does not support provided address type."
+msgstr "SOCKSv5 代ç??ä¸?æ?¯æ??æ??ä¾?ç??å?°å??ç±»å??ã??"
+
+#: ../gio/gsocks5proxy.c:402
+msgid "Unkown SOCKSv5 proxy error."
+msgstr "æ?ªç?¥ SOCKSv5 代ç??é??误ã??"
+
 #: ../gio/gthemedicon.c:498
 #, c-format
 msgid "Can't handle version %d of GThemedIcon encoding"
 msgstr "æ? æ³?å¤?ç?? GThemedIcon ç¼?ç ?ç??ç??æ?¬ %d"
 
-#: ../gio/gunixconnection.c:164 ../gio/gunixconnection.c:507
+#: ../gio/gunixconnection.c:164 ../gio/gunixconnection.c:505
 #, c-format
 msgid "Expecting 1 control message, got %d"
 msgstr "æ??æ??ä¸?个æ?§å?¶ä¿¡æ?¯ï¼?å?´å¾?å?° %d 个"
 
-#: ../gio/gunixconnection.c:177 ../gio/gunixconnection.c:517
+#: ../gio/gunixconnection.c:177 ../gio/gunixconnection.c:515
 msgid "Unexpected type of ancillary data"
 msgstr "é??é¢?æ??ç??è¾?å?©æ?°æ?®ç±»å??"
 
@@ -2974,33 +3321,33 @@ msgstr "æ??æ??ä¸?个æ??件æ??述符ï¼?å?´å¾?å?° %d 个\n"
 msgid "Received invalid fd"
 msgstr "æ?¶å?°æ? æ??æ??件æ??述符"
 
-#: ../gio/gunixconnection.c:361
+#: ../gio/gunixconnection.c:359
 msgid "Error sending credentials: "
 msgstr "å??é??è¯?书å?ºé??ï¼?"
 
-#: ../gio/gunixconnection.c:441
+#: ../gio/gunixconnection.c:439
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr "æ£?æ?¥å¥?æ?¥å­?æ?¯å?¦å?¯ç?¨ SO_PASSCRED å?ºé??ï¼?%s"
 
-#: ../gio/gunixconnection.c:450
+#: ../gio/gunixconnection.c:448
 #, c-format
 msgid ""
 "Unexpected option length while checking if SO_PASSCRED is enabled for "
 "socket. Expected %d bytes, got %d"
 msgstr "æ£?æ?¥å¥?æ?¥å­?æ?¯å?¦å?¯ç?¨ SO_PASSCRED æ?¶é??项é?¿åº¦å¼?常ã??æ??æ?? %d å­?è??ï¼?è?·å¾?äº? %d"
 
-#: ../gio/gunixconnection.c:467
+#: ../gio/gunixconnection.c:465
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "å?¯ç?¨ SO_PASSCRED å?ºé??ï¼?%s"
 
-#: ../gio/gunixconnection.c:497
+#: ../gio/gunixconnection.c:495
 msgid ""
 "Expecting to read a single byte for receiving credentials but read zero bytes"
 msgstr "æ??æ??为æ?¥æ?¶è¯?书读å?°å??个å­?è??ä½?æ?¯å?ªè¯»å?°äº? 0 å­?è??"
 
-#: ../gio/gunixconnection.c:540
+#: ../gio/gunixconnection.c:538
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "ç¦?ç?¨ SO_PASSCRED æ?¶å?ºé??ï¼?%s"
@@ -3077,23 +3424,26 @@ msgstr "å?³é?­å?¥æ??å?ºé??ï¼?%s"
 msgid "Error writing to handle: %s"
 msgstr "å??å?¥å?¥æ??å?ºé??ï¼?%s"
 
-#: ../gio/gzlibcompressor.c:278 ../gio/gzlibdecompressor.c:249
+#: ../gio/gzlibcompressor.c:396 ../gio/gzlibdecompressor.c:349
 msgid "Not enough memory"
 msgstr "å??å­?ä¸?足"
 
-#: ../gio/gzlibcompressor.c:285 ../gio/gzlibdecompressor.c:256
+#: ../gio/gzlibcompressor.c:403 ../gio/gzlibdecompressor.c:356
 #, c-format
 msgid "Internal error: %s"
 msgstr "å??é?¨é??误ï¼?%s"
 
-#: ../gio/gzlibcompressor.c:298 ../gio/gzlibdecompressor.c:270
+#: ../gio/gzlibcompressor.c:416 ../gio/gzlibdecompressor.c:370
 msgid "Need more input"
 msgstr "é??è¦?æ?´å¤?è¾?å?¥"
 
-#: ../gio/gzlibdecompressor.c:242
+#: ../gio/gzlibdecompressor.c:342
 msgid "Invalid compressed data"
 msgstr "æ? æ??ç??å·²å??缩æ?°æ?®"
 
+#~ msgid "Error writing first 16 bytes of message to socket: "
+#~ msgstr "å??å?¥æ¶?æ?¯ç??å?? 16 å­?è??å?°å¥?æ?¥å­?å?ºé??ï¼?"
+
 #~ msgid "The nonce-file `%s' was %lu bytes. Expected 16 bytes."
 #~ msgstr "临æ?¶æ??件 %s 为 %lu å­?è??ï¼?æ??æ??为 16 å­?è??ã??"
 
@@ -3148,9 +3498,6 @@ msgstr "æ? æ??ç??å·²å??缩æ?°æ?®"
 #~ msgid "The file containing the icon"
 #~ msgstr "å??å?«è¯¥å?¾æ ?ç??æ??件"
 
-#~ msgid "name"
-#~ msgstr "å??称"
-
 #~ msgid "The name of the icon"
 #~ msgstr "å?¾æ ?ç??å??称"
 



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