[glib/glib-2-26] Update Simplified Chinese translation.



commit 1be67fb84f9209d08eb1d27f77efaa2542b7e8d7
Author: Yinghua Wang <wantinghard gmail com>
Date:   Mon Mar 28 10:19:39 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  531 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 286 insertions(+), 245 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 18fa9a5..222b64c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,10 +15,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
-"Report-Msgid-Bugs-To: \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"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=glib&component=general\n"
+"POT-Creation-Date: 2011-01-03 13:23+0000\n"
+"PO-Revision-Date: 2011-03-21 18:11+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -164,232 +165,232 @@ msgid "Invalid hostname"
 msgstr "æ? æ??ç??主æ?ºå??"
 
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:105
+#: ../glib/gdatetime.c:149
 msgctxt "GDateTime"
 msgid "am"
 msgstr "�"
 
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:107
+#: ../glib/gdatetime.c:151
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "ä¸?å??"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:109
+#: ../glib/gdatetime.c:153
 msgctxt "GDateTime"
 msgid "pm"
 msgstr "�"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:111
+#: ../glib/gdatetime.c:155
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "ä¸?å??"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:120
+#: ../glib/gdatetime.c:164
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:123
+#: ../glib/gdatetime.c:167
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: ../glib/gdatetime.c:168
+#: ../glib/gdatetime.c:193
 msgctxt "full month name"
 msgid "January"
 msgstr "ä¸?æ??"
 
-#: ../glib/gdatetime.c:170
+#: ../glib/gdatetime.c:195
 msgctxt "full month name"
 msgid "February"
 msgstr "äº?æ??"
 
-#: ../glib/gdatetime.c:172
+#: ../glib/gdatetime.c:197
 msgctxt "full month name"
 msgid "March"
 msgstr "ä¸?æ??"
 
-#: ../glib/gdatetime.c:174
+#: ../glib/gdatetime.c:199
 msgctxt "full month name"
 msgid "April"
 msgstr "å??æ??"
 
-#: ../glib/gdatetime.c:176
+#: ../glib/gdatetime.c:201
 msgctxt "full month name"
 msgid "May"
 msgstr "äº?æ??"
 
-#: ../glib/gdatetime.c:178
+#: ../glib/gdatetime.c:203
 msgctxt "full month name"
 msgid "June"
 msgstr "å?­æ??"
 
-#: ../glib/gdatetime.c:180
+#: ../glib/gdatetime.c:205
 msgctxt "full month name"
 msgid "July"
 msgstr "ä¸?æ??"
 
-#: ../glib/gdatetime.c:182
+#: ../glib/gdatetime.c:207
 msgctxt "full month name"
 msgid "August"
 msgstr "å?«æ??"
 
-#: ../glib/gdatetime.c:184
+#: ../glib/gdatetime.c:209
 msgctxt "full month name"
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../glib/gdatetime.c:186
+#: ../glib/gdatetime.c:211
 msgctxt "full month name"
 msgid "October"
 msgstr "å??æ??"
 
-#: ../glib/gdatetime.c:188
+#: ../glib/gdatetime.c:213
 msgctxt "full month name"
 msgid "November"
 msgstr "å??ä¸?æ??"
 
-#: ../glib/gdatetime.c:190
+#: ../glib/gdatetime.c:215
 msgctxt "full month name"
 msgid "December"
 msgstr "å??äº?æ??"
 
-#: ../glib/gdatetime.c:205
+#: ../glib/gdatetime.c:230
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "01æ??"
 
-#: ../glib/gdatetime.c:207
+#: ../glib/gdatetime.c:232
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "02æ??"
 
-#: ../glib/gdatetime.c:209
+#: ../glib/gdatetime.c:234
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "03æ??"
 
-#: ../glib/gdatetime.c:211
+#: ../glib/gdatetime.c:236
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "04æ??"
 
-#: ../glib/gdatetime.c:213
+#: ../glib/gdatetime.c:238
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "05æ??"
 
-#: ../glib/gdatetime.c:215
+#: ../glib/gdatetime.c:240
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "06æ??"
 
-#: ../glib/gdatetime.c:217
+#: ../glib/gdatetime.c:242
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "07æ??"
 
-#: ../glib/gdatetime.c:219
+#: ../glib/gdatetime.c:244
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "08æ??"
 
-#: ../glib/gdatetime.c:221
+#: ../glib/gdatetime.c:246
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "09æ??"
 
-#: ../glib/gdatetime.c:223
+#: ../glib/gdatetime.c:248
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "10æ??"
 
-#: ../glib/gdatetime.c:225
+#: ../glib/gdatetime.c:250
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "11æ??"
 
-#: ../glib/gdatetime.c:227
+#: ../glib/gdatetime.c:252
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "12æ??"
 
-#: ../glib/gdatetime.c:242
+#: ../glib/gdatetime.c:267
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#: ../glib/gdatetime.c:244
+#: ../glib/gdatetime.c:269
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../glib/gdatetime.c:246
+#: ../glib/gdatetime.c:271
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
-#: ../glib/gdatetime.c:248
+#: ../glib/gdatetime.c:273
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../glib/gdatetime.c:250
+#: ../glib/gdatetime.c:275
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
-#: ../glib/gdatetime.c:252
+#: ../glib/gdatetime.c:277
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "æ??æ??å?­"
 
-#: ../glib/gdatetime.c:254
+#: ../glib/gdatetime.c:279
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
 
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:294
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "�"
 
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:296
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "�"
 
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:298
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "�"
 
-#: ../glib/gdatetime.c:275
+#: ../glib/gdatetime.c:300
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "å??"
 
-#: ../glib/gdatetime.c:277
+#: ../glib/gdatetime.c:302
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "�"
 
-#: ../glib/gdatetime.c:279
+#: ../glib/gdatetime.c:304
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "å?­"
 
-#: ../glib/gdatetime.c:281
+#: ../glib/gdatetime.c:306
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "æ?¥"
 
-#: ../glib/gdir.c:114 ../glib/gdir.c:137
+#: ../glib/gdir.c:115 ../glib/gdir.c:138
 #, c-format
 msgid "Error opening directory '%s': %s"
 msgstr "æ??å¼?ç?®å½?â??%sâ??æ?¶å??ç??é??误ï¼?%s"
@@ -739,298 +740,298 @@ msgstr "æ??æ¡£å?¨å??ç´ â??%sâ??ç»?æ??æ ?记中æ??å¤?ç»?æ??"
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr "æ??æ¡£å?¨æ³¨é??æ??å¤?ç??æ??令中æ??å¤?ç»?æ??"
 
-#: ../glib/gregex.c:184
+#: ../glib/gregex.c:188
 msgid "corrupted object"
 msgstr "æ? æ??对象"
 
-#: ../glib/gregex.c:186
+#: ../glib/gregex.c:190
 msgid "internal error or corrupted object"
 msgstr "å??é?¨é??误æ??è??æ? æ??对象"
 
-#: ../glib/gregex.c:188
+#: ../glib/gregex.c:192
 msgid "out of memory"
 msgstr "å??å­?ä¸?足"
 
-#: ../glib/gregex.c:193
+#: ../glib/gregex.c:197
 msgid "backtracking limit reached"
 msgstr "è¾¾å?°å??溯ä¸?é??"
 
-#: ../glib/gregex.c:205 ../glib/gregex.c:213
+#: ../glib/gregex.c:209 ../glib/gregex.c:217
 msgid "the pattern contains items not supported for partial matching"
 msgstr "表达å¼?å??å?«ä¸?被é?¨å??å?¹é??æ?¯æ??ç??项"
 
-#: ../glib/gregex.c:207 ../gio/glocalfile.c:2109
+#: ../glib/gregex.c:211 ../gio/glocalfile.c:2109
 msgid "internal error"
 msgstr "å??é?¨é??误"
 
-#: ../glib/gregex.c:215
+#: ../glib/gregex.c:219
 msgid "back references as conditions are not supported for partial matching"
 msgstr "ä¸?å®?å?¨å?¹é??æ?¶ä½?为æ?¡ä»¶ç??å??å??å¼?ç?¨ä¸?被æ?¯æ??."
 
-#: ../glib/gregex.c:224
+#: ../glib/gregex.c:228
 msgid "recursion limit reached"
 msgstr "è¾¾å?°é??å½?ä¸?é??"
 
-#: ../glib/gregex.c:226
+#: ../glib/gregex.c:230
 msgid "workspace limit for empty substrings reached"
 msgstr "è¾¾å?°ç©ºå­?串ç??å·¥ä½?空é?´é??å?¶"
 
-#: ../glib/gregex.c:228
+#: ../glib/gregex.c:232
 msgid "invalid combination of newline flags"
 msgstr "æ? æ??ç??æ?°è¡?æ ?å¿?ç»?å??."
 
-#: ../glib/gregex.c:232
+#: ../glib/gregex.c:236
 msgid "unknown error"
 msgstr "æ?ªç?¥é??误"
 
-#: ../glib/gregex.c:252
+#: ../glib/gregex.c:256
 msgid "\\ at end of pattern"
 msgstr "表达å¼?æ?«å°¾ç?? \\"
 
-#: ../glib/gregex.c:255
+#: ../glib/gregex.c:259
 msgid "\\c at end of pattern"
 msgstr "表达å¼?æ?«å°¾ç?? \\c"
 
-#: ../glib/gregex.c:258
+#: ../glib/gregex.c:262
 msgid "unrecognized character follows \\"
 msgstr "æ? æ³?è¯?å?« \\ å??ç??å­?符"
 
-#: ../glib/gregex.c:265
+#: ../glib/gregex.c:269
 msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here"
 msgstr "è¿?é??ä¸?å??许使ç?¨æ?¹å??大å°?å??ç??转ä¹?符(\\l, \\L, \\u, \\U)"
 
-#: ../glib/gregex.c:268
+#: ../glib/gregex.c:272
 msgid "numbers out of order in {} quantifier"
 msgstr "{} é??ç??æ?°å­?次åº?颠å??äº?"
 
-#: ../glib/gregex.c:271
+#: ../glib/gregex.c:275
 msgid "number too big in {} quantifier"
 msgstr "{} é??ç??æ?°å­?太大äº?"
 
-#: ../glib/gregex.c:274
+#: ../glib/gregex.c:278
 msgid "missing terminating ] for character class"
 msgstr "å­?符类缺å°?ç»?ç»?ç?? ]"
 
-#: ../glib/gregex.c:277
+#: ../glib/gregex.c:281
 msgid "invalid escape sequence in character class"
 msgstr "å­?符类å??å?«æ? æ??ç??转ä¹?åº?å??"
 
-#: ../glib/gregex.c:280
+#: ../glib/gregex.c:284
 msgid "range out of order in character class"
 msgstr "å­?符类ç??è??å?´æ¬¡åº?颠å??"
 
-#: ../glib/gregex.c:283
+#: ../glib/gregex.c:287
 msgid "nothing to repeat"
 msgstr "没æ??å?¯ä»¥é??å¤?ç??å??容"
 
-#: ../glib/gregex.c:286
+#: ../glib/gregex.c:290
 msgid "unrecognized character after (?"
 msgstr "(? å??æ??æ? æ³?è¯?å?«ç??å­?符"
 
-#: ../glib/gregex.c:290
+#: ../glib/gregex.c:294
 msgid "unrecognized character after (?<"
 msgstr "(?< å??æ??æ? æ³?è¯?å?«ç??å­?符"
 
-#: ../glib/gregex.c:294
+#: ../glib/gregex.c:298
 msgid "unrecognized character after (?P"
 msgstr "(?P æ??æ? æ³?è¯?å?«ç??å­?符"
 
-#: ../glib/gregex.c:297
+#: ../glib/gregex.c:301
 msgid "POSIX named classes are supported only within a class"
 msgstr "å?ªæ??ç±»é??æ?¯æ?? POSIX å?½å??ç??ç±»"
 
-#: ../glib/gregex.c:300
+#: ../glib/gregex.c:304
 msgid "missing terminating )"
 msgstr "缺å°?ç»?æ??ç?? )"
 
-#: ../glib/gregex.c:304
+#: ../glib/gregex.c:308
 msgid ") without opening ("
 msgstr ") 没æ??å¼?å§?ç?? ("
 
 #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
 #. * sequences here, '(?-54' would be an example for the second group.
 #.
-#: ../glib/gregex.c:311
+#: ../glib/gregex.c:315
 msgid "(?R or (?[+-]digits must be followed by )"
 msgstr "(?R æ?? (?[+-]æ?°å­? å¿?é¡»è·?ç?? )"
 
-#: ../glib/gregex.c:314
+#: ../glib/gregex.c:318
 msgid "reference to non-existent subpattern"
 msgstr "å¼?ç?¨äº?ä¸?å­?å?¨ç??å­?表达å¼?"
 
-#: ../glib/gregex.c:317
+#: ../glib/gregex.c:321
 msgid "missing ) after comment"
 msgstr "注é??å??缺å°? )"
 
-#: ../glib/gregex.c:320
+#: ../glib/gregex.c:324
 msgid "regular expression too large"
 msgstr "æ­£å??表达å¼?è¿?é?¿"
 
-#: ../glib/gregex.c:323
+#: ../glib/gregex.c:327
 msgid "failed to get memory"
 msgstr "è?·å??å??å­?失败"
 
-#: ../glib/gregex.c:326
+#: ../glib/gregex.c:330
 msgid "lookbehind assertion is not fixed length"
 msgstr "lookbehind æ?­è¨?ä¸?æ?¯å®?é?¿ç??"
 
-#: ../glib/gregex.c:329
+#: ../glib/gregex.c:333
 msgid "malformed number or name after (?("
 msgstr "(?( å??æ??å½¢å¼?ä¸?正确ç??æ?°å­?æ??å??称"
 
-#: ../glib/gregex.c:332
+#: ../glib/gregex.c:336
 msgid "conditional group contains more than two branches"
 msgstr "æ?¡ä»¶ç»?å??å?«äº?è¶?è¿?两个å??æ?¯"
 
-#: ../glib/gregex.c:335
+#: ../glib/gregex.c:339
 msgid "assertion expected after (?("
 msgstr "(?( å??åº?该æ??æ?­è¨?"
 
-#: ../glib/gregex.c:338
+#: ../glib/gregex.c:342
 msgid "unknown POSIX class name"
 msgstr "æ?ªç?¥ç?? POSIX ç±»å??"
 
-#: ../glib/gregex.c:341
+#: ../glib/gregex.c:345
 msgid "POSIX collating elements are not supported"
 msgstr "ä¸?æ?¯æ?? POSIX æ?´ç??å??ç´ "
 
-#: ../glib/gregex.c:344
+#: ../glib/gregex.c:348
 msgid "character value in \\x{...} sequence is too large"
 msgstr "\\x{...} åº?å??é??ç??å­?符å?¼å¤ªå¤§äº?"
 
-#: ../glib/gregex.c:347
+#: ../glib/gregex.c:351
 msgid "invalid condition (?(0)"
 msgstr "æ? æ??ç??æ?¡ä»¶ (?(0)"
 
-#: ../glib/gregex.c:350
+#: ../glib/gregex.c:354
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "lookbehind æ?­è¨?é??ä¸?å??许使ç?¨ \\C"
 
-#: ../glib/gregex.c:353
+#: ../glib/gregex.c:357
 msgid "recursive call could loop indefinitely"
 msgstr "é??å½?è°?ç?¨å?¯è?½å¯¼è?´æ? é??循ç?¯"
 
-#: ../glib/gregex.c:356
+#: ../glib/gregex.c:360
 msgid "missing terminator in subpattern name"
 msgstr "å­?表达å¼?å??é??缺å°?ç»?ç»?符"
 
-#: ../glib/gregex.c:359
+#: ../glib/gregex.c:363
 msgid "two named subpatterns have the same name"
 msgstr "两个æ??å??å­?表达å¼?æ??ç?¸å??ç??å??称"
 
-#: ../glib/gregex.c:362
+#: ../glib/gregex.c:366
 msgid "malformed \\P or \\p sequence"
 msgstr "å½¢å¼?ä¸?正确ç?? \\P æ?? \\p åº?å??"
 
-#: ../glib/gregex.c:365
+#: ../glib/gregex.c:369
 msgid "unknown property name after \\P or \\p"
 msgstr "\\P æ?? \\p å??æ??æ?ªç?¥ç??å±?æ?§å??"
 
-#: ../glib/gregex.c:368
+#: ../glib/gregex.c:372
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "å­?表达å¼?å??太é?¿äº?(æ??å¤?32个å­?符)"
 
-#: ../glib/gregex.c:371
+#: ../glib/gregex.c:375
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "æ??å??å­?表达å¼?太å¤?äº?(æ??å¤?10,000个)"
 
-#: ../glib/gregex.c:374
+#: ../glib/gregex.c:378
 msgid "octal value is greater than \\377"
 msgstr "����大� \\377"
 
-#: ../glib/gregex.c:377
+#: ../glib/gregex.c:381
 msgid "DEFINE group contains more than one branch"
 msgstr "DEFINE ç»?å??å?«å¤?äº?ä¸?个å??æ?¯"
 
-#: ../glib/gregex.c:380
+#: ../glib/gregex.c:384
 msgid "repeating a DEFINE group is not allowed"
 msgstr "ä¸?å??许é??å¤? DEFINE ç»?"
 
-#: ../glib/gregex.c:383
+#: ../glib/gregex.c:387
 msgid "inconsistent NEWLINE options"
 msgstr "ä¸?ä¸?è?´ç?? NEWLINE é??项"
 
-#: ../glib/gregex.c:386
+#: ../glib/gregex.c:390
 msgid ""
 "\\g is not followed by a braced name or an optionally braced non-zero number"
 msgstr "\\g å??没æ??è?±æ?¬å?·æ?¬èµ·æ?¥ç??å??称æ??å?¯é??ç??è?±æ?¬å?·æ?¬èµ·æ?¥ç??é??é?¶æ?°å­?"
 
-#: ../glib/gregex.c:391
+#: ../glib/gregex.c:395
 msgid "unexpected repeat"
 msgstr "é??é¢?æ??ç??é??å¤?"
 
-#: ../glib/gregex.c:395
+#: ../glib/gregex.c:399
 msgid "code overflow"
 msgstr "代�溢�"
 
-#: ../glib/gregex.c:399
+#: ../glib/gregex.c:403
 msgid "overran compiling workspace"
 msgstr "ç¼?è¯?å·¥ä½?å?ºè¶?å?ºæ­£å¸¸è??å?´"
 
-#: ../glib/gregex.c:403
+#: ../glib/gregex.c:407
 msgid "previously-checked referenced subpattern not found"
 msgstr "æ?ªæ?¾å?°ä¹?å??æ£?æ?¥è¿?ç??å¼?ç?¨è¿?ç??å­?表达å¼?"
 
-#: ../glib/gregex.c:575 ../glib/gregex.c:1696
+#: ../glib/gregex.c:579 ../glib/gregex.c:1700
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "å?¹é??æ­£å??表达å¼? %s å?ºç?°é??误ï¼?%s"
 
-#: ../glib/gregex.c:1151
+#: ../glib/gregex.c:1155
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "PCRE åº?ç¼?è¯?æ?¶æ?ªå??å?« UTF8 æ?¯æ??"
 
-#: ../glib/gregex.c:1160
+#: ../glib/gregex.c:1164
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "PCRE åº?ç¼?è¯?æ?¶æ?ªå??å?« UTF8 å±?æ?§æ?¯æ??"
 
-#: ../glib/gregex.c:1214
+#: ../glib/gregex.c:1218
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "ç¼?è¯?æ­£å??表达å¼? %s (äº?å­?符 %d å¤?)æ?¶å?ºé??ï¼?%s"
 
-#: ../glib/gregex.c:1250
+#: ../glib/gregex.c:1254
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "ä¼?å??æ­£å??表达å¼? %s æ?¶å?ºé??ï¼?%s"
 
-#: ../glib/gregex.c:2124
+#: ../glib/gregex.c:2128
 msgid "hexadecimal digit or '}' expected"
 msgstr "æ??æ??å??å?­è¿?å?¶æ?°æ?? '}'"
 
-#: ../glib/gregex.c:2140
+#: ../glib/gregex.c:2144
 msgid "hexadecimal digit expected"
 msgstr "æ??æ??å??å?­è¿?å?¶æ?°"
 
-#: ../glib/gregex.c:2180
+#: ../glib/gregex.c:2184
 msgid "missing '<' in symbolic reference"
 msgstr "å?¨ç¬¦å?·å¼?ç?¨ä¸­ç¼ºå°?â??<â??"
 
-#: ../glib/gregex.c:2189
+#: ../glib/gregex.c:2193
 msgid "unfinished symbolic reference"
 msgstr "æ?ªå®?æ??ç??符å?·å¼?ç?¨"
 
-#: ../glib/gregex.c:2196
+#: ../glib/gregex.c:2200
 msgid "zero-length symbolic reference"
 msgstr "��符���"
 
-#: ../glib/gregex.c:2207
+#: ../glib/gregex.c:2211
 msgid "digit expected"
 msgstr "æ??æ??æ?°å­?"
 
-#: ../glib/gregex.c:2225
+#: ../glib/gregex.c:2229
 msgid "illegal symbolic reference"
 msgstr "é??æ³?ç??符å?·å¼?ç?¨"
 
-#: ../glib/gregex.c:2287
+#: ../glib/gregex.c:2291
 msgid "stray final '\\'"
 msgstr "丢失äº?æ??å??ç??â??\\â??"
 
-#: ../glib/gregex.c:2291
+#: ../glib/gregex.c:2295
 msgid "unknown escape sequence"
 msgstr "æ?ªç?¥ç??转ä¹?åº?å??"
 
-#: ../glib/gregex.c:2301
+#: ../glib/gregex.c:2305
 #, c-format
 msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
 msgstr "å??æ??æ?¿æ?¢æ??æ?¬\"%s\" æ?¶å?¨å­?符 %lu å¤?å??ç??é??误ï¼?%s"
@@ -1340,18 +1341,18 @@ 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:724
+#: ../gio/goutputstream.c:198 ../gio/goutputstream.c:725
 #, 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:1199
+#: ../gio/giostream.c:306 ../gio/goutputstream.c:1200
 msgid "Stream is already closed"
 msgstr "�已���"
 
-#: ../gio/gcancellable.c:432 ../gio/gdbusconnection.c:1549
-#: ../gio/gdbusconnection.c:1638 ../gio/gdbusconnection.c:1820
+#: ../gio/gcancellable.c:432 ../gio/gdbusconnection.c:1634
+#: ../gio/gdbusconnection.c:1723 ../gio/gdbusconnection.c:1905
 #: ../gio/glocalfile.c:2102 ../gio/gsimpleasyncresult.c:755
 #: ../gio/gsimpleasyncresult.c:781
 msgid "Operation was cancelled"
@@ -1369,7 +1370,7 @@ msgstr "è¾?å?¥ä¸­æ??ä¸?å®?æ?´ç??å¤?å­?è??åº?å??"
 msgid "Not enough space in destination"
 msgstr "ç?®æ ?没æ??足å¤?ç??空é?´"
 
-#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:810
+#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:831
 msgid "Cancellable initialization not supported"
 msgstr "ä¸?æ?¯æ??å?¯æ?¤é??ç??å??å§?å??"
 
@@ -1524,14 +1525,14 @@ msgstr "å?½ä»¤ %s 以é??é?¶ç?¶æ??æ?° %d é??å?ºï¼?%s"
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr "æ? æ³?ç¡®å®?ä¼?è¯?æ?»çº¿å?°å??(å°?æ?ªå?¨æ­¤æ??ä½?ç³»ç»?ä¸?å®?ç?°)"
 
-#: ../gio/gdbusaddress.c:1245 ../gio/gdbusconnection.c:6013
+#: ../gio/gdbusaddress.c:1245 ../gio/gdbusconnection.c:6143
 #, 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:6022
+#: ../gio/gdbusaddress.c:1254 ../gio/gdbusconnection.c:6152
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -1633,86 +1634,86 @@ msgstr "æ??å¼?é?¥å??ç?¯â??%sâ??以å??å?¥å?ºé??ï¼?"
 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:1649
+#: ../gio/gdbusconnection.c:1142 ../gio/gdbusconnection.c:1371
+#: ../gio/gdbusconnection.c:1410 ../gio/gdbusconnection.c:1734
 msgid "The connection is closed"
 msgstr "��已��"
 
-#: ../gio/gdbusconnection.c:1593
+#: ../gio/gdbusconnection.c:1678
 msgid "Timeout was reached"
 msgstr "å·²å?°è¶?æ?¶é??å?¶"
 
-#: ../gio/gdbusconnection.c:2170
+#: ../gio/gdbusconnection.c:2292
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr "æ??建客æ?·ç«¯è¿?æ?¥æ?¶é??å?°ä¸?æ?¯æ??ç??æ ?å¿?"
 
-#: ../gio/gdbusconnection.c:3596 ../gio/gdbusconnection.c:3914
+#: ../gio/gdbusconnection.c:3726 ../gio/gdbusconnection.c:4044
 #, c-format
 msgid ""
 "No such interface `org.freedesktop.DBus.Properties' on object at path %s"
 msgstr "è·¯å¾? %s ç??对象ä¸?没æ?? org.freedesktop.DBus.Properties æ?¥å?£"
 
-#: ../gio/gdbusconnection.c:3668
+#: ../gio/gdbusconnection.c:3798
 #, c-format
 msgid "Error setting property `%s': Expected type `%s' but got `%s'"
 msgstr "设置å±?æ?§ %s å?ºé??ï¼?æ??æ?? %s ç±»å??ä½?å¾?å?° %s ç±»å??"
 
-#: ../gio/gdbusconnection.c:3763
+#: ../gio/gdbusconnection.c:3893
 #, c-format
 msgid "No such property `%s'"
 msgstr "�此���%s"
 
-#: ../gio/gdbusconnection.c:3775
+#: ../gio/gdbusconnection.c:3905
 #, c-format
 msgid "Property `%s' is not readable"
 msgstr "�� %s ��读"
 
-#: ../gio/gdbusconnection.c:3786
+#: ../gio/gdbusconnection.c:3916
 #, c-format
 msgid "Property `%s' is not writable"
 msgstr "å±?æ?§ %s ä¸?å?¯å??"
 
-#: ../gio/gdbusconnection.c:3856 ../gio/gdbusconnection.c:5447
+#: ../gio/gdbusconnection.c:3986 ../gio/gdbusconnection.c:5577
 #, c-format
 msgid "No such interface `%s'"
 msgstr "�此���%s"
 
-#: ../gio/gdbusconnection.c:4044
+#: ../gio/gdbusconnection.c:4174
 msgid "No such interface"
 msgstr "�此��"
 
-#: ../gio/gdbusconnection.c:4260 ../gio/gdbusconnection.c:5963
+#: ../gio/gdbusconnection.c:4390 ../gio/gdbusconnection.c:6093
 #, c-format
 msgid "No such interface `%s' on object at path %s"
 msgstr "å?¨è·¯å¾? %s ç??对象ä¸?没æ?? %s æ?¥å?£"
 
-#: ../gio/gdbusconnection.c:4312
+#: ../gio/gdbusconnection.c:4442
 #, c-format
 msgid "No such method `%s'"
 msgstr "�此���%s"
 
-#: ../gio/gdbusconnection.c:4343
+#: ../gio/gdbusconnection.c:4473
 #, c-format
 msgid "Type of message, `%s', does not match expected type `%s'"
 msgstr "æ¶?æ?¯ç??ç±»å??â??%sâ??ï¼?ä¸?é¢?æ??ç??ç±»å??â??%sâ??ä¸?å?¹é??"
 
-#: ../gio/gdbusconnection.c:4562
+#: ../gio/gdbusconnection.c:4692
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "%2$s å¤?ç??æ?¥å?£ %1$s å·²ç»?导å?ºäº?ä¸?个对象"
 
-#: ../gio/gdbusconnection.c:4756
+#: ../gio/gdbusconnection.c:4886
 #, c-format
 msgid "Method `%s' returned type `%s', but expected `%s'"
 msgstr "æ?¹æ³?â??%sâ??è¿?å??ç±»å??â??%sâ??ï¼?ä½?é¢?æ??ç??æ?¯â??%sâ??"
 
-#: ../gio/gdbusconnection.c:5558
+#: ../gio/gdbusconnection.c:5688
 #, c-format
 msgid "Method `%s' on interface `%s' with signature `%s' does not exist"
 msgstr "带æ?? %3$s ç­¾å??ç??æ?¥å?£ %2$s ä¸?ä¸?å­?å?¨ %1$s æ?¹æ³?"
 
-#: ../gio/gdbusconnection.c:5676
+#: ../gio/gdbusconnection.c:5806
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "已�为 %s 导��个��"
@@ -1872,13 +1873,13 @@ msgstr "è¿?å??空主ä½?å?ºé??"
 msgid "Type of return value is incorrect, got `%s', expected `%s'"
 msgstr "è¿?å??å?¼ç±»å??ä¸?正确ï¼?è?·å¾?äº?â??%sâ??ï¼?ä½?æ?¯æ??æ??â??%sâ??"
 
-#: ../gio/gdbusmethodinvocation.c:406 ../gio/gsocket.c:2974
-#: ../gio/gsocket.c:3055
+#: ../gio/gdbusmethodinvocation.c:406 ../gio/gsocket.c:2999
+#: ../gio/gsocket.c:3080
 #, c-format
 msgid "Error sending message: %s"
 msgstr "å??é??ä¿¡æ?¯å?ºé??ï¼?%s"
 
-#: ../gio/gdbusprivate.c:1766
+#: ../gio/gdbusprivate.c:1771
 msgid "Unable to load /var/lib/dbus/machine-id: "
 msgstr "æ? æ³?å? è½½ /var/lib/dbus/machine-idï¼?"
 
@@ -2332,7 +2333,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:1209
+#: ../gio/goutputstream.c:1210
 msgid "Stream has outstanding operation"
 msgstr "æµ?æ??å¼?常æ??ä½?"
 
@@ -2345,52 +2346,52 @@ msgstr "没æ??足å¤?ç??空é?´å¥?æ?¥å­?å?°å??"
 msgid "Unsupported socket address"
 msgstr "ä¸?æ?¯æ??ç??å¥?æ?¥å­?å?°å??"
 
-#: ../gio/glib-compile-schemas.c:702
+#: ../gio/glib-compile-schemas.c:708
 msgid "empty names are not permitted"
 msgstr "ä¸?å??许空å??称"
 
-#: ../gio/glib-compile-schemas.c:712
+#: ../gio/glib-compile-schemas.c:718
 #, c-format
 msgid "invalid name '%s': names must begin with a lowercase letter"
 msgstr "æ? æ??å??称 %sï¼?å??称å¿?须以å°?å??å­?æ¯?å¼?å§?"
 
-#: ../gio/glib-compile-schemas.c:724
+#: ../gio/glib-compile-schemas.c:730
 #, 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
+#: ../gio/glib-compile-schemas.c:739
 #, c-format
 msgid "invalid name '%s': two successive dashes ('--') are not permitted."
 msgstr "æ? æ??å??称 %sï¼?ä¸?å??许使ç?¨è¿?ç»­ç??横è¡?(â??--â??)ã??"
 
-#: ../gio/glib-compile-schemas.c:742
+#: ../gio/glib-compile-schemas.c:748
 #, c-format
 msgid "invalid name '%s': the last character may not be a dash ('-')."
 msgstr "æ? æ??å??称 %sï¼?æ??å??ä¸?个å­?符串ä¸?åº?为横线(â??-â??)ã??"
 
-#: ../gio/glib-compile-schemas.c:750
+#: ../gio/glib-compile-schemas.c:756
 #, c-format
 msgid "invalid name '%s': maximum length is 32"
 msgstr "æ? æ??å??称 %sï¼?æ??大é?¿åº¦ä¸º 32"
 
-#: ../gio/glib-compile-schemas.c:819
+#: ../gio/glib-compile-schemas.c:825
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> å·²æ??å®?"
 
-#: ../gio/glib-compile-schemas.c:845
+#: ../gio/glib-compile-schemas.c:851
 msgid "can not add keys to a 'list-of' schema"
 msgstr "��添����个 list-of 大纲"
 
-#: ../gio/glib-compile-schemas.c:856
+#: ../gio/glib-compile-schemas.c:862
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> å·²æ??å®?"
 
-#: ../gio/glib-compile-schemas.c:874
+#: ../gio/glib-compile-schemas.c:880
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2399,156 +2400,192 @@ msgstr ""
 "<key name='%s'> ä¸? <key name='%s'> å?¨ <schema id='%s'> é??å??; 请使ç?¨ "
 "<override> ä¿®æ?¹å?¶å?¼ã??"
 
-#: ../gio/glib-compile-schemas.c:885
+#: ../gio/glib-compile-schemas.c:891
 #, c-format
 msgid ""
 "exactly one of 'type', 'enum' or 'flags' must be specified as an attribute "
 "to <key>"
-msgstr ""
-"typeã??enum æ?? flags 中å¿?é¡»æ??ä¸?个被æ??å®?为 <key> ç??å±?æ?§ã??"
+msgstr "typeã??enum æ?? flags 中å¿?é¡»æ??ä¸?个被æ??å®?为 <key> ç??å±?æ?§ã??"
 
-#: ../gio/glib-compile-schemas.c:904
+#: ../gio/glib-compile-schemas.c:910
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> å°?æ?ªå®?ä¹?ã??"
 
-#: ../gio/glib-compile-schemas.c:919
+#: ../gio/glib-compile-schemas.c:925
 #, c-format
 msgid "invalid GVariant type string '%s'"
 msgstr "æ? æ??ç?? GVariant ç±»å??å­?符串 %s"
 
-#: ../gio/glib-compile-schemas.c:949
+#: ../gio/glib-compile-schemas.c:955
 msgid "<override> given but schema isn't extending anything"
 msgstr "��� <override> �大纲���"
 
-#: ../gio/glib-compile-schemas.c:962
+#: ../gio/glib-compile-schemas.c:968
 #, c-format
 msgid "no <key name='%s'> to override"
 msgstr "æ?  <key name='%s'> å?¯è¦?ç??"
 
-#: ../gio/glib-compile-schemas.c:970
+#: ../gio/glib-compile-schemas.c:976
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> å·²æ??å®?"
 
-#: ../gio/glib-compile-schemas.c:1036
+#: ../gio/glib-compile-schemas.c:1047
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> å·²æ??å®?"
 
-#: ../gio/glib-compile-schemas.c:1048
+#: ../gio/glib-compile-schemas.c:1059
 #, c-format
 msgid "<schema id='%s'> extends not yet existing schema '%s'"
 msgstr "<schema id='%s'> æ?©å±?äº?å°?ä¸?å­?å?¨ç??大纲 %s"
 
-#: ../gio/glib-compile-schemas.c:1064
+#: ../gio/glib-compile-schemas.c:1075
 #, 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
+#: ../gio/glib-compile-schemas.c:1083
 #, c-format
 msgid "Can not be a list of a schema with a path"
 msgstr "ä¸?è?½æ?¯ä¸?ç³»å??带æ??è·¯å¾?ç??大纲"
 
-#: ../gio/glib-compile-schemas.c:1082
+#: ../gio/glib-compile-schemas.c:1093
 #, c-format
 msgid "Can not extend a schema with a path"
 msgstr "��使�路���大纲"
 
-#: ../gio/glib-compile-schemas.c:1092
+#: ../gio/glib-compile-schemas.c:1103
 #, 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'> ä¸?æ?¯å??表"
+msgstr "<schema id='%s'> æ?¯ä¸?个å??表ï¼?æ?©å±?ç?? <schema id='%s'> ä¸?æ?¯å??表"
 
-#: ../gio/glib-compile-schemas.c:1102
+#: ../gio/glib-compile-schemas.c:1113
 #, 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"
+"<schema id='%s' list-of='%s'> æ?©å±? <schema id='%s' list-of='%s'>ï¼?ä½?â??%sâ??ä¸?æ?©"
+"å±? %s"
 
-#: ../gio/glib-compile-schemas.c:1119
+#: ../gio/glib-compile-schemas.c:1130
 #, c-format
 msgid "a path, if given, must begin and end with a slash"
 msgstr "ä¸?个路å¾?ï¼?å¦?æ??ç»?å?ºå??å¿?须以æ??线(/)å¼?å§?å??ç»?æ??"
 
-#: ../gio/glib-compile-schemas.c:1126
+#: ../gio/glib-compile-schemas.c:1137
 #, c-format
 msgid "the path of a list must end with ':/'"
 msgstr "ä¸?个å??表ç??è·¯å¾?å¿?须以 :/ ç»?æ??"
 
-#: ../gio/glib-compile-schemas.c:1148
+#: ../gio/glib-compile-schemas.c:1163
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> å·²æ??å®?"
 
-#: ../gio/glib-compile-schemas.c:1362
+#: ../gio/glib-compile-schemas.c:1380
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "å?¨ <%2$s> 中ä¸?å??许å??ç´  <%1$s>"
 
-#: ../gio/glib-compile-schemas.c:1366
+#: ../gio/glib-compile-schemas.c:1384
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "顶å±?中ä¸?å??许å??ç´  <%s>"
 
-#: ../gio/glib-compile-schemas.c:1460
+#: ../gio/glib-compile-schemas.c:1478
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "<%s> å??ä¸?åº?å?ºç?°æ??æ?¬"
 
-#: ../gio/glib-compile-schemas.c:1674
+#. Translators: Do not translate "--strict".
+#: ../gio/glib-compile-schemas.c:1647 ../gio/glib-compile-schemas.c:1718
+#: ../gio/glib-compile-schemas.c:1794
+#, c-format
+msgid "--strict was specified; exiting.\n"
+msgstr "æ??å®?äº? --strict é??项ï¼?æ­£å?¨é??å?ºã??\n"
+
+#: ../gio/glib-compile-schemas.c:1655
+#, c-format
+msgid "This entire file has been ignored.\n"
+msgstr "已忽ç?¥æ?´ä¸ªæ??件ã??\n"
+
+#: ../gio/glib-compile-schemas.c:1714
 #, c-format
-msgid "No such schema `%s' specified in override file `%s'"
-msgstr "è¦?ç??æ??件 %2$s 中æ?ªæ??å®?大纲 %1$s"
+msgid "Ignoring this file.\n"
+msgstr "忽ç?¥è¿?个æ??件ã??\n"
 
-#: ../gio/glib-compile-schemas.c:1698
+#: ../gio/glib-compile-schemas.c:1754
 #, 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
+#: ../gio/glib-compile-schemas.c:1760 ../gio/glib-compile-schemas.c:1818
+#: ../gio/glib-compile-schemas.c:1846
+#, c-format
+msgid "; ignoring override for this key.\n"
+msgstr "ï¼?忽ç?¥æ­¤é?®ç??è¦?ç??ã??\n"
+
+#: ../gio/glib-compile-schemas.c:1764 ../gio/glib-compile-schemas.c:1822
+#: ../gio/glib-compile-schemas.c:1850
+#, c-format
+msgid " and --strict was specified; exiting.\n"
+msgstr "ä¸?æ??å®?äº? --strict æ??件ï¼?æ­£å?¨é??å?ºã??\n"
+
+#: ../gio/glib-compile-schemas.c:1780
+#, c-format
+msgid ""
+"error parsing key `%s' in schema `%s' as specified in override file `%s': %"
+"s.  "
+msgstr "解æ??æ??件 %3$s 中æ??å®?ç??大纲 %2$s 中ç?? %1$s é?®å?ºé??ï¼?%4$sã??"
+
+#: ../gio/glib-compile-schemas.c:1790
+#, c-format
+msgid "Ignoring override for this key.\n"
+msgstr "忽ç?¥æ­¤é?®ç??è¦?ç??ã??\n"
+
+#: ../gio/glib-compile-schemas.c:1808
 #, 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 ç??è¦?ç??è¶?å?ºäº?大纲ç»?å?ºç??è??å?´"
+msgstr "è¦?ç??æ??件 %3$s 中大纲 %2$s ç??é?® %1$s ç??è¦?ç??è¶?å?ºäº?大纲ç»?å?ºç??è??å?´"
 
-#: ../gio/glib-compile-schemas.c:1752
+#: ../gio/glib-compile-schemas.c:1836
 #, 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 ç??è¦?ç??ç??å?¼ä¸?å?¨æ??æ??å?¼å??表å??"
+msgstr "è¦?ç??æ??件 %3$s 中大纲 %2$s ç??é?® %1$s ç??è¦?ç??ç??å?¼ä¸?å?¨æ??æ??å?¼å??表å??"
 
-#: ../gio/glib-compile-schemas.c:1797
+#: ../gio/glib-compile-schemas.c:1890
 msgid "where to store the gschemas.compiled file"
 msgstr "gschemas.compiled æ??件å­?å?¨äº?ä½?å¤?"
 
-#: ../gio/glib-compile-schemas.c:1797 ../gio/glib-compile-schemas.c:1809
+#: ../gio/glib-compile-schemas.c:1890 ../gio/glib-compile-schemas.c:1903
 msgid "DIRECTORY"
 msgstr "��"
 
-#: ../gio/glib-compile-schemas.c:1798
+#: ../gio/glib-compile-schemas.c:1891
+msgid "Abort on any errors in schemas"
+msgstr "å?¨é??å?°å¤§çº²ä¸­ç??ä»»ä½?é??误æ?¶ä¸­æ­¢"
+
+#: ../gio/glib-compile-schemas.c:1892
 msgid "Do not write the gschema.compiled file"
 msgstr "ä¸?è¦?对 gschema.compiled è¿?è¡?å??æ??ä½?"
 
-#: ../gio/glib-compile-schemas.c:1799
+#: ../gio/glib-compile-schemas.c:1893
 msgid "This option will be removed soon."
 msgstr "æ­¤é??项å°?å?¨ä¸?ä¹?å? é?¤ã??"
 
-#: ../gio/glib-compile-schemas.c:1800
+#: ../gio/glib-compile-schemas.c:1894
 msgid "Do not enforce key name restrictions"
 msgstr "ä¸?è¦?强å?¶é?®å??ç??é??å?¶"
 
-#: ../gio/glib-compile-schemas.c:1812
+#: ../gio/glib-compile-schemas.c:1906
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2558,22 +2595,22 @@ msgstr ""
 "è¦?使ç?¨æ?©å±? .gschema.xmlï¼?é??è¦?æ??模å¼?æ??件ï¼?\n"
 "ç¼?å­?æ??件被称为 gschemas.compiledã??"
 
-#: ../gio/glib-compile-schemas.c:1828
+#: ../gio/glib-compile-schemas.c:1922
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "æ?¨åº?该ç»?å?ºä¸?å?ªè?½ç»?å?ºä¸?个ç?®å½?å??\n"
 
-#: ../gio/glib-compile-schemas.c:1867
+#: ../gio/glib-compile-schemas.c:1961
 #, c-format
 msgid "No schema files found: "
 msgstr "没æ??æ?¾å?°æ¨¡å¼?æ??件ï¼?"
 
-#: ../gio/glib-compile-schemas.c:1870
+#: ../gio/glib-compile-schemas.c:1964
 #, c-format
 msgid "doing nothing.\n"
 msgstr "ä»?ä¹?é?½æ²¡å??ã??\n"
 
-#: ../gio/glib-compile-schemas.c:1873
+#: ../gio/glib-compile-schemas.c:1967
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "å·²å? é?¤å­?å?¨ç??è¾?å?ºæ??件ã??\n"
@@ -2948,11 +2985,11 @@ msgstr "æ??è½½æ?ªå®?ç?°å??æ­¥å??容类å??ç??æµ?"
 msgid "Hostname '%s' contains '[' but not ']'"
 msgstr "主æ?ºå??â??%sâ??å??å?«â??[â??ä½?æ?¯ç¼ºå°?â??]â??"
 
-#: ../gio/goutputstream.c:206 ../gio/goutputstream.c:407
+#: ../gio/goutputstream.c:207 ../gio/goutputstream.c:408
 msgid "Output stream doesn't implement write"
 msgstr "è¾?å?ºæµ?æ?ªå®?ç?°å??å?¥"
 
-#: ../gio/goutputstream.c:368 ../gio/goutputstream.c:848
+#: ../gio/goutputstream.c:369 ../gio/goutputstream.c:849
 msgid "Source stream is already closed"
 msgstr "���已���"
 
@@ -3005,19 +3042,20 @@ msgstr ""
 "使ç?¨â??%s å?½ä»¤ --helpâ??æ?¥è?·å??å?³äº?æ¯?ä¸?个å?½ä»¤ç??帮å?©ã??\n"
 
 #: ../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
+#: ../gio/gsettings-tool.c:437 ../gio/gsettings-tool.c:532
+#: ../gio/gsettings-tool.c:646
 msgid "Specify the path for the schema"
 msgstr "为模å¼?æ??å®?è·¯å¾?"
 
 #: ../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
+#: ../gio/gsettings-tool.c:437 ../gio/gsettings-tool.c:532
+#: ../gio/gsettings-tool.c:646
 msgid "PATH"
 msgstr "PATH"
 
-#: ../gio/gsettings-tool.c:228 ../gio/gsettings-tool.c:539
-#: ../gio/gsettings-tool.c:652
+#. Translators: Please keep order of words (command parameters)
+#: ../gio/gsettings-tool.c:228 ../gio/gsettings-tool.c:541
+#: ../gio/gsettings-tool.c:654
 msgid "SCHEMA KEY"
 msgstr "模�  �"
 
@@ -3025,8 +3063,8 @@ msgstr "模�  �"
 msgid "Get the value of KEY"
 msgstr "è?·å??é?®ç??å?¼"
 
-#: ../gio/gsettings-tool.c:232 ../gio/gsettings-tool.c:448
-#: ../gio/gsettings-tool.c:543 ../gio/gsettings-tool.c:659
+#: ../gio/gsettings-tool.c:232 ../gio/gsettings-tool.c:449
+#: ../gio/gsettings-tool.c:545 ../gio/gsettings-tool.c:661
 msgid ""
 "Arguments:\n"
 "  SCHEMA      The id of the schema\n"
@@ -3036,15 +3074,16 @@ msgstr ""
 "  模å¼?        模å¼?ç??æ ?è¯?\n"
 "  é?®          é?®ç??å??称\n"
 
-#: ../gio/gsettings-tool.c:328 ../gio/gsettings-tool.c:444
+#. Translators: Please keep order of words (command parameters)
+#: ../gio/gsettings-tool.c:329 ../gio/gsettings-tool.c:445
 msgid "SCHEMA KEY VALUE"
 msgstr "模� � �"
 
-#: ../gio/gsettings-tool.c:330
+#: ../gio/gsettings-tool.c:331
 msgid "Set the value of KEY"
 msgstr "设置é?®ç??å?¼"
 
-#: ../gio/gsettings-tool.c:332
+#: ../gio/gsettings-tool.c:333
 msgid ""
 "Arguments:\n"
 "  SCHEMA      The id of the schema\n"
@@ -3056,20 +3095,20 @@ msgstr ""
 "  é?®          é?®å??\n"
 "  å?¼          é?®è¦?设置为ç??å?¼ï¼?ä¸?个串è¡?å??ç?? GVariant\n"
 
-#: ../gio/gsettings-tool.c:405
+#: ../gio/gsettings-tool.c:406
 #, c-format
 msgid "Key %s is not writable\n"
 msgstr "é?® %s ä¸?å?¯å??\n"
 
-#: ../gio/gsettings-tool.c:446
+#: ../gio/gsettings-tool.c:447
 msgid "Sets KEY to its default value"
 msgstr "设置 KEY 为��认�"
 
-#: ../gio/gsettings-tool.c:541
+#: ../gio/gsettings-tool.c:543
 msgid "Find out whether KEY is writable"
 msgstr "æ?¥ç??é?®æ?¯å?¦å?¯å??"
 
-#: ../gio/gsettings-tool.c:655
+#: ../gio/gsettings-tool.c:657
 msgid ""
 "Monitor KEY for changes and print the changed values.\n"
 "Monitoring will continue until the process is terminated."
@@ -3077,7 +3116,7 @@ msgstr ""
 "ç??è§?é?®ç??æ?´æ?¹å¹¶æ?¾ç¤ºæ?´æ?¹è¿?ç??å?¼ã??\n"
 "ç??è§?å°?æ??ç»­å?°è¿?ç¨?ç»?æ??ã??"
 
-#: ../gio/gsettings-tool.c:831
+#: ../gio/gsettings-tool.c:833
 #, c-format
 msgid "Unknown command '%s'\n"
 msgstr "æ?ªç?¥å?½ä»¤â??%sâ??\n"
@@ -3095,97 +3134,97 @@ msgstr "æ? æ??ç??å¥?æ?¥å­?ï¼?å??å§?å??失败ç??å??å? æ?¯ï¼?%s"
 msgid "Socket is already closed"
 msgstr "���已���"
 
-#: ../gio/gsocket.c:299 ../gio/gsocket.c:2716 ../gio/gsocket.c:2760
+#: ../gio/gsocket.c:299 ../gio/gsocket.c:2741 ../gio/gsocket.c:2785
 msgid "Socket I/O timed out"
 msgstr "��� I/O ��"
 
-#: ../gio/gsocket.c:421
+#: ../gio/gsocket.c:442
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "ä»?æ??件æ??述符å??建 GSocketï¼?%s"
 
-#: ../gio/gsocket.c:455 ../gio/gsocket.c:471 ../gio/gsocket.c:2113
+#: ../gio/gsocket.c:476 ../gio/gsocket.c:492 ../gio/gsocket.c:2134
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "æ? æ³?å??建å¥?æ?¥å­?ï¼?%s"
 
-#: ../gio/gsocket.c:455
+#: ../gio/gsocket.c:476
 msgid "Unknown protocol was specified"
 msgstr "æ??å®?äº?æ?ªç?¥å??è®®"
 
-#: ../gio/gsocket.c:1224
+#: ../gio/gsocket.c:1245
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ä¸?è?½è?·å??æ?¬å?°å?°å??ï¼?%s"
 
-#: ../gio/gsocket.c:1267
+#: ../gio/gsocket.c:1288
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ä¸?è?½è?·å??è¿?ç¨?å?°å??ï¼? %s"
 
-#: ../gio/gsocket.c:1328
+#: ../gio/gsocket.c:1349
 #, c-format
 msgid "could not listen: %s"
 msgstr "æ? æ³?ç??å?¬ï¼?%s"
 
-#: ../gio/gsocket.c:1402
+#: ../gio/gsocket.c:1423
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "é??误ç»?å®?å?°å??ï¼?%s"
 
-#: ../gio/gsocket.c:1522
+#: ../gio/gsocket.c:1543
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "æ?¥å??è¿?æ?¥æ?¶å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:1639
+#: ../gio/gsocket.c:1660
 msgid "Error connecting: "
 msgstr "è¿?æ?¥å?ºé??ï¼?"
 
-#: ../gio/gsocket.c:1644
+#: ../gio/gsocket.c:1665
 msgid "Connection in progress"
 msgstr "正���"
 
-#: ../gio/gsocket.c:1651
+#: ../gio/gsocket.c:1672
 #, c-format
 msgid "Error connecting: %s"
 msgstr "è¿?æ?¥æ?¶å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:1694 ../gio/gsocket.c:3479
+#: ../gio/gsocket.c:1715 ../gio/gsocket.c:3504
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "æ? æ³?è?·å??æ?ªå?³ç??é??误ï¼?%s"
 
-#: ../gio/gsocket.c:1826
+#: ../gio/gsocket.c:1847
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "æ?¥æ?¶æ?°æ?®å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:2000
+#: ../gio/gsocket.c:2021
 #, c-format
 msgid "Error sending data: %s"
 msgstr "å??é??æ?°æ?®å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:2192
+#: ../gio/gsocket.c:2213
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "å?³é?­å¥?æ?¥å­?å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:2709
+#: ../gio/gsocket.c:2734
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "ç­?å¾?å¥?æ?¥å­?ç?¶æ??ï¼?%s"
 
-#: ../gio/gsocket.c:2999
+#: ../gio/gsocket.c:3024
 msgid "GSocketControlMessage not supported on windows"
 msgstr "Windows ä¸?æ?¯æ?? GSocketControlMessage"
 
-#: ../gio/gsocket.c:3258 ../gio/gsocket.c:3399
+#: ../gio/gsocket.c:3283 ../gio/gsocket.c:3424
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "æ?¥å??ä¿¡æ?¯å?ºé??ï¼?%s"
 
-#: ../gio/gsocket.c:3494
+#: ../gio/gsocket.c:3519
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "æ­¤æ??ä½?ç³»ç»?ä¸?没æ??å®?ç?° g_socket_get_credentials"
 
@@ -3245,8 +3284,7 @@ msgstr "SOCKSv5 代ç??æ??å?¡å?¨é??è¦?认è¯?ã??"
 #: ../gio/gsocks5proxy.c:179
 msgid ""
 "The SOCKSv5 require an authentication method that is not supported by GLib."
-msgstr ""
-"æ­¤ SOCKSv5 è¿?æ?¥é??è¦?ä¸?ç§? GLib æ?ªæ?¯æ??ç??认è¯?æ?¹æ³?ã??"
+msgstr "æ­¤ SOCKSv5 è¿?æ?¥é??è¦?ä¸?ç§? GLib æ?ªæ?¯æ??ç??认è¯?æ?¹æ³?ã??"
 
 #: ../gio/gsocks5proxy.c:208
 #, c-format
@@ -3441,6 +3479,9 @@ msgstr "é??è¦?æ?´å¤?è¾?å?¥"
 msgid "Invalid compressed data"
 msgstr "æ? æ??ç??å·²å??缩æ?°æ?®"
 
+#~ msgid "No such schema `%s' specified in override file `%s'"
+#~ msgstr "è¦?ç??æ??件 %2$s 中æ?ªæ??å®?大纲 %1$s"
+
 #~ msgid "Error writing first 16 bytes of message to socket: "
 #~ msgstr "å??å?¥æ¶?æ?¯ç??å?? 16 å­?è??å?°å¥?æ?¥å­?å?ºé??ï¼?"
 



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