[jhbuild] Update Chinese simplified translation

[Wylmer Wang <wylmerwang src gnome org>]

commit e95b9121a7058319bbc7a360de0a290c61ca43cb
Author: 世海 黄 <rochester_h 163 com>
Date:   Sat Dec 7 14:35:11 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po |  241 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 135 insertions(+), 106 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c8b42a8..d17cda1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: jhbuild master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=jhbuild&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-01-14 03:11+0000\n"
-"PO-Revision-Date: 2013-01-14 21:09+0800\n"
+"POT-Creation-Date: 2013-11-28 12:55+0000\n"
+"PO-Revision-Date: 2013-11-30 11:33+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
@@ -19,45 +19,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../autogen.sh:104
+#: ../autogen.sh:107
 #, sh-format
 msgid "Configuring $PKG_NAME without autotools"
 msgstr "正在没有 autotools 的情况下配置 $PKG_NAME"
 
-#: ../autogen.sh:121 ../autogen.sh:126
+#: ../autogen.sh:124 ../autogen.sh:129
 #, sh-format
 msgid "Unable to create file $srcdir/Makefile.inc"
 msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ $srcdir/Makefile.inc"
 
-#: ../autogen.sh:141
+#: ../autogen.sh:144
 #, sh-format
 msgid "Unable to read file $makefile"
 msgstr "æ— æ³•è¯»å– $makefile 文件"
 
-#: ../autogen.sh:146
+#: ../autogen.sh:149
 #, sh-format
 msgid "Unable to copy $makefile to $srcdir/Makefile"
 msgstr "æ— æ³•å°† $makefile 复制到 $srcdir/Makefile"
 
-#: ../autogen.sh:151
+#: ../autogen.sh:154
 #, sh-format
 msgid "Now type `make' to compile $PKG_NAME"
 msgstr "现在输入“make”来编译 $PKG_NAME"
 
-#: ../autogen.sh:187
+#: ../autogen.sh:192
 #, sh-format
 msgid ""
 "**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME "
 "directory"
 msgstr "**错误**：“$srcdir”似乎不是顶级的 $PKG_NAME 目录"
 
-#: ../autogen.sh:211
-msgid "gnome-autogen.sh not available"
-msgstr "gnome-autogen.sh 不可用"
+#: ../autogen.sh:234
+msgid ""
+"WARNING: gnome-autogen.sh not available (usually part of package 'gnome-"
+"common')"
+msgstr "警告：gnome-autogen.sh 不可用(通常在“gnome-common”这个包里)"
 
-#: ../autogen.sh:214
-msgid "yelp-tools not available"
-msgstr "yelp-tools 不可用"
+#: ../autogen.sh:237
+msgid ""
+"WARNING: yelp-tools not available (usually part of package 'yelp-tools')"
+msgstr "警告：yelp-tools 不可用(通常在“yelp-tools”这个包里)"
 
 #: ../jhbuild/commands/autobuild.py:28
 msgid "Build modules non-interactively and upload results to JhAutobuild"
@@ -81,7 +84,7 @@ msgid "run make distcheck after building"
 msgstr "在构建后运行 make distcheck"
 
 #: ../jhbuild/commands/autobuild.py:45 ../jhbuild/commands/base.py:47
-#: ../jhbuild/commands/base.py:199 ../jhbuild/commands/base.py:450
+#: ../jhbuild/commands/base.py:199 ../jhbuild/commands/base.py:437
 #: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:53
 msgid "treat the given modules as up to date"
 msgstr "将给定模块视为最新"
@@ -104,7 +107,7 @@ msgid "report URL for autobuild not specified"
 msgstr "没有指定 autobuild 的报告 URL"
 
 #: ../jhbuild/commands/autobuild.py:82 ../jhbuild/commands/base.py:73
-#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/base.py:488
+#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/base.py:475
 #: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:94
 #, python-format
 msgid "%s not in module list"
@@ -116,7 +119,7 @@ msgstr "通过版本控制更新所有模块"
 
 #: ../jhbuild/commands/base.py:41 ../jhbuild/commands/base.py:89
 #: ../jhbuild/commands/base.py:123 ../jhbuild/commands/base.py:166
-#: ../jhbuild/commands/base.py:277 ../jhbuild/commands/base.py:441
+#: ../jhbuild/commands/base.py:277 ../jhbuild/commands/base.py:428
 #: ../jhbuild/commands/tinderbox.py:32
 msgid "[ options ... ] [ modules ... ]"
 msgstr "[ 选项 ... ] [ 模块 ... ]"
@@ -136,7 +139,7 @@ msgid "set a sticky date when checking out modules"
 msgstr "在检出模块时设置一个粘性日期"
 
 #: ../jhbuild/commands/base.py:59 ../jhbuild/commands/base.py:190
-#: ../jhbuild/commands/base.py:459
+#: ../jhbuild/commands/base.py:446
 msgid "ignore all soft-dependencies"
 msgstr "忽略所有软依赖"
 
@@ -145,15 +148,15 @@ msgid "Update one or more modules from version control"
 msgstr "通过版本控制更新一个或多个模块"
 
 #: ../jhbuild/commands/base.py:104 ../jhbuild/commands/base.py:142
-#: ../jhbuild/commands/base.py:382 ../jhbuild/commands/base.py:399
-#: ../jhbuild/commands/rdepends.py:52 ../jhbuild/moduleset.py:164
+#: ../jhbuild/commands/base.py:383 ../jhbuild/commands/rdepends.py:52
+#: ../jhbuild/moduleset.py:165
 #, python-format
 msgid "A module called '%s' could not be found."
 msgstr "一个名为 %s 的模块找不到。"
 
 #: ../jhbuild/commands/base.py:107 ../jhbuild/commands/base.py:145
-#: ../jhbuild/commands/base.py:339 ../jhbuild/commands/rdepends.py:47
-#: ../jhbuild/commands/uninstall.py:46
+#: ../jhbuild/commands/base.py:340 ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/uninstall.py:58
 msgid "This command requires a module parameter."
 msgstr "此命令需要一个模块参数。"
 
@@ -197,7 +200,7 @@ msgstr "跳过版本控制更新"
 msgid "quiet (no output)"
 msgstr "安静(æ— è¾“å‡º)"
 
-#: ../jhbuild/commands/base.py:205 ../jhbuild/commands/base.py:456
+#: ../jhbuild/commands/base.py:205 ../jhbuild/commands/base.py:443
 msgid "build only modules with the given tags"
 msgstr "åªæž„å»ºå¸¦ç»™å®šæ ‡è®°çš„æ¨¡å—"
 
@@ -247,86 +250,87 @@ msgstr ""
 msgid "Update and compile one or more modules"
 msgstr "更新和编译一个或多个模块"
 
-#: ../jhbuild/commands/base.py:334 ../jhbuild/commands/make.py:95
+#: ../jhbuild/commands/base.py:335 ../jhbuild/commands/make.py:95
+#: ../jhbuild/commands/uninstall.py:50
 #, python-format
 msgid ""
 "module \"%(modname)s\" does not exist, created automatically using "
 "repository \"%(reponame)s\""
 msgstr "“%(modname)s”模块不存在，已使用仓库“%(reponame)s”自动创建"
 
-#: ../jhbuild/commands/base.py:347
+#: ../jhbuild/commands/base.py:348
 msgid "Run a command under the JHBuild environment"
 msgstr "在 JHBuild 环境下运行命令"
 
-#: ../jhbuild/commands/base.py:350
+#: ../jhbuild/commands/base.py:351
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr "[ 选项 ... ] 程序名 [ 参数 ... ]"
 
-#: ../jhbuild/commands/base.py:356
+#: ../jhbuild/commands/base.py:357
 msgid "run command in build dir of the given module"
 msgstr "在给定模块的构建目录中运行命令"
 
-#: ../jhbuild/commands/base.py:359
+#: ../jhbuild/commands/base.py:360
 msgid "run command in checkout dir of the given module"
 msgstr "在给定模块的检出目录中运行命令"
 
-#: ../jhbuild/commands/base.py:372 ../jhbuild/commands/base.py:416
+#: ../jhbuild/commands/base.py:373 ../jhbuild/commands/base.py:403
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
 msgstr "æ— æ³•æ‰§è¡Œ %(command)s 命令：%(err)s"
 
-#: ../jhbuild/commands/base.py:390 ../jhbuild/commands/base.py:407
+#: ../jhbuild/commands/base.py:394
 #, python-format
 msgid "Unable to execute the command '%s'"
 msgstr "æ— æ³•æ‰§è¡Œ %s 命令"
 
-#: ../jhbuild/commands/base.py:414 ../jhbuild/frontends/gtkui.py:447
+#: ../jhbuild/commands/base.py:401 ../jhbuild/frontends/gtkui.py:447
 #: ../jhbuild/frontends/terminal.py:145
 msgid "No command given"
 msgstr "没有给出命令"
 
-#: ../jhbuild/commands/base.py:423
+#: ../jhbuild/commands/base.py:410
 msgid "Start a shell under the JHBuild environment"
 msgstr "在 JHBuild 环境下启动一个 shell"
 
-#: ../jhbuild/commands/base.py:438
+#: ../jhbuild/commands/base.py:425
 msgid "List the modules that would be built"
 msgstr "列出将构建的模块"
 
-#: ../jhbuild/commands/base.py:447
+#: ../jhbuild/commands/base.py:434
 msgid "show which revision will be built"
 msgstr "显示要构建的修订版本"
 
-#: ../jhbuild/commands/base.py:453
+#: ../jhbuild/commands/base.py:440
 msgid "start list at the given module"
 msgstr "从给定模块开始列表"
 
-#: ../jhbuild/commands/base.py:462
+#: ../jhbuild/commands/base.py:449
 msgid "also list soft-dependencies that could be skipped"
 msgstr "åŒæ—¶åˆ—å‡ºæ— æ³•è·³è¿‡çš„è½¯ä¾èµ–"
 
-#: ../jhbuild/commands/base.py:465
+#: ../jhbuild/commands/base.py:452
 msgid "list all modules, not only those that would be built"
 msgstr "列出所有模块，而不仅是要构建的模块"
 
-#: ../jhbuild/commands/base.py:472
+#: ../jhbuild/commands/base.py:459
 msgid "Conflicting options specified ('--start-at' and '--all-modules')"
 msgstr "指定了冲突的选项('--start-at' 和 '--all-modules')"
 
-#: ../jhbuild/commands/base.py:504
+#: ../jhbuild/commands/base.py:491
 msgid "Output a Graphviz dependency graph for one or more modules"
 msgstr "è¾“å‡ºä¸€ä¸ªæˆ–å¤šä¸ªæ¨¡å—çš„ä¸€å¼  Graphviz 依赖图"
 
-#: ../jhbuild/commands/base.py:507 ../jhbuild/commands/info.py:39
-#: ../jhbuild/commands/uninstall.py:33
+#: ../jhbuild/commands/base.py:494 ../jhbuild/commands/info.py:39
+#: ../jhbuild/commands/uninstall.py:34
 msgid "[ modules ... ]"
 msgstr "[ 模块 ... ]"
 
-#: ../jhbuild/commands/base.py:513
+#: ../jhbuild/commands/base.py:500
 msgid "add dotted lines to soft dependencies"
 msgstr "å‘è½¯ä¾èµ–æ·»åŠ ç‚¹çº¿"
 
-#: ../jhbuild/commands/base.py:516
+#: ../jhbuild/commands/base.py:503
 msgid "group modules from metamodule together"
 msgstr "将 metamodule 中的模块归在一起"
 
@@ -442,16 +446,35 @@ msgstr "æ— æ³•æ£€æŸ¥ %(module)s (%(href)s)"
 msgid "Clean all modules"
 msgstr "清理所有模块"
 
+#: ../jhbuild/commands/extdeps.py:70
+msgid "Report details on GNOME external dependencies"
+msgstr "报告 GNOME 外部依赖的详细信息"
+
+#: ../jhbuild/commands/extdeps.py:98
+msgid "External deps for GNOME"
+msgstr "GNOME 的外部依赖"
+
+#: ../jhbuild/commands/extdeps.py:104
+#, python-format
+msgid "External deps for GNOME %s"
+msgstr "GNOME %s 的外部依赖"
+
+#: ../jhbuild/commands/extdeps.py:138
+msgid "patched"
+msgstr "已修补"
+
+#: ../jhbuild/commands/extdeps.py:142
+#, python-format
+msgid "and %d others."
+msgstr "及其他 %d 个。"
+
 #: ../jhbuild/commands/goalreport.py:328
-#, fuzzy
 msgid "Report GNOME modules status wrt various goals"
-msgstr "报告 GNOME æ¨¡å—çŠ¶æ€ï¼Œå…³äºŽå„ç§ç›®æ ‡"
+msgstr "æŠ¥å‘Šä¸Žå„ç§ç›®æ ‡æ— å…³çš„ GNOME 模块状态"
 
 #: ../jhbuild/commands/goalreport.py:351
-#, fuzzy
-#| msgid "Could not check git program"
 msgid "check to perform"
-msgstr "检查后执行"
+msgstr "检查以执行"
 
 #: ../jhbuild/commands/gui.py:30
 msgid "Build targets from a GUI app"
@@ -461,7 +484,7 @@ msgstr "通过 GUI ç¨‹åºæž„å»ºç›®æ ‡"
 msgid "Display information about one or more modules"
 msgstr "显示有关一个或多个模块的信息"
 
-#: ../jhbuild/commands/info.py:51 ../jhbuild/commands/uninstall.py:43
+#: ../jhbuild/commands/info.py:51
 #, python-format
 msgid "unknown module %s"
 msgstr "未知模块 %s"
@@ -682,10 +705,10 @@ msgstr "install 的前缀位置(%s) 不可写"
 #: ../jhbuild/commands/sanitycheck.py:147
 #: ../jhbuild/commands/sanitycheck.py:149
 #: ../jhbuild/commands/sanitycheck.py:151 ../jhbuild/modtypes/cmake.py:82
-#: ../jhbuild/versioncontrol/bzr.py:206 ../jhbuild/versioncontrol/cvs.py:297
+#: ../jhbuild/versioncontrol/bzr.py:215 ../jhbuild/versioncontrol/cvs.py:297
 #: ../jhbuild/versioncontrol/darcs.py:110
 #: ../jhbuild/versioncontrol/fossil.py:107
-#: ../jhbuild/versioncontrol/git.py:448 ../jhbuild/versioncontrol/hg.py:103
+#: ../jhbuild/versioncontrol/git.py:457 ../jhbuild/versioncontrol/hg.py:103
 #: ../jhbuild/versioncontrol/mtn.py:142 ../jhbuild/versioncontrol/svn.py:313
 #, python-format
 msgid "%s not found"
@@ -787,15 +810,19 @@ msgid "output directory for tinderbox build not specified"
 msgstr "没有指定 tinderbox 构建的输出目录"
 
 #: ../jhbuild/commands/twoninetynine.py:161
-#, fuzzy
 msgid "Report GNOME modules status wrt 3.0 goals"
-msgstr "报告 GNOME 模块状态，有关 3.0 ç›®æ ‡"
+msgstr "报告与 3.0 ç›®æ ‡æ— å…³çš„ GNOME 模块状态"
 
-#: ../jhbuild/commands/uninstall.py:30
+#: ../jhbuild/commands/uninstall.py:31
 msgid "Uninstall all modules"
 msgstr "卸载所有模块"
 
-#: ../jhbuild/commands/uninstall.py:52
+#: ../jhbuild/commands/uninstall.py:48
+#, python-format
+msgid "unknown module %s and no default repository to try an automatic module"
+msgstr "未知的模块 %s，并且没有可以尝试自动模块的默认仓库"
+
+#: ../jhbuild/commands/uninstall.py:64
 #, python-format
 msgid "Module %(mod)r is not installed"
 msgstr "模块 %(mod)r 未安装"
@@ -848,8 +875,8 @@ msgstr "配置文件中定义的键为未知：%s"
 #: ../jhbuild/config.py:276
 #, python-format
 msgid ""
-"the \"%s\" configuration variable is deprecated, you should use \"repos"
-"['gnome.org']\"."
+"the \"%s\" configuration variable is deprecated, you should use "
+"\"repos['gnome.org']\"."
 msgstr "配置变量 %s 已经废弃，您应该使用 repos['gnome.org']。"
 
 #: ../jhbuild/config.py:281 ../jhbuild/config.py:286
@@ -1107,8 +1134,8 @@ msgstr "总是运行 autogen.sh"
 msgid "Don't poison modules on failure"
 msgstr "失败时不要污染模块"
 
-#: ../jhbuild/frontends/terminal.py:180 ../jhbuild/frontends/tinderbox.py:248
-#: ../jhbuild/frontends/tinderbox.py:381 ../jhbuild/frontends/tinderbox.py:436
+#: ../jhbuild/frontends/terminal.py:180 ../jhbuild/frontends/tinderbox.py:251
+#: ../jhbuild/frontends/tinderbox.py:384 ../jhbuild/frontends/tinderbox.py:439
 #, python-format
 msgid "%(configuration_variable)s invalid key %(key)s"
 msgstr "%(configuration_variable)s æœ‰æ— æ•ˆçš„é”® %(key)s"
@@ -1135,11 +1162,11 @@ msgstr "成功"
 msgid "the following modules were not built"
 msgstr "以下模块未构建"
 
-#: ../jhbuild/frontends/terminal.py:298 ../jhbuild/frontends/tinderbox.py:412
+#: ../jhbuild/frontends/terminal.py:298 ../jhbuild/frontends/tinderbox.py:415
 msgid "automatically retrying configure"
 msgstr "自动重试配置"
 
-#: ../jhbuild/frontends/terminal.py:302 ../jhbuild/frontends/tinderbox.py:417
+#: ../jhbuild/frontends/terminal.py:302 ../jhbuild/frontends/tinderbox.py:420
 msgid "automatically forcing a fresh checkout"
 msgstr "自动强制一次刷新检出"
 
@@ -1411,40 +1438,40 @@ msgstr "'%(module)s' 模块的大小属性('%(size)s')æ— æ•ˆ"
 msgid "Python XML packages are required but could not be found"
 msgstr "需要 Python XML 包，但找不到"
 
-#: ../jhbuild/moduleset.py:78
+#: ../jhbuild/moduleset.py:79
 #, python-format
 msgid "fixed case of module '%(orig)s' to '%(new)s'"
 msgstr "已将'%(orig)s' 模块的实例修复为 '%(new)s'"
 
-#: ../jhbuild/moduleset.py:117
+#: ../jhbuild/moduleset.py:118
 #, python-format
 msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
 msgstr "%(module)s 依赖于未知模块 \"%(invalid)s\""
 
-#: ../jhbuild/moduleset.py:130
+#: ../jhbuild/moduleset.py:131
 #, python-format
 msgid "Circular dependencies detected: %s"
 msgstr "检测到循环依赖：%s"
 
-#: ../jhbuild/moduleset.py:276
+#: ../jhbuild/moduleset.py:282
 msgid "Unknown module:"
 msgstr "未知模块："
 
-#: ../jhbuild/moduleset.py:379
+#: ../jhbuild/moduleset.py:385
 #, python-format
 msgid "could not download %s: %s"
 msgstr "æ— æ³•ä¸‹è½½ %s：%s"
 
-#: ../jhbuild/moduleset.py:384 ../jhbuild/moduleset.py:386
+#: ../jhbuild/moduleset.py:390 ../jhbuild/moduleset.py:392
 #, python-format
 msgid "failed to parse %s: %s"
 msgstr "解析 %s 失败：%s"
 
-#: ../jhbuild/moduleset.py:413
+#: ../jhbuild/moduleset.py:419
 msgid "Duplicate repository:"
 msgstr "重复仓库："
 
-#: ../jhbuild/moduleset.py:516
+#: ../jhbuild/moduleset.py:522
 #, python-format
 msgid ""
 "Modulesets were edited locally but JHBuild is configured to get them from "
@@ -1453,19 +1480,6 @@ msgstr ""
 "在本地修改了模块集，但 JHBuild 配置为从网络获取它们。或许您应该向您的 %s 中添"
 "åŠ  use_local_modulesets = True"
 
-#: ../jhbuild/monkeypatch.py:102
-#, python-format
-msgid "Invalid placeholder in string: line %d, col %d"
-msgstr "å­—ç¬¦ä¸²ä¸­çš„å ä½ç¬¦ä¸æ­£ç¡®ï¼šç¬¬ %d 行，第 %d 列"
-
-#: ../jhbuild/monkeypatch.py:107 ../jhbuild/monkeypatch.py:133
-msgid "Too many positional arguments"
-msgstr "位置参数过多"
-
-#: ../jhbuild/monkeypatch.py:127 ../jhbuild/monkeypatch.py:160
-msgid "Unrecognized named group in pattern"
-msgstr "æ¨¡å¼ä¸­çš„å‘½åç»„æ— æ³•è¯†åˆ«"
-
 #: ../jhbuild/utils/cmds.py:40
 msgid "Call to undefined command"
 msgstr "调用了未定义的命令"
@@ -1507,20 +1521,20 @@ msgstr "没有“%sâ€çš„æ¸…å•ï¼Œæ— æ³•å¸è½½ã€‚è¯·å°è¯•é‡æ–°æž„å»ºåŽå†å¸
 msgid "Failed to delete %(file)r: %(msg)s"
 msgstr "åˆ é™¤ %(file)r 失败：%(msg)s"
 
-#: ../jhbuild/utils/systeminstall.py:134
+#: ../jhbuild/utils/systeminstall.py:140
 msgid "No suitable root privilege command found; you should install \"pkexec\""
 msgstr "没有找到适合的，具有 root 权限的命令；您应该重新安装“pkexec”"
 
-#: ../jhbuild/utils/systeminstall.py:166 ../jhbuild/utils/systeminstall.py:169
+#: ../jhbuild/utils/systeminstall.py:172 ../jhbuild/utils/systeminstall.py:175
 #, python-format
 msgid "PackageKit: %s"
 msgstr "包套件：%s"
 
-#: ../jhbuild/utils/systeminstall.py:245
+#: ../jhbuild/utils/systeminstall.py:251
 msgid "Nothing available to install"
 msgstr "æ— å¯å®‰è£…"
 
-#: ../jhbuild/utils/systeminstall.py:248
+#: ../jhbuild/utils/systeminstall.py:254
 #, python-format
 msgid ""
 "Installing:\n"
@@ -1529,15 +1543,15 @@ msgstr ""
 "正在安装：\n"
 "  %s"
 
-#: ../jhbuild/utils/systeminstall.py:254
+#: ../jhbuild/utils/systeminstall.py:260
 msgid "Complete!"
 msgstr "完成！"
 
-#: ../jhbuild/utils/systeminstall.py:265
+#: ../jhbuild/utils/systeminstall.py:271
 msgid "Using yum to install packages.  Please wait."
 msgstr "正在使用 yum 安装包。请稍候。"
 
-#: ../jhbuild/utils/systeminstall.py:268
+#: ../jhbuild/utils/systeminstall.py:274
 #, python-format
 msgid ""
 "Installing:\n"
@@ -1546,20 +1560,20 @@ msgstr ""
 "正在安装：\n"
 "  %(pkgs)s"
 
-#: ../jhbuild/utils/systeminstall.py:278 ../jhbuild/utils/systeminstall.py:328
+#: ../jhbuild/utils/systeminstall.py:284 ../jhbuild/utils/systeminstall.py:334
 msgid "Nothing to install"
 msgstr "æ— å¯å®‰è£…"
 
-#: ../jhbuild/utils/systeminstall.py:309
+#: ../jhbuild/utils/systeminstall.py:315
 msgid "Using apt-file to search for providers; this may be slow.  Please wait."
 msgstr "正在使用 apt-file 搜索提供者；这可能较慢，请等候。"
 
-#: ../jhbuild/utils/systeminstall.py:318
+#: ../jhbuild/utils/systeminstall.py:324
 #, python-format
 msgid "No native package found for %(id)s (%(filename)s)"
 msgstr "没有找到 %(id)s 的本地包(%(filename)s)"
 
-#: ../jhbuild/utils/systeminstall.py:323
+#: ../jhbuild/utils/systeminstall.py:329
 #, python-format
 msgid "Installing: %(pkgs)s"
 msgstr "正在安装：%(pkgs)s"
@@ -1634,8 +1648,8 @@ msgstr "考虑使用 changecvsroot.py 脚本来修复此问题。"
 
 #: ../jhbuild/versioncontrol/darcs.py:86 ../jhbuild/versioncontrol/darcs.py:92
 #: ../jhbuild/versioncontrol/fossil.py:84
-#: ../jhbuild/versioncontrol/fossil.py:97 ../jhbuild/versioncontrol/git.py:558
-#: ../jhbuild/versioncontrol/git.py:598 ../jhbuild/versioncontrol/git.py:674
+#: ../jhbuild/versioncontrol/fossil.py:97 ../jhbuild/versioncontrol/git.py:567
+#: ../jhbuild/versioncontrol/git.py:607 ../jhbuild/versioncontrol/git.py:683
 #: ../jhbuild/versioncontrol/hg.py:87 ../jhbuild/versioncontrol/hg.py:93
 msgid "date based checkout not yet supported\n"
 msgstr "尚未支持基于日期的检出\n"
@@ -1644,48 +1658,48 @@ msgstr "尚未支持基于日期的检出\n"
 msgid "ignored bad branch redefinition for module:"
 msgstr "已忽略有问题的模块分支重定义："
 
-#: ../jhbuild/versioncontrol/git.py:199
+#: ../jhbuild/versioncontrol/git.py:201
 msgid "Need at least git-1.5.6 from June/08 to operate"
 msgstr "至少需要08年6月发布的 git-1.5.6 才能工作"
 
-#: ../jhbuild/versioncontrol/git.py:213
+#: ../jhbuild/versioncontrol/git.py:215
 msgid "Unexpected: Checkoutdir is not a git repository:"
 msgstr "异常：检出目录不是一个 git 仓库："
 
-#: ../jhbuild/versioncontrol/git.py:269
+#: ../jhbuild/versioncontrol/git.py:271
 #, python-format
 msgid ""
 "The requested branch \"%s\" is not available. Neither locally, nor remotely "
 "in the origin remote."
 msgstr "请求的分支 \"%s\" ä¸å¯ç”¨ã€‚æ— è®ºæœ¬åœ°è¿˜æ˜¯è¿œç¨‹éƒ½ä¸åœ¨åˆå§‹çš„è¿œç¨‹ä½ç½®ä¸­ã€‚"
 
-#: ../jhbuild/versioncontrol/git.py:277
+#: ../jhbuild/versioncontrol/git.py:279
 msgid "Refusing to switch a dirty tree."
 msgstr "æ‹’ç»åˆ‡æ¢åˆ°ä¸€ä¸ªæ±¡æŸ“çš„æ ‘ã€‚"
 
-#: ../jhbuild/versioncontrol/git.py:353
+#: ../jhbuild/versioncontrol/git.py:357
 #, python-format
 msgid "Command %s returned no output"
 msgstr "%s 命令返回了空输出"
 
-#: ../jhbuild/versioncontrol/git.py:358
+#: ../jhbuild/versioncontrol/git.py:362
 #, python-format
 msgid "Command %s did not include commit line: %r"
 msgstr "%s 命令并未包含提交(commit)行：%r"
 
-#: ../jhbuild/versioncontrol/git.py:420
+#: ../jhbuild/versioncontrol/git.py:429
 msgid ""
 "Failed to update module as it switched to git (you should check for changes "
 "then remove the directory)."
 msgstr "在切换到 git 时更新模块失败(您应该检查改动然后移除该目录)。"
 
-#: ../jhbuild/versioncontrol/git.py:421
+#: ../jhbuild/versioncontrol/git.py:430
 msgid ""
 "Failed to update module (missing .git) (you should check for changes then "
 "remove the directory)."
 msgstr "更新模块失败(缺少 .git)(您应该检查改动然后移除该目录)。"
 
-#: ../jhbuild/versioncontrol/git.py:525
+#: ../jhbuild/versioncontrol/git.py:534
 msgid ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
@@ -1693,12 +1707,12 @@ msgstr ""
 "外部处理失败\n"
 "如果您运行的 git 版本 < 1.5.6，建议您更新它。\n"
 
-#: ../jhbuild/versioncontrol/git.py:570
+#: ../jhbuild/versioncontrol/git.py:579
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr "æ— æ³•ä»Ž %s 获取最新版本。请检查模块位置。"
 
-#: ../jhbuild/versioncontrol/__init__.py:193
+#: ../jhbuild/versioncontrol/__init__.py:196
 #, python-format
 msgid "unknown repository type %s"
 msgstr "未知的仓库类型 %s"
@@ -1830,6 +1844,21 @@ msgstr "找不到 quilt"
 msgid "could not checkout quilt patch set"
 msgstr "æ— æ³•æ£€å‡º quilt 补丁集"
 
+#~ msgid "gnome-autogen.sh not available"
+#~ msgstr "gnome-autogen.sh 不可用"
+
+#~ msgid "yelp-tools not available"
+#~ msgstr "yelp-tools 不可用"
+
+#~ msgid "Invalid placeholder in string: line %d, col %d"
+#~ msgstr "å­—ç¬¦ä¸²ä¸­çš„å ä½ç¬¦ä¸æ­£ç¡®ï¼šç¬¬ %d 行，第 %d 列"
+
+#~ msgid "Too many positional arguments"
+#~ msgstr "位置参数过多"
+
+#~ msgid "Unrecognized named group in pattern"
+#~ msgstr "æ¨¡å¼ä¸­çš„å‘½åç»„æ— æ³•è¯†åˆ«"
+
 #~ msgid ""
 #~ "bootstrap moduleset has been updated since the last time you used it, "
 #~ "perhaps you should run jhbuild bootstrap."