[jhbuild] Update Simplified Chinese translation

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [jhbuild] Update Simplified Chinese translation
Date: Thu, 28 Feb 2013 13:12:40 +0000 (UTC)
commit ce547b02da1a406a9a813ffc1b6bcd19744e1d9f
Author: Wylmer Wang <wantinghard gmail com>
Date:   Thu Feb 28 21:12:33 2013 +0800

    Update Simplified Chinese translation

 po/zh_CN.po |  902 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 522 insertions(+), 380 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0b2388b..c8b42a8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # Chinese (China) translation for jhbuild.
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the jhbuild package.
-# Wylmer Wang <wantinghard gmail com>, 2010, 2011.
+# Wylmer Wang <wantinghard gmail com>, 2010, 2011, 2013.
 # YunQiang Su <wzssyqa gmail com>, 2011.
 #
 msgid ""
@@ -9,331 +9,330 @@ 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: 2012-03-23 13:13+0000\n"
-"PO-Revision-Date: 2012-03-23 21:20+0800\n"
+"POT-Creation-Date: 2013-01-14 03:11+0000\n"
+"PO-Revision-Date: 2013-01-14 21:09+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../autogen.sh:103
+#: ../autogen.sh:104
 #, sh-format
 msgid "Configuring $PKG_NAME without autotools"
 msgstr "正在没有 autotools 的情况下配置 $PKG_NAME"
 
-#: ../autogen.sh:115 ../autogen.sh:120
+#: ../autogen.sh:121 ../autogen.sh:126
 #, sh-format
 msgid "Unable to create file $srcdir/Makefile.inc"
 msgstr "无法创建文件 $srcdir/Makefile.inc"
 
-#: ../autogen.sh:140
+#: ../autogen.sh:141
 #, sh-format
-msgid "Unable to copy $srcdir/Makefile.plain to $srcdir/Makefile"
-msgstr "无法将 $srcdir/Makefile.plain 复制到 $srcdir/Makefile"
+msgid "Unable to read file $makefile"
+msgstr "无法读取 $makefile 文件"
 
-#: ../autogen.sh:145
+#: ../autogen.sh:146
+#, sh-format
+msgid "Unable to copy $makefile to $srcdir/Makefile"
+msgstr "无法将 $makefile 复制到 $srcdir/Makefile"
+
+#: ../autogen.sh:151
 #, sh-format
 msgid "Now type `make' to compile $PKG_NAME"
 msgstr "现在输入“make”来编译 $PKG_NAME"
 
-#: ../autogen.sh:181
+#: ../autogen.sh:187
 #, sh-format
 msgid ""
 "**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME "
 "directory"
 msgstr "**错误**：“$srcdir”似乎不是顶级的 $PKG_NAME 目录"
 
-#: ../autogen.sh:203
+#: ../autogen.sh:211
 msgid "gnome-autogen.sh not available"
 msgstr "gnome-autogen.sh 不可用"
 
-#: ../autogen.sh:206
+#: ../autogen.sh:214
 msgid "yelp-tools not available"
 msgstr "yelp-tools 不可用"
 
-#: ../jhbuild/commands/autobuild.py:27
+#: ../jhbuild/commands/autobuild.py:28
 msgid "Build modules non-interactively and upload results to JhAutobuild"
 msgstr "以非交互方式构建模块并将结果上传到 JhAutobuild"
 
-#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/make.py:42
-#: ../jhbuild/commands/tinderbox.py:37
+#: ../jhbuild/commands/autobuild.py:36 ../jhbuild/commands/base.py:172
+#: ../jhbuild/commands/base.py:283 ../jhbuild/commands/make.py:42
+#: ../jhbuild/commands/tinderbox.py:38
 msgid "always run autogen.sh"
 msgstr "总是运行 autogen.sh"
 
-#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:217
-#: ../jhbuild/commands/base.py:311 ../jhbuild/commands/make.py:45
-#: ../jhbuild/commands/tinderbox.py:40
+#: ../jhbuild/commands/autobuild.py:39 ../jhbuild/commands/base.py:178
+#: ../jhbuild/commands/base.py:286 ../jhbuild/commands/make.py:45
+#: ../jhbuild/commands/tinderbox.py:44
 msgid "run make clean before make"
 msgstr "在运行 make 前运行 make clean"
 
-#: ../jhbuild/commands/autobuild.py:41 ../jhbuild/commands/base.py:226
-#: ../jhbuild/commands/base.py:320
+#: ../jhbuild/commands/autobuild.py:42 ../jhbuild/commands/base.py:187
+#: ../jhbuild/commands/base.py:298
 msgid "run make distcheck after building"
 msgstr "在构建后运行 make distcheck"
 
-#: ../jhbuild/commands/autobuild.py:44 ../jhbuild/commands/base.py:46
-#: ../jhbuild/commands/base.py:238 ../jhbuild/commands/base.py:475
-#: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:49
+#: ../jhbuild/commands/autobuild.py:45 ../jhbuild/commands/base.py:47
+#: ../jhbuild/commands/base.py:199 ../jhbuild/commands/base.py:450
+#: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:53
 msgid "treat the given modules as up to date"
 msgstr "将给定模块视为最新"
 
-#: ../jhbuild/commands/autobuild.py:47 ../jhbuild/commands/base.py:49
-#: ../jhbuild/commands/base.py:241 ../jhbuild/commands/clean.py:41
-#: ../jhbuild/commands/tinderbox.py:52
+#: ../jhbuild/commands/autobuild.py:48 ../jhbuild/commands/base.py:202
+#: ../jhbuild/commands/clean.py:41 ../jhbuild/commands/tinderbox.py:56
 msgid "start building at the given module"
 msgstr "从给定模块开始构建"
 
-#: ../jhbuild/commands/autobuild.py:50
+#: ../jhbuild/commands/autobuild.py:51
 msgid "jhautobuild report URL"
 msgstr "jhbuild 报告 URL"
 
-#: ../jhbuild/commands/autobuild.py:53
+#: ../jhbuild/commands/autobuild.py:54
 msgid "verbose mode"
 msgstr "详细模式"
 
-#: ../jhbuild/commands/autobuild.py:70
-msgid "report url for autobuild not specified"
+#: ../jhbuild/commands/autobuild.py:71
+msgid "report URL for autobuild not specified"
 msgstr "没有指定 autobuild 的报告 URL"
 
-#: ../jhbuild/commands/autobuild.py:81 ../jhbuild/commands/base.py:72
-#: ../jhbuild/commands/base.py:285 ../jhbuild/commands/base.py:514
-#: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:86
+#: ../jhbuild/commands/autobuild.py:82 ../jhbuild/commands/base.py:73
+#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/base.py:488
+#: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:94
 #, python-format
 msgid "%s not in module list"
 msgstr "%s 不在模块列表中"
 
-#: ../jhbuild/commands/base.py:37
+#: ../jhbuild/commands/base.py:38
 msgid "Update all modules from version control"
 msgstr "通过版本控制更新所有模块"
 
-#: ../jhbuild/commands/base.py:40 ../jhbuild/commands/base.py:88
-#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:208
-#: ../jhbuild/commands/base.py:302 ../jhbuild/commands/base.py:466
-#: ../jhbuild/commands/tinderbox.py:31
+#: ../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/tinderbox.py:32
 msgid "[ options ... ] [ modules ... ]"
 msgstr "[ 选项 ... ] [ 模块 ... ]"
 
-#: ../jhbuild/commands/base.py:52 ../jhbuild/commands/base.py:244
-#: ../jhbuild/commands/base.py:481
-msgid "build only modules with the given tags"
-msgstr "只构建带给定标记的模块"
+#: ../jhbuild/commands/base.py:50
+msgid "start updating at the given module"
+msgstr "从给定模块开始更新"
+
+#: ../jhbuild/commands/base.py:53
+msgid "update only modules with the given tags"
+msgstr "只更新带有给定标记的模块"
 
-#: ../jhbuild/commands/base.py:55 ../jhbuild/commands/base.py:94
-#: ../jhbuild/commands/base.py:247 ../jhbuild/commands/base.py:329
-#: ../jhbuild/commands/tinderbox.py:55
+#: ../jhbuild/commands/base.py:56 ../jhbuild/commands/base.py:95
+#: ../jhbuild/commands/base.py:208 ../jhbuild/commands/base.py:307
+#: ../jhbuild/commands/tinderbox.py:59
 msgid "set a sticky date when checking out modules"
 msgstr "在检出模块时设置一个粘性日期"
 
-#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:229
-#: ../jhbuild/commands/base.py:484
+#: ../jhbuild/commands/base.py:59 ../jhbuild/commands/base.py:190
+#: ../jhbuild/commands/base.py:459
 msgid "ignore all soft-dependencies"
 msgstr "忽略所有软依赖"
 
-#: ../jhbuild/commands/base.py:85
+#: ../jhbuild/commands/base.py:86
 msgid "Update one or more modules from version control"
 msgstr "通过版本控制更新一个或多个模块"
 
-#: ../jhbuild/commands/base.py:103 ../jhbuild/commands/base.py:138
-#: ../jhbuild/commands/base.py:407 ../jhbuild/commands/base.py:424
-#: ../jhbuild/commands/rdepends.py:52
+#: ../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
 #, python-format
 msgid "A module called '%s' could not be found."
 msgstr "一个名为 %s 的模块找不到。"
 
-#: ../jhbuild/commands/base.py:106 ../jhbuild/commands/base.py:141
-#: ../jhbuild/commands/base.py:364 ../jhbuild/commands/rdepends.py:47
+#: ../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
 msgid "This command requires a module parameter."
 msgstr "此命令需要一个模块参数。"
 
-#: ../jhbuild/commands/base.py:119
+#: ../jhbuild/commands/base.py:120
 msgid "Clean one or more modules"
 msgstr "清理一个或多个模块"
 
-#: ../jhbuild/commands/base.py:128
+#: ../jhbuild/commands/base.py:129
 msgid "honour the makeclean setting in config file"
 msgstr "接受 config 文件中的 makeclean 设置"
 
-#: ../jhbuild/commands/base.py:145
+#: ../jhbuild/commands/base.py:132 ../jhbuild/commands/base.py:175
+#: ../jhbuild/commands/base.py:289 ../jhbuild/commands/tinderbox.py:41
+msgid "completely clean source tree"
+msgstr "彻底清理源码树"
+
+#: ../jhbuild/commands/base.py:149
 msgid "clean command called while makeclean is set to False, skipped."
 msgstr "调用了 clean 命令，而 makeclean 设为关闭，已跳过。"
 
-#: ../jhbuild/commands/base.py:193
-msgid ""
-"bootstrap moduleset has been updated since the last time you used it, "
-"perhaps you should run jhbuild bootstrap."
-msgstr ""
-"bootstrap 模块集从您上次使用以来有了更新，也许您应该运行 jhbuild bootstrap"
-
-#: ../jhbuild/commands/base.py:199
-#, python-format
-msgid ""
-"some bootstrap modules have been updated, perhaps you should update them: %s."
-msgstr "一些 bootstrap 模块有更新，也许您应该更新他们：%s。"
-
-#: ../jhbuild/commands/base.py:205
+#: ../jhbuild/commands/base.py:163
 msgid "Update and compile all modules (the default)"
 msgstr "更新并编译所有模块(默认)"
 
-#: ../jhbuild/commands/base.py:214 ../jhbuild/commands/base.py:308
-msgid "This option does nothing anymore"
-msgstr "此选项不再有作用"
-
-#: ../jhbuild/commands/base.py:220 ../jhbuild/commands/base.py:314
+#: ../jhbuild/commands/base.py:181 ../jhbuild/commands/base.py:292
 #: ../jhbuild/commands/make.py:48
 msgid "run make check after building"
 msgstr "在构建后运行 make check"
 
-#: ../jhbuild/commands/base.py:223 ../jhbuild/commands/base.py:317
+#: ../jhbuild/commands/base.py:184 ../jhbuild/commands/base.py:295
 msgid "run make dist after building"
 msgstr "在构建后运行 make dist"
 
-#: ../jhbuild/commands/base.py:232 ../jhbuild/commands/base.py:323
-#: ../jhbuild/commands/tinderbox.py:43
+#: ../jhbuild/commands/base.py:193 ../jhbuild/commands/base.py:301
+#: ../jhbuild/commands/tinderbox.py:47
 msgid "skip version control update"
 msgstr "跳过版本控制更新"
 
-#: ../jhbuild/commands/base.py:235 ../jhbuild/commands/base.py:326
+#: ../jhbuild/commands/base.py:196 ../jhbuild/commands/base.py:304
 #: ../jhbuild/commands/make.py:51
 msgid "quiet (no output)"
 msgstr "安静(无输出)"
 
-#: ../jhbuild/commands/base.py:250 ../jhbuild/commands/base.py:332
+#: ../jhbuild/commands/base.py:205 ../jhbuild/commands/base.py:456
+msgid "build only modules with the given tags"
+msgstr "只构建带给定标记的模块"
+
+#: ../jhbuild/commands/base.py:211 ../jhbuild/commands/base.py:310
 msgid "run tests in real X and not in Xvfb"
 msgstr "在实际的 X 而非 Xvfb 中运行测试"
 
-#: ../jhbuild/commands/base.py:253 ../jhbuild/commands/tinderbox.py:58
+#: ../jhbuild/commands/base.py:214 ../jhbuild/commands/tinderbox.py:62
 msgid "try to force checkout and autogen on failure"
 msgstr "在失败时尝试强制进行检出和 autogen"
 
-#: ../jhbuild/commands/base.py:256 ../jhbuild/commands/tinderbox.py:61
+#: ../jhbuild/commands/base.py:217 ../jhbuild/commands/tinderbox.py:65
 msgid "don't poison modules on failure"
 msgstr "在失败时不要污染模块"
 
-#: ../jhbuild/commands/base.py:259 ../jhbuild/commands/base.py:335
-#: ../jhbuild/commands/tinderbox.py:64
+#: ../jhbuild/commands/base.py:220 ../jhbuild/commands/base.py:313
+#: ../jhbuild/commands/tinderbox.py:68
 msgid "build even if policy says not to"
 msgstr "即使策略不允许也构建"
 
-#: ../jhbuild/commands/base.py:262
+#: ../jhbuild/commands/base.py:223
 msgid "also build soft-dependencies that could be skipped"
 msgstr "同时构建无法跳过的软依赖"
 
-#: ../jhbuild/commands/base.py:265 ../jhbuild/commands/base.py:338
+#: ../jhbuild/commands/base.py:226 ../jhbuild/commands/base.py:316
 msgid "skip modules installed less than the given time ago"
 msgstr "跳过给定时间之后安装的模块"
 
-#: ../jhbuild/commands/base.py:289
+#: ../jhbuild/commands/base.py:229 ../jhbuild/commands/tinderbox.py:71
+msgid "ignore missing system dependencies"
+msgstr "忽略缺少的系统依赖"
+
+#: ../jhbuild/commands/base.py:253
 msgid "requested module is in the ignore list, nothing to do."
 msgstr "要求的模块在忽略列表中，无事可做。"
 
-#: ../jhbuild/commands/base.py:299
+#: ../jhbuild/commands/base.py:260 ../jhbuild/commands/tinderbox.py:100
+#, python-format
+msgid ""
+"Required system dependencies not installed. Install using the command "
+"%(cmd)s or to ignore system dependencies use command-line option %(opt)s"
+msgstr ""
+"需要的系统依赖没有安装。请使用 %(cmd)s 命令安装，或使用命令行选项 %(opt)s 忽"
+"略系统依赖"
+
+#: ../jhbuild/commands/base.py:274
 msgid "Update and compile one or more modules"
 msgstr "更新和编译一个或多个模块"
 
-#: ../jhbuild/commands/base.py:359
+#: ../jhbuild/commands/base.py:334 ../jhbuild/commands/make.py:95
 #, python-format
 msgid ""
-"module \"%s\" does not exist, created automatically using repository \"%s\""
-msgstr "“%s”模块不存在，已使用“%s”仓库自动创建"
+"module \"%(modname)s\" does not exist, created automatically using "
+"repository \"%(reponame)s\""
+msgstr "“%(modname)s”模块不存在，已使用仓库“%(reponame)s”自动创建"
 
-#: ../jhbuild/commands/base.py:372
+#: ../jhbuild/commands/base.py:347
 msgid "Run a command under the JHBuild environment"
 msgstr "在 JHBuild 环境下运行命令"
 
-#: ../jhbuild/commands/base.py:375
+#: ../jhbuild/commands/base.py:350
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr "[ 选项 ... ] 程序名 [ 参数 ... ]"
 
-#: ../jhbuild/commands/base.py:381
+#: ../jhbuild/commands/base.py:356
 msgid "run command in build dir of the given module"
 msgstr "在给定模块的构建目录中运行命令"
 
-#: ../jhbuild/commands/base.py:384
+#: ../jhbuild/commands/base.py:359
 msgid "run command in checkout dir of the given module"
 msgstr "在给定模块的检出目录中运行命令"
 
-#: ../jhbuild/commands/base.py:397 ../jhbuild/commands/base.py:441
+#: ../jhbuild/commands/base.py:372 ../jhbuild/commands/base.py:416
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
 msgstr "无法执行 %(command)s 命令：%(err)s"
 
-#: ../jhbuild/commands/base.py:415 ../jhbuild/commands/base.py:432
+#: ../jhbuild/commands/base.py:390 ../jhbuild/commands/base.py:407
 #, python-format
 msgid "Unable to execute the command '%s'"
 msgstr "无法执行 %s 命令"
 
-#: ../jhbuild/commands/base.py:439 ../jhbuild/frontends/gtkui.py:446
+#: ../jhbuild/commands/base.py:414 ../jhbuild/frontends/gtkui.py:447
 #: ../jhbuild/frontends/terminal.py:145
 msgid "No command given"
 msgstr "没有给出命令"
 
-#: ../jhbuild/commands/base.py:448
+#: ../jhbuild/commands/base.py:423
 msgid "Start a shell under the JHBuild environment"
 msgstr "在 JHBuild 环境下启动一个 shell"
 
-#: ../jhbuild/commands/base.py:463
+#: ../jhbuild/commands/base.py:438
 msgid "List the modules that would be built"
 msgstr "列出将构建的模块"
 
-#: ../jhbuild/commands/base.py:472
+#: ../jhbuild/commands/base.py:447
 msgid "show which revision will be built"
 msgstr "显示要构建的修订版本"
 
-#: ../jhbuild/commands/base.py:478
+#: ../jhbuild/commands/base.py:453
 msgid "start list at the given module"
 msgstr "从给定模块开始列表"
 
-#: ../jhbuild/commands/base.py:487
+#: ../jhbuild/commands/base.py:462
 msgid "also list soft-dependencies that could be skipped"
 msgstr "同时列出无法跳过的软依赖"
 
-#: ../jhbuild/commands/base.py:490
+#: ../jhbuild/commands/base.py:465
 msgid "list all modules, not only those that would be built"
 msgstr "列出所有模块，而不仅是要构建的模块"
 
-#: ../jhbuild/commands/base.py:497
-#, python-format
-msgid "Conflicting options specified ('%s' and '%s')"
-msgstr "指定了冲突的选项(%s 和 %s)"
+#: ../jhbuild/commands/base.py:472
+msgid "Conflicting options specified ('--start-at' and '--all-modules')"
+msgstr "指定了冲突的选项('--start-at' 和 '--all-modules')"
 
-#: ../jhbuild/commands/base.py:530
+#: ../jhbuild/commands/base.py:504
 msgid "Output a Graphviz dependency graph for one or more modules"
 msgstr "输出一个或多个模块的一张 Graphviz 依赖图"
 
-#: ../jhbuild/commands/base.py:533 ../jhbuild/commands/info.py:39
+#: ../jhbuild/commands/base.py:507 ../jhbuild/commands/info.py:39
 #: ../jhbuild/commands/uninstall.py:33
 msgid "[ modules ... ]"
 msgstr "[ 模块 ... ]"
 
-#: ../jhbuild/commands/base.py:539
+#: ../jhbuild/commands/base.py:513
 msgid "add dotted lines to soft dependencies"
 msgstr "向软依赖添加点线"
 
-#: ../jhbuild/commands/base.py:542
+#: ../jhbuild/commands/base.py:516
 msgid "group modules from metamodule together"
 msgstr "将 metamodule 中的模块归在一起"
 
-#: ../jhbuild/commands/bootstrap.py:34
-msgid "Build required support tools"
-msgstr "构建所需的支持工具"
-
-#: ../jhbuild/commands/bootstrap.py:43
-msgid "do not use system installed modules"
-msgstr "不要使用系统中安装的模块"
-
-#: ../jhbuild/commands/bootstrap.py:85
-#, python-format
-msgid ""
-"some modules (%s) were automatically ignored as a sufficient enough version "
-"was found installed on your system. Use --ignore-system if you want to build "
-"them nevertheless."
-msgstr ""
-"由于发现您的系统中已经安装了足够新的版本，一些模块(%s)被自动忽略。虽然如此，"
-"如果您愿意，可以使用 --ignore-system 选项来构建它们。"
+#: ../jhbuild/commands/bootstrap.py:24
+msgid "Build support tools"
+msgstr "构建支持工具"
 
 #: ../jhbuild/commands/bot.py:54
 msgid "Control buildbot"
@@ -373,8 +372,8 @@ msgid "start as daemon"
 msgstr "以守护进程启动"
 
 #: ../jhbuild/commands/bot.py:84
-msgid "pid file location"
-msgstr "pid 文件位置"
+msgid "PID file location"
+msgstr "PID 文件位置"
 
 #: ../jhbuild/commands/bot.py:87
 msgid "log file location"
@@ -400,18 +399,18 @@ msgstr "单步执行一个 buildbot(仅内部使用)"
 msgid "buildbot and twisted not found, run jhbuild bot --setup"
 msgstr "buildbot 和 twisted 找不到，请运行 jhbuild bot --setup"
 
-#: ../jhbuild/commands/bot.py:294
+#: ../jhbuild/commands/bot.py:295
 #, python-format
 msgid "No description for slave %s."
 msgstr "没有从 %s 的描述。"
 
 #. parse error
-#: ../jhbuild/commands/bot.py:299
+#: ../jhbuild/commands/bot.py:300
 #, python-format
 msgid "Failed to parse slave config for %s."
 msgstr "解析 %s 的从配置失败。"
 
-#: ../jhbuild/commands/bot.py:806 ../jhbuild/commands/bot.py:814
+#: ../jhbuild/commands/bot.py:807 ../jhbuild/commands/bot.py:815
 msgid "failed to get buildbot PID"
 msgstr "获取 buildbot PID 失败"
 
@@ -426,15 +425,15 @@ msgid "%(module)s is missing branch definition for %(branch)s"
 msgstr "%(module)s 缺少 %(branch)s 的分支定义"
 
 #: ../jhbuild/commands/checkmodulesets.py:30
-msgid "Check if modules in jhbuild have the correct definition"
-msgstr "检查 jhbuild 中的模块是否有正确的定义"
+msgid "Check if modules in JHBuild have the correct definition"
+msgstr "检查 JHBuild 中的模块是否有正确的定义"
 
-#: ../jhbuild/commands/checkmodulesets.py:42
+#: ../jhbuild/commands/checkmodulesets.py:43
 #, python-format
 msgid "%(module)s is unreachable (%(href)s)"
 msgstr "%(module)s 无法访问 (%(href)s)"
 
-#: ../jhbuild/commands/checkmodulesets.py:45
+#: ../jhbuild/commands/checkmodulesets.py:46
 #, python-format
 msgid "Cannot check %(module)s (%(href)s)"
 msgstr "无法检查 %(module)s (%(href)s)"
@@ -443,6 +442,17 @@ msgstr "无法检查 %(module)s (%(href)s)"
 msgid "Clean all modules"
 msgstr "清理所有模块"
 
+#: ../jhbuild/commands/goalreport.py:328
+#, fuzzy
+msgid "Report GNOME modules status wrt various goals"
+msgstr "报告 GNOME 模块状态，关于各种目标"
+
+#: ../jhbuild/commands/goalreport.py:351
+#, fuzzy
+#| msgid "Could not check git program"
+msgid "check to perform"
+msgstr "检查后执行"
+
 #: ../jhbuild/commands/gui.py:30
 msgid "Build targets from a GUI app"
 msgstr "通过 GUI 程序构建目标"
@@ -552,24 +562,64 @@ msgstr "后于："
 msgid "Before:"
 msgstr "先于："
 
-#: ../jhbuild/commands/__init__.py:80
+#: ../jhbuild/commands/__init__.py:84 ../jhbuild/commands/sysdeps.py:49
+#, python-format
+msgid "required=%s"
+msgstr "依赖=%s"
+
+#: ../jhbuild/commands/__init__.py:86 ../jhbuild/commands/sysdeps.py:51
+#, python-format
+msgid "installed=%s"
+msgstr "已安装=%s"
+
+#. Translators: This is used to separate items of package metadata
+#: ../jhbuild/commands/__init__.py:88 ../jhbuild/commands/sysdeps.py:53
+msgid ", "
+msgstr ", "
+
+#: ../jhbuild/commands/__init__.py:90 ../jhbuild/commands/sysdeps.py:55
+#, python-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#: ../jhbuild/commands/__init__.py:94 ../jhbuild/commands/sysdeps.py:80
+msgid "Required packages:"
+msgstr "依赖的包："
+
+#: ../jhbuild/commands/__init__.py:95 ../jhbuild/commands/sysdeps.py:81
+#: ../jhbuild/commands/sysdeps.py:124
+msgid "  System installed packages which are too old:"
+msgstr "系统中已安装的，但过旧的包："
+
+#: ../jhbuild/commands/__init__.py:105 ../jhbuild/commands/__init__.py:117
+#: ../jhbuild/commands/sysdeps.py:90 ../jhbuild/commands/sysdeps.py:118
+#: ../jhbuild/commands/sysdeps.py:133
+msgid "    (none)"
+msgstr "    (无)"
+
+#: ../jhbuild/commands/__init__.py:107 ../jhbuild/commands/sysdeps.py:92
+#: ../jhbuild/commands/sysdeps.py:135
+msgid "  No matching system package installed:"
+msgstr "  没有安装匹配的系统包："
+
+#: ../jhbuild/commands/__init__.py:134
 msgid "JHBuild commands are:"
 msgstr "JHBuild 命令有："
 
-#: ../jhbuild/commands/__init__.py:86
+#: ../jhbuild/commands/__init__.py:140
 msgid "For more information run \"jhbuild <command> --help\""
 msgstr "要获得更多信息，请运行 \"jhbuild <command> --help\""
 
-#: ../jhbuild/commands/__init__.py:95
-msgid "Information about available jhbuild commands"
-msgstr "可用 jhbuild 命令的有关信息"
+#: ../jhbuild/commands/__init__.py:149
+msgid "Information about available JHBuild commands"
+msgstr "可用 JHBuild 命令的有关信息"
 
-#: ../jhbuild/commands/__init__.py:122
+#: ../jhbuild/commands/__init__.py:176
 #, python-format
 msgid "no such command (did you mean \"jhbuild build %s\"?)"
 msgstr "没有这样的命令(您指的是“jhbuild build %s”吗？)"
 
-#: ../jhbuild/commands/__init__.py:124
+#: ../jhbuild/commands/__init__.py:178
 #, python-format
 msgid "no such command (did you mean \"jhbuild run %s\"?)"
 msgstr "没有这样的命令(您指的是“jhbuild run %s”吗？)"
@@ -578,12 +628,12 @@ msgstr "没有这样的命令(您指的是“jhbuild run %s”吗？)"
 msgid "Compile and install the module for the current directory"
 msgstr "针对当前目录编译和安装该模块"
 
-#: ../jhbuild/commands/make.py:76
+#: ../jhbuild/commands/make.py:78
 #, python-format
 msgid "The current directory is not in the checkout root %r"
 msgstr "当前目录不在检出根位置 %r 下"
 
-#: ../jhbuild/commands/make.py:86
+#: ../jhbuild/commands/make.py:90
 #, python-format
 msgid "No module matching current directory %r in the moduleset"
 msgstr "模块集中没有与当前目录 %r 匹配的模块"
@@ -631,12 +681,12 @@ msgstr "install 的前缀位置(%s) 不可写"
 #: ../jhbuild/commands/sanitycheck.py:141
 #: ../jhbuild/commands/sanitycheck.py:147
 #: ../jhbuild/commands/sanitycheck.py:149
-#: ../jhbuild/commands/sanitycheck.py:151 ../jhbuild/modtypes/cmake.py:94
-#: ../jhbuild/versioncontrol/bzr.py:204 ../jhbuild/versioncontrol/cvs.py:297
-#: ../jhbuild/versioncontrol/darcs.py:108
-#: ../jhbuild/versioncontrol/fossil.py:105
-#: ../jhbuild/versioncontrol/git.py:448 ../jhbuild/versioncontrol/hg.py:101
-#: ../jhbuild/versioncontrol/mtn.py:140 ../jhbuild/versioncontrol/svn.py:311
+#: ../jhbuild/commands/sanitycheck.py:151 ../jhbuild/modtypes/cmake.py:82
+#: ../jhbuild/versioncontrol/bzr.py:206 ../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/mtn.py:142 ../jhbuild/versioncontrol/svn.py:313
 #, python-format
 msgid "%s not found"
 msgstr "找不到 %s"
@@ -648,8 +698,10 @@ msgstr "aclocal 看不到 %s 宏"
 
 #: ../jhbuild/commands/sanitycheck.py:92
 #, python-format
-msgid "Please copy the lacking macros (%s) in one of the following paths: %s"
-msgstr "请从以下路径之一复制缺少的宏(%s)：%s"
+msgid ""
+"Please copy the lacking macros (%(macros)s) in one of the following paths: "
+"%(path)s"
+msgstr "请从以下路径复制缺少的宏 (%(macros)s)：%(path)s"
 
 #: ../jhbuild/commands/sanitycheck.py:100
 msgid "Could not find XML catalog"
@@ -662,13 +714,12 @@ msgstr "在 XML 目录中找不到 %s"
 
 #: ../jhbuild/commands/sanitycheck.py:116
 #, python-format
-msgid "Could not find the perl module %s"
-msgstr "找不到 perl 模块 %s"
+msgid "Could not find the Perl module %s"
+msgstr "找不到 Perl 模块 %s"
 
 #: ../jhbuild/commands/sanitycheck.py:128
-#, python-format
-msgid "%s or %s not found"
-msgstr "%s 或 %s 未找到"
+msgid "curl or wget not found"
+msgstr "curl 或 wget 未找到"
 
 #: ../jhbuild/commands/sanitycheck.py:137
 msgid "Installed git program is not the right git"
@@ -682,71 +733,64 @@ msgstr "无法检查 git 程序"
 msgid "Print out a moduleset for the exact versions that are checked out"
 msgstr "打印完全对应于所检出版本的模块集"
 
-#: ../jhbuild/commands/sysdeps.py:37
+#: ../jhbuild/commands/sysdeps.py:32
 msgid "Check and install tarball dependencies using system packages"
 msgstr "使用系统包检查并安装档案包依赖"
 
-#: ../jhbuild/commands/sysdeps.py:45
+#: ../jhbuild/commands/sysdeps.py:40
 msgid "Install pkg-config modules via system"
 msgstr "通过系统安装 pkg-config 模块"
 
-#: ../jhbuild/commands/sysdeps.py:51
-msgid "Partial build is not enabled; add partial_build = True to ~/.jhbuildrc"
-msgstr "部分构建未启用；请向 ~/.jhbuildrc 中添加 partial_build = True"
-
-#: ../jhbuild/commands/sysdeps.py:61
+#: ../jhbuild/commands/sysdeps.py:69
 msgid "System installed packages which are new enough:"
 msgstr "系统中已安装的、足够新的包："
 
-#: ../jhbuild/commands/sysdeps.py:65 ../jhbuild/commands/sysdeps.py:75
-#, python-format
-msgid "  %(pkg)s (required=%(req)s, installed=%(installed)s)"
-msgstr "  %(pkg)s (要求=%(req)s，已安装=%(installed)s)"
-
-#: ../jhbuild/commands/sysdeps.py:69 ../jhbuild/commands/sysdeps.py:79
-#: ../jhbuild/commands/sysdeps.py:89
+#: ../jhbuild/commands/sysdeps.py:78 ../jhbuild/commands/sysdeps.py:148
 msgid "  (none)"
 msgstr "  (无)"
 
-#: ../jhbuild/commands/sysdeps.py:71
-msgid "System installed packages which are too old:"
-msgstr "系统中已安装的，但过旧的包："
-
-#: ../jhbuild/commands/sysdeps.py:81
-msgid "No matching system package installed:"
-msgstr "没有安装匹配的系统包："
+#: ../jhbuild/commands/sysdeps.py:123
+msgid "Optional packages: (JHBuild will build the missing packages)"
+msgstr "可选包：(JHBuild 会构建缺少的包)"
 
-#: ../jhbuild/commands/sysdeps.py:85
+#: ../jhbuild/commands/sysdeps.py:156
 #, python-format
-msgid "  %(pkg)s (required=%(req)s)"
-msgstr "  %(pkg)s (要求=%(req)s)"
+msgid ""
+"%(cmd)s is required to install packages on this system. Please install "
+"%(cmd)s."
+msgstr "在此系统上安装包需要 %(cmd)s。请安装 %(cmd)s"
 
-#: ../jhbuild/commands/sysdeps.py:94
+#: ../jhbuild/commands/sysdeps.py:161
 msgid "Don't know how to install packages on this system"
 msgstr "不知道如何在此系统上安装包"
 
-#: ../jhbuild/commands/sysdeps.py:97
+#: ../jhbuild/commands/sysdeps.py:165
 #, python-format
 msgid "No uninstalled system dependencies to install for modules: %r"
 msgstr "没有要为模块安装的、已卸载的系统依赖：%r"
 
-#: ../jhbuild/commands/sysdeps.py:99
+#: ../jhbuild/commands/sysdeps.py:167
 #, python-format
 msgid "Installing dependencies on system: %s"
 msgstr "在系统上安装依赖：%s"
 
-#: ../jhbuild/commands/tinderbox.py:28
+#: ../jhbuild/commands/tinderbox.py:29
 msgid "Build modules non-interactively and store build logs"
 msgstr "以非交互方式构建模块并保存构建日志"
 
-#: ../jhbuild/commands/tinderbox.py:46
+#: ../jhbuild/commands/tinderbox.py:50
 msgid "directory to store build logs in"
 msgstr "保存构建日志的目录"
 
-#: ../jhbuild/commands/tinderbox.py:75
+#: ../jhbuild/commands/tinderbox.py:82
 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 目标"
+
 #: ../jhbuild/commands/uninstall.py:30
 msgid "Uninstall all modules"
 msgstr "卸载所有模块"
@@ -771,85 +815,113 @@ msgid ""
 "install'"
 msgstr "废弃的 JHBuild 启动脚本，请确信它已经删除，然后运行 'make install'"
 
-#: ../jhbuild/config.py:197
+#: ../jhbuild/config.py:194
 msgid "could not load config defaults"
 msgstr "无法载入默认配置"
 
-#: ../jhbuild/config.py:201
+#: ../jhbuild/config.py:205
 #, python-format
 msgid "could not load config file, %s is missing"
 msgstr "无法载入配置文件，%s 缺失。"
 
-#: ../jhbuild/config.py:217
+#: ../jhbuild/config.py:211
+#, python-format
+msgid ""
+"The default location of the configuration file has changed. Please move "
+"%(old_path)s to %(new_path)s."
+msgstr "配置文件的默认位置发生了变化。请将 %(old_path)s 移动到 %(new_path)s。"
+
+#: ../jhbuild/config.py:241
 #, python-format
 msgid "Could not include config file (%s)"
 msgstr "无法包含配置文件(%s)"
 
-#: ../jhbuild/config.py:230
+#: ../jhbuild/config.py:255
 msgid "could not load config file"
 msgstr "无法载入配置文件"
 
-#: ../jhbuild/config.py:244
+#: ../jhbuild/config.py:269
 #, python-format
 msgid "unknown keys defined in configuration file: %s"
 msgstr "配置文件中定义的键为未知：%s"
 
-#: ../jhbuild/config.py:251
+#: ../jhbuild/config.py:276
 #, python-format
 msgid ""
 "the \"%s\" configuration variable is deprecated, you should use \"repos"
 "['gnome.org']\"."
 msgstr "配置变量 %s 已经废弃，您应该使用 repos['gnome.org']。"
 
-#: ../jhbuild/config.py:256 ../jhbuild/config.py:261
+#: ../jhbuild/config.py:281 ../jhbuild/config.py:286
 #, python-format
 msgid ""
 "the \"%s\" configuration variable is deprecated, you should use \"repos\"."
 msgstr "配置变量 %s 已经废弃，您应该使用 repos。"
 
-#: ../jhbuild/config.py:294
+#: ../jhbuild/config.py:320
 msgid "invalid checkout mode"
 msgstr "无效的检出模式"
 
-#: ../jhbuild/config.py:298
+#: ../jhbuild/config.py:324
 #, python-format
 msgid "invalid checkout mode (module: %s)"
 msgstr "无效的检出模式(模块：%s)"
 
-#: ../jhbuild/config.py:300
+#: ../jhbuild/config.py:326
 msgid "copy mode requires copy_dir to be set"
 msgstr "复制模式需要设置 copy_dir"
 
-#: ../jhbuild/config.py:305
+#: ../jhbuild/config.py:331
 #, python-format
 msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
 msgstr "模块集目录(%s) 找不到，禁用 use_local_modulesets"
 
-#: ../jhbuild/config.py:320
+#: ../jhbuild/config.py:337 ../jhbuild/config.py:339 ../jhbuild/config.py:341
+#: ../jhbuild/config.py:343 ../jhbuild/config.py:346
+#, python-format
+msgid "%s must be an absolute path"
+msgstr "%s 必须是绝对路径"
+
+#: ../jhbuild/config.py:359
 #, python-format
 msgid "install prefix (%s) can not be created"
 msgstr "安装前缀(%s)无法创建"
 
-#: ../jhbuild/config.py:327
+#: ../jhbuild/config.py:366
 #, python-format
 msgid "working directory (%s) can not be created"
 msgstr "无法创建工作目录(%s)"
 
-#: ../jhbuild/config.py:434
+#: ../jhbuild/config.py:482
 #, python-format
 msgid "Can't create %s directory"
 msgstr "无法创建 %s 目录"
 
-#: ../jhbuild/config.py:519
+#: ../jhbuild/config.py:513
+#, python-format
+msgid ""
+"Unable to determine python version using the PYTHON environment variable "
+"(%s). Using default \"%s\""
+msgstr "无法通过 PYTHON 环境变量(%s)检测 python 版本。将使用默认的“%s“"
+
+#: ../jhbuild/config.py:528
+#, python-format
+msgid ""
+"Unable to determine python site-packages directory using the PYTHON "
+"environment variable (%s). Using default \"%s\""
+msgstr ""
+"无法通过 PYTHON 环境变量(%s)检测 python site-packages 目录。将使用默认的“%s”"
+
+#: ../jhbuild/config.py:575
 #, python-format
 msgid "Could not create GConf config (%s)"
 msgstr "无法创建 GConf 配置(%s)"
 
-#: ../jhbuild/config.py:604
+#: ../jhbuild/config.py:667
 msgid "Failed to parse 'min_age' relative time"
 msgstr "解析“min_age”相对时间失败"
 
-#: ../jhbuild/config.py:615
+#: ../jhbuild/config.py:681
 msgid ""
 "quiet mode has been disabled because the Python curses module is missing."
 msgstr "安静模式已禁用，因为 Python curses 模块缺失。"
@@ -940,7 +1012,7 @@ msgstr "由于 %(dep)s 无法构建，未构建 %(mod)s 模块"
 msgid "Running post-installation trigger script: %r"
 msgstr "运行安装后的触发器脚本：%r"
 
-#: ../jhbuild/frontends/buildscript.py:254 ../jhbuild/frontends/gtkui.py:594
+#: ../jhbuild/frontends/buildscript.py:254 ../jhbuild/frontends/gtkui.py:596
 #, python-format
 msgid "%(command)s returned with an error code (%(rc)s)"
 msgstr "%(command)s 返回了错误代码(%(rc)s)"
@@ -966,72 +1038,77 @@ msgstr "终端"
 msgid "Start"
 msgstr "开始"
 
-#: ../jhbuild/frontends/gtkui.py:347
+#: ../jhbuild/frontends/gtkui.py:348
 msgid "Build Completed"
 msgstr "构建完成"
 
-#: ../jhbuild/frontends/gtkui.py:376 ../jhbuild/frontends/terminal.py:283
+#: ../jhbuild/frontends/gtkui.py:377 ../jhbuild/frontends/terminal.py:283
 #, python-format
 msgid "Error during phase %(phase)s of %(module)s"
 msgstr "在 %(module)s 的 %(phase)s 阶段出错"
 
-#: ../jhbuild/frontends/gtkui.py:393
+#: ../jhbuild/frontends/gtkui.py:394
 msgid "Pick an Action"
 msgstr "选择一项操作"
 
-#: ../jhbuild/frontends/gtkui.py:396 ../jhbuild/frontends/terminal.py:310
+#: ../jhbuild/frontends/gtkui.py:397 ../jhbuild/frontends/terminal.py:310
 #, python-format
 msgid "Rerun phase %s"
 msgstr "重做 %s 阶段"
 
-#: ../jhbuild/frontends/gtkui.py:399 ../jhbuild/frontends/terminal.py:312
+#: ../jhbuild/frontends/gtkui.py:400 ../jhbuild/frontends/terminal.py:312
 #, python-format
 msgid "Ignore error and continue to %s"
 msgstr "忽略错误并继续 %s"
 
-#: ../jhbuild/frontends/gtkui.py:402 ../jhbuild/frontends/terminal.py:314
+#: ../jhbuild/frontends/gtkui.py:403 ../jhbuild/frontends/terminal.py:314
 msgid "Ignore error and continue to next module"
 msgstr "忽略错误并继续下个模块"
 
-#: ../jhbuild/frontends/gtkui.py:404 ../jhbuild/frontends/terminal.py:315
+#: ../jhbuild/frontends/gtkui.py:405 ../jhbuild/frontends/terminal.py:315
 msgid "Give up on module"
 msgstr "放弃模块"
 
-#: ../jhbuild/frontends/gtkui.py:411 ../jhbuild/frontends/terminal.py:324
+#: ../jhbuild/frontends/gtkui.py:412 ../jhbuild/frontends/terminal.py:324
 #, python-format
 msgid "Go to phase \"%s\""
 msgstr "转到 \"%s\" 阶段"
 
-#: ../jhbuild/frontends/gtkui.py:414
+#: ../jhbuild/frontends/gtkui.py:415
 msgid "Open Terminal"
 msgstr "打开终端"
 
-#: ../jhbuild/frontends/gtkui.py:590
+#: ../jhbuild/frontends/gtkui.py:591
 #, python-format
 msgid "%(command)s died with signal %(rc)s"
 msgstr "%(command)s 以 %(rc)s 信号死亡"
 
-#: ../jhbuild/frontends/gtkui.py:644
+#: ../jhbuild/frontends/gtkui.py:646
 msgid "Module"
 msgstr "模块"
 
-#: ../jhbuild/frontends/gtkui.py:663
+#: ../jhbuild/frontends/gtkui.py:665
 msgid "Start At"
 msgstr "开始于"
 
-#: ../jhbuild/frontends/gtkui.py:706
+#: ../jhbuild/frontends/gtkui.py:708
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../jhbuild/frontends/gtkui.py:718
+#: ../jhbuild/frontends/gtkui.py:720
 msgid "Disable network access"
 msgstr "禁用网络访问"
 
-#: ../jhbuild/frontends/gtkui.py:719
+#: ../jhbuild/frontends/gtkui.py:721
+msgid "Always run autogen.sh"
+msgstr "总是运行 autogen.sh"
+
+#: ../jhbuild/frontends/gtkui.py:722
 msgid "Don't poison modules on failure"
 msgstr "失败时不要污染模块"
 
-#: ../jhbuild/frontends/terminal.py:180 ../jhbuild/frontends/tinderbox.py:249
+#: ../jhbuild/frontends/terminal.py:180 ../jhbuild/frontends/tinderbox.py:248
+#: ../jhbuild/frontends/tinderbox.py:381 ../jhbuild/frontends/tinderbox.py:436
 #, python-format
 msgid "%(configuration_variable)s invalid key %(key)s"
 msgstr "%(configuration_variable)s 有无效的键 %(key)s"
@@ -1058,11 +1135,11 @@ msgstr "成功"
 msgid "the following modules were not built"
 msgstr "以下模块未构建"
 
-#: ../jhbuild/frontends/terminal.py:298 ../jhbuild/frontends/tinderbox.py:400
+#: ../jhbuild/frontends/terminal.py:298 ../jhbuild/frontends/tinderbox.py:412
 msgid "automatically retrying configure"
 msgstr "自动重试配置"
 
-#: ../jhbuild/frontends/terminal.py:302 ../jhbuild/frontends/tinderbox.py:405
+#: ../jhbuild/frontends/terminal.py:302 ../jhbuild/frontends/tinderbox.py:417
 msgid "automatically forcing a fresh checkout"
 msgstr "自动强制一次刷新检出"
 
@@ -1108,203 +1185,205 @@ msgid ""
 "(such as GNOME)."
 msgstr "以正确的顺序构建源自不同仓库的一组模块(如 GNOME)"
 
-#: ../jhbuild/main.py:112
+#: ../jhbuild/main.py:113
 msgid "Display this help and exit"
 msgstr "显示此帮助并退出"
 
-#: ../jhbuild/main.py:119
+#: ../jhbuild/main.py:120
 msgid "use a non default configuration file"
 msgstr "使用非默认的配置文件"
 
-#: ../jhbuild/main.py:122
+#: ../jhbuild/main.py:123
 msgid "use a non default module set"
 msgstr "使用非默认的模块集"
 
-#: ../jhbuild/main.py:125
+#: ../jhbuild/main.py:126
 msgid "do not prompt for input"
 msgstr "不要提示输入"
 
-#: ../jhbuild/main.py:156
+#: ../jhbuild/main.py:157
 msgid "Interrupted"
 msgstr "被打断"
 
-#: ../jhbuild/main.py:159
+#: ../jhbuild/main.py:160
 msgid "EOF"
 msgstr "EOF"
 
-#: ../jhbuild/modtypes/autotools.py:118 ../jhbuild/modtypes/cmake.py:87
-#: ../jhbuild/modtypes/linux.py:114 ../jhbuild/modtypes/waf.py:74
-#: ../tests/mock.py:162
+#: ../jhbuild/modtypes/autotools.py:224 ../jhbuild/modtypes/cmake.py:75
+#: ../jhbuild/modtypes/linux.py:109 ../jhbuild/modtypes/waf.py:76
 msgid "Configuring"
 msgstr "正在配置"
 
-#: ../jhbuild/modtypes/autotools.py:211 ../jhbuild/modtypes/cmake.py:108
-#: ../jhbuild/modtypes/linux.py:146 ../jhbuild/modtypes/waf.py:85
-#: ../tests/mock.py:157
+#: ../jhbuild/modtypes/autotools.py:264 ../jhbuild/modtypes/cmake.py:102
+#: ../jhbuild/modtypes/linux.py:141 ../jhbuild/modtypes/waf.py:87
 msgid "Cleaning"
 msgstr "正在清理"
 
-#: ../jhbuild/modtypes/autotools.py:220 ../jhbuild/modtypes/cmake.py:117
-#: ../jhbuild/modtypes/distutils.py:57 ../jhbuild/modtypes/linux.py:159
-#: ../jhbuild/modtypes/perl.py:53 ../jhbuild/modtypes/waf.py:92
-#: ../tests/mock.py:166
+#: ../jhbuild/modtypes/autotools.py:273 ../jhbuild/modtypes/cmake.py:111
+#: ../jhbuild/modtypes/distutils.py:57 ../jhbuild/modtypes/linux.py:154
+#: ../jhbuild/modtypes/perl.py:52 ../jhbuild/modtypes/waf.py:95
 msgid "Building"
 msgstr "正在构建"
 
-#: ../jhbuild/modtypes/autotools.py:254 ../jhbuild/modtypes/waf.py:109
-#: ../tests/mock.py:177
+#: ../jhbuild/modtypes/autotools.py:307 ../jhbuild/modtypes/waf.py:113
 msgid "Checking"
 msgstr "正在检查"
 
-#: ../jhbuild/modtypes/autotools.py:267 ../jhbuild/modtypes/cmake.py:126
-#: ../jhbuild/modtypes/waf.py:120
+#: ../jhbuild/modtypes/autotools.py:320 ../jhbuild/modtypes/cmake.py:120
+#: ../jhbuild/modtypes/waf.py:125
 msgid "Creating tarball for"
 msgstr "正在创建档案包"
 
-#: ../jhbuild/modtypes/autotools.py:276
+#: ../jhbuild/modtypes/autotools.py:329
 msgid "Dist checking"
 msgstr "Dist 检查"
 
-#: ../jhbuild/modtypes/autotools.py:285 ../jhbuild/modtypes/cmake.py:135
-#: ../jhbuild/modtypes/distutils.py:69 ../jhbuild/modtypes/perl.py:67
-#: ../jhbuild/modtypes/waf.py:130 ../tests/mock.py:172
+#: ../jhbuild/modtypes/autotools.py:338 ../jhbuild/modtypes/cmake.py:129
+#: ../jhbuild/modtypes/distutils.py:69 ../jhbuild/modtypes/perl.py:66
+#: ../jhbuild/modtypes/waf.py:136
 msgid "Installing"
 msgstr "正在安装"
 
-#: ../jhbuild/modtypes/autotools.py:301
+#: ../jhbuild/modtypes/autotools.py:367
 msgid "Distcleaning"
 msgstr "正在进行 distclean"
 
-#: ../jhbuild/modtypes/__init__.py:59
+#: ../jhbuild/modtypes/__init__.py:60
 #, python-format
 msgid "unknown module type %s"
 msgstr "未知的模块类型 %s"
 
-#: ../jhbuild/modtypes/__init__.py:75
+#: ../jhbuild/modtypes/__init__.py:77
 #, python-format
 msgid "dep node for module %s is missing package attribute"
 msgstr "模块 %s 对应的依赖节点缺少包属性"
 
-#: ../jhbuild/modtypes/__init__.py:116
+#: ../jhbuild/modtypes/__init__.py:86 ../jhbuild/modtypes/__init__.py:93
+#, python-format
+msgid "%(node)s node for %(module)s module is missing %(attribute)s attribute"
+msgstr "%(module)s 的 %(node)s 节点缺少 %(attribute)s 属性"
+
+#: ../jhbuild/modtypes/__init__.py:139
 #, python-format
 msgid "no <branch> element found for %s"
 msgstr "没有找到 %s 的 <branch> 元素"
 
 # fuzzy, python-format
-#: ../jhbuild/modtypes/__init__.py:124
+#: ../jhbuild/modtypes/__init__.py:148
 #, python-format
 msgid ""
 "Repository=%(missing)s not found for module id=%(module)s. Possible "
 "repositories are %(possible)s"
 msgstr ""
-"未找到 id=%(module)s 的模块对应的 repository=%(missing)s。可能的仓库为 %"
-"(possible)s"
+"未找到 id=%(module)s 的模块对应的 repository=%(missing)s。可能的仓库为 "
+"%(possible)s"
 
-# fuzzy, python-format
-#: ../jhbuild/modtypes/__init__.py:131
+#: ../jhbuild/modtypes/__init__.py:155
 #, python-format
 msgid ""
-"Default repository=%(missing)s not found for module id=%(module)s. Possible "
-"repositories are %(possible)s"
-msgstr ""
-"找不到 id=%(module)s 的模块对应的默认仓库 repository=%(missing)s。可能的仓库"
-"为 %(possible)s"
+"No repository for module id=%(module)s. Either set branch/repo or default "
+"repository."
+msgstr "没有对应模块 id=%(module)s 的仓库。请设置 branch/repo 或默认仓库。"
 
-#: ../jhbuild/modtypes/__init__.py:191
+#: ../jhbuild/modtypes/__init__.py:227
 #, python-format
 msgid "Deleting .la file: %r"
 msgstr "正在删除 .la 文件：%r"
 
-#: ../jhbuild/modtypes/__init__.py:234
-#, python-format
-msgid "Failed to rename %(src)r to %(dest)r: %(msg)s"
-msgstr "重命名 %(src)r 为 %(dest)r 失败：%(msg)s"
-
-#: ../jhbuild/modtypes/__init__.py:263
+#: ../jhbuild/modtypes/__init__.py:312
 #, python-format
 msgid "Moving temporary DESTDIR %r into build prefix"
 msgstr "正在将临时 DESTDIR %r 移动到构建前缀目录"
 
-#: ../jhbuild/modtypes/__init__.py:265
-#, python-format
-msgid "Install complete: %d files copied"
-msgstr "安装完成：复制了 %d 个文件"
-
-#: ../jhbuild/modtypes/__init__.py:284
+#: ../jhbuild/modtypes/__init__.py:334
 #, python-format
 msgid ""
 "Files remaining in buildroot %(dest)r; module may have installed files "
 "outside of prefix."
 msgstr "文件仍在构建根目录 %(dest)r 中；模块可能安装了前缀目录外的文件。"
 
-#: ../jhbuild/modtypes/__init__.py:302
+#: ../jhbuild/modtypes/__init__.py:352
 #, python-format
 msgid "Module failed to install into DESTDIR %(dest)r"
 msgstr "模块无法安装至 DESTDIR %(dest)r"
 
-#: ../jhbuild/modtypes/__init__.py:312
+#: ../jhbuild/modtypes/__init__.py:362
 #, python-format
 msgid "%d files remaining from previous build"
 msgstr "上次构建时留下了 %d 个文件"
 
-#: ../jhbuild/modtypes/__init__.py:315 ../jhbuild/utils/packagedb.py:265
+#: ../jhbuild/modtypes/__init__.py:365 ../jhbuild/utils/packagedb.py:282
 #, python-format
 msgid "Deleted: %(file)r"
 msgstr "已删除：%(file)r"
 
-#: ../jhbuild/modtypes/__init__.py:320
+#: ../jhbuild/modtypes/__init__.py:370
 #, python-format
 msgid "Failed to delete no longer installed file %(file)r: %(msg)s"
 msgstr "删除已不安装的 %(file)r 文件失败：%(msg)s"
 
-#: ../jhbuild/modtypes/__init__.py:370
+#: ../jhbuild/modtypes/__init__.py:378
+#, python-format
+msgid ""
+"Install encountered errors: %(num)d errors raised, %(files)d files copied. "
+"The errors are:\n"
+"  %(err)s"
+msgstr ""
+"安装遇到了错误：出现 %(num)d 个错误，已复制 %(files)d 个文件。错误为：\n"
+"  %(err)s"
+
+#: ../jhbuild/modtypes/__init__.py:385
+#, python-format
+msgid "Install complete: %d files copied"
+msgstr "安装完成：复制了 %d 个文件"
+
+#: ../jhbuild/modtypes/__init__.py:433
 #, python-format
 msgid "Skipping %s (not updated)"
 msgstr "跳过 %s(未更新)"
 
-#: ../jhbuild/modtypes/__init__.py:382
+#: ../jhbuild/modtypes/__init__.py:445
 #, python-format
 msgid "Skipping %s (package and dependencies not updated)"
 msgstr "跳过 %s(包和依赖未更新)"
 
-#: ../jhbuild/modtypes/__init__.py:446 ../jhbuild/modtypes/__init__.py:464
-#: ../jhbuild/modtypes/linux.py:83 ../jhbuild/modtypes/linux.py:90
-#: ../tests/mock.py:143
+#: ../jhbuild/modtypes/__init__.py:534 ../jhbuild/modtypes/__init__.py:552
+#: ../jhbuild/modtypes/linux.py:81 ../jhbuild/modtypes/linux.py:88
 msgid "Checking out"
 msgstr "正在检出"
 
-#: ../jhbuild/modtypes/__init__.py:450
+#: ../jhbuild/modtypes/__init__.py:538
 #, python-format
 msgid "source directory %s was not created"
 msgstr "源目录 %s 没有创建"
 
-#: ../jhbuild/modtypes/__init__.py:467
+#: ../jhbuild/modtypes/__init__.py:555
 msgid "wipe directory and start over"
 msgstr "清理目录并重新开始"
 
-#: ../jhbuild/modtypes/linux.py:46
+#: ../jhbuild/modtypes/linux.py:45
 #, python-format
 msgid "kconfig file %s was not created"
 msgstr "kconfig 文件 %s 没有创建"
 
-#: ../jhbuild/modtypes/linux.py:98
+#: ../jhbuild/modtypes/linux.py:93
 msgid "make mrproper"
 msgstr "make mrproper"
 
-#: ../jhbuild/modtypes/linux.py:172
+#: ../jhbuild/modtypes/linux.py:167
 msgid "Installing kernel"
 msgstr "正在安装内核"
 
-#: ../jhbuild/modtypes/linux.py:190
+#: ../jhbuild/modtypes/linux.py:185
 msgid "Installing modules"
 msgstr "正在安装模块"
 
-#: ../jhbuild/modtypes/linux.py:205
+#: ../jhbuild/modtypes/linux.py:200
 msgid "Installing kernel headers"
 msgstr "正在安装内核头文件"
 
 # fuzzy, python-format
-#: ../jhbuild/modtypes/linux.py:245
+#: ../jhbuild/modtypes/linux.py:240
 #, python-format
 msgid ""
 "Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. "
@@ -1314,11 +1393,11 @@ msgstr ""
 "能的仓库为 %(possible)s"
 
 # fuzzy, python-format
-#: ../jhbuild/modtypes/linux.py:251
+#: ../jhbuild/modtypes/linux.py:246
 #, python-format
 msgid ""
-"Default repository=%(missing)s not found for kconfig in linux id=%(linux_id)"
-"s. Possible repositories are %(possible)s"
+"Default repository=%(missing)s not found for kconfig in linux id="
+"%(linux_id)s. Possible repositories are %(possible)s"
 msgstr ""
 "找不到模块 id=%(linux_id)s 中 kconfig 对应的默认仓库 repository=%(missing)s。"
 "可能的仓库为%(possible)s"
@@ -1329,50 +1408,50 @@ msgid "module '%(module)s' has invalid size attribute ('%(size)s')"
 msgstr "'%(module)s' 模块的大小属性('%(size)s')无效"
 
 #: ../jhbuild/moduleset.py:34 ../jhbuild/utils/httpcache.py:46
-msgid "Python xml packages are required but could not be found"
-msgstr "需要 python xml 包，但找不到"
+msgid "Python XML packages are required but could not be found"
+msgstr "需要 Python XML 包，但找不到"
 
-#: ../jhbuild/moduleset.py:75
+#: ../jhbuild/moduleset.py:78
 #, python-format
 msgid "fixed case of module '%(orig)s' to '%(new)s'"
 msgstr "已将'%(orig)s' 模块的实例修复为 '%(new)s'"
 
-#: ../jhbuild/moduleset.py:91
-#, python-format
-msgid "module \"%s\" not found"
-msgstr "找不到 \"%s\" 模块"
-
-#: ../jhbuild/moduleset.py:106 ../jhbuild/moduleset.py:110
+#: ../jhbuild/moduleset.py:117
 #, python-format
 msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
 msgstr "%(module)s 依赖于未知模块 \"%(invalid)s\""
 
-#: ../jhbuild/moduleset.py:297
+#: ../jhbuild/moduleset.py:130
+#, python-format
+msgid "Circular dependencies detected: %s"
+msgstr "检测到循环依赖：%s"
+
+#: ../jhbuild/moduleset.py:276
 msgid "Unknown module:"
 msgstr "未知模块："
 
-#: ../jhbuild/moduleset.py:388
+#: ../jhbuild/moduleset.py:379
 #, python-format
 msgid "could not download %s: %s"
 msgstr "无法下载 %s：%s"
 
-#: ../jhbuild/moduleset.py:393 ../jhbuild/moduleset.py:395
+#: ../jhbuild/moduleset.py:384 ../jhbuild/moduleset.py:386
 #, python-format
 msgid "failed to parse %s: %s"
 msgstr "解析 %s 失败：%s"
 
-#: ../jhbuild/moduleset.py:422
+#: ../jhbuild/moduleset.py:413
 msgid "Duplicate repository:"
 msgstr "重复仓库："
 
-#: ../jhbuild/moduleset.py:526
+#: ../jhbuild/moduleset.py:516
+#, python-format
 msgid ""
 "Modulesets were edited locally but JHBuild is configured to get them from "
-"the network, perhaps you need to add use_local_modulesets = True to your ."
-"jhbuildrc."
+"the network, perhaps you need to add use_local_modulesets = True to your %s."
 msgstr ""
-"在本地修改了模块集，但 JHBuild 配置为从网络获取它们。或许您应该向您的 ."
-"jhbuildrc 中添加 use_local_modulesets = True"
+"在本地修改了模块集，但 JHBuild 配置为从网络获取它们。或许您应该向您的 %s 中添"
+"加 use_local_modulesets = True"
 
 #: ../jhbuild/monkeypatch.py:102
 #, python-format
@@ -1407,83 +1486,100 @@ msgid ""
 "to interrupt."
 msgstr "锁 %(path)r 由 pid %(pid)d 占用；正在等它退出。按 Control-C 强行中止。"
 
-#: ../jhbuild/utils/packagedb.py:71
+#: ../jhbuild/utils/packagedb.py:75
 #, python-format
 msgid "package %s has files with embedded new lines"
 msgstr "包 %s 有嵌入了新行的文件"
 
-#: ../jhbuild/utils/packagedb.py:148
+#: ../jhbuild/utils/packagedb.py:158
 msgid "Package DB modified externally, rereading"
 msgstr "包数据库在他处被修改，重新读取"
 
-#: ../jhbuild/utils/packagedb.py:252
+#: ../jhbuild/utils/packagedb.py:269
 #, python-format
 msgid ""
 "no manifest for '%s', can't uninstall.  Try building again, then "
 "uninstalling."
 msgstr "没有“%s”的清单，无法卸载。请尝试重新构建后再卸载。"
 
-#: ../jhbuild/utils/packagedb.py:269
+#: ../jhbuild/utils/packagedb.py:286
 #, python-format
 msgid "Failed to delete %(file)r: %(msg)s"
 msgstr "删除 %(file)r 失败：%(msg)s"
 
-#: ../jhbuild/utils/systeminstall.py:59
+#: ../jhbuild/utils/systeminstall.py:134
 msgid "No suitable root privilege command found; you should install \"pkexec\""
 msgstr "没有找到适合的，具有 root 权限的命令；您应该重新安装“pkexec”"
 
-#: ../jhbuild/utils/systeminstall.py:78 ../jhbuild/utils/systeminstall.py:81
+#: ../jhbuild/utils/systeminstall.py:166 ../jhbuild/utils/systeminstall.py:169
 #, python-format
 msgid "PackageKit: %s"
 msgstr "包套件：%s"
 
-#: ../jhbuild/utils/systeminstall.py:109
+#: ../jhbuild/utils/systeminstall.py:245
 msgid "Nothing available to install"
 msgstr "无可安装"
 
-#: ../jhbuild/utils/systeminstall.py:112
+#: ../jhbuild/utils/systeminstall.py:248
 #, python-format
-msgid "Installing: %s"
-msgstr "正在安装：%s"
+msgid ""
+"Installing:\n"
+"  %s"
+msgstr ""
+"正在安装：\n"
+"  %s"
 
-#: ../jhbuild/utils/systeminstall.py:124
+#: ../jhbuild/utils/systeminstall.py:254
 msgid "Complete!"
 msgstr "完成！"
 
-#: ../jhbuild/utils/systeminstall.py:156
+#: ../jhbuild/utils/systeminstall.py:265
+msgid "Using yum to install packages.  Please wait."
+msgstr "正在使用 yum 安装包。请稍候。"
+
+#: ../jhbuild/utils/systeminstall.py:268
+#, python-format
+msgid ""
+"Installing:\n"
+"  %(pkgs)s"
+msgstr ""
+"正在安装：\n"
+"  %(pkgs)s"
+
+#: ../jhbuild/utils/systeminstall.py:278 ../jhbuild/utils/systeminstall.py:328
+msgid "Nothing to install"
+msgstr "无可安装"
+
+#: ../jhbuild/utils/systeminstall.py:309
 msgid "Using apt-file to search for providers; this may be slow.  Please wait."
 msgstr "正在使用 apt-file 搜索提供者；这可能较慢，请等候。"
 
-#: ../jhbuild/utils/systeminstall.py:163
+#: ../jhbuild/utils/systeminstall.py:318
 #, python-format
-msgid "No native package found for %(id)s"
-msgstr "没有找到 %(id)s 的本地包"
+msgid "No native package found for %(id)s (%(filename)s)"
+msgstr "没有找到 %(id)s 的本地包(%(filename)s)"
 
-#: ../jhbuild/utils/systeminstall.py:166
+#: ../jhbuild/utils/systeminstall.py:323
 #, python-format
 msgid "Installing: %(pkgs)s"
 msgstr "正在安装：%(pkgs)s"
 
-#: ../jhbuild/utils/systeminstall.py:171
-msgid "Nothing to install"
-msgstr "无可安装"
-
 #: ../jhbuild/utils/trigger.py:57
 #, python-format
 msgid "No keys specified in trigger script %r"
 msgstr "在触发器脚本 %r 中没有指定键"
 
-#: ../jhbuild/utils/unpack.py:144
+#: ../jhbuild/utils/unpack.py:145
 #, python-format
 msgid "Failed to unpack %s (unknown archive type)"
 msgstr "解开 %s 失败(未知的档案类型)"
 
-#: ../jhbuild/utils/unpack.py:146
+#: ../jhbuild/utils/unpack.py:147
 #, python-format
 msgid "Failed to unpack %s"
 msgstr "解开 %s 失败"
 
-#: ../jhbuild/utils/unpack.py:152
+#: ../jhbuild/utils/unpack.py:153
 #, python-format
 msgid "Failed to unpack %s (empty file?)"
 msgstr "解开 %s 失败(空文件？)"
@@ -1492,14 +1588,14 @@ msgstr "解开 %s 失败(空文件？)"
 #: ../jhbuild/versioncontrol/fossil.py:49 ../jhbuild/versioncontrol/hg.py:53
 #: ../jhbuild/versioncontrol/mtn.py:52 ../jhbuild/versioncontrol/tarball.py:67
 #, python-format
-msgid "branch for %s has wrong override, check your .jhbuildrc"
-msgstr "%s 的分支有覆盖错误，查检您的 .jhbuildrc"
+msgid "branch for %(name)s has wrong override, check your %(filename)s"
+msgstr "%(name)s 的分支有覆盖错误，请检查您的 %(filename)s"
 
-#: ../jhbuild/versioncontrol/bzr.py:117
+#: ../jhbuild/versioncontrol/bzr.py:119
 msgid "attribute is deprecated. Use revspec instead."
 msgstr "属性已废弃。请转而使用 revspec"
 
-#: ../jhbuild/versioncontrol/bzr.py:173
+#: ../jhbuild/versioncontrol/bzr.py:175
 #, python-format
 msgid ""
 "\n"
@@ -1528,19 +1624,19 @@ msgstr "\"%s\" 似乎不是一份 CVS 工作副本"
 #: ../jhbuild/versioncontrol/cvs.py:277
 #, python-format
 msgid ""
-"working copy points at the wrong repository (expected %(root1)s but got %"
-"(root2)s). "
+"working copy points at the wrong repository (expected %(root1)s but got "
+"%(root2)s). "
 msgstr "工作副本指向了错误的仓库(应为 %(root1)s)，而得到的是 %(root2)s)。"
 
 #: ../jhbuild/versioncontrol/cvs.py:279
 msgid "Consider using the changecvsroot.py script to fix this."
 msgstr "考虑使用 changecvsroot.py 脚本来修复此问题。"
 
-#: ../jhbuild/versioncontrol/darcs.py:84 ../jhbuild/versioncontrol/darcs.py:90
-#: ../jhbuild/versioncontrol/fossil.py:82
-#: ../jhbuild/versioncontrol/fossil.py:95 ../jhbuild/versioncontrol/git.py:554
-#: ../jhbuild/versioncontrol/git.py:594 ../jhbuild/versioncontrol/git.py:670
-#: ../jhbuild/versioncontrol/hg.py:85 ../jhbuild/versioncontrol/hg.py:91
+#: ../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/hg.py:87 ../jhbuild/versioncontrol/hg.py:93
 msgid "date based checkout not yet supported\n"
 msgstr "尚未支持基于日期的检出\n"
 
@@ -1589,7 +1685,7 @@ msgid ""
 "remove the directory)."
 msgstr "更新模块失败(缺少 .git)(您应该检查改动然后移除该目录)。"
 
-#: ../jhbuild/versioncontrol/git.py:521
+#: ../jhbuild/versioncontrol/git.py:525
 msgid ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
@@ -1597,37 +1693,37 @@ msgstr ""
 "外部处理失败\n"
 "如果您运行的 git 版本 < 1.5.6，建议您更新它。\n"
 
-#: ../jhbuild/versioncontrol/git.py:566
+#: ../jhbuild/versioncontrol/git.py:570
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr "无法从 %s 获取最新版本。请检查模块位置。"
 
-#: ../jhbuild/versioncontrol/__init__.py:186
+#: ../jhbuild/versioncontrol/__init__.py:193
 #, python-format
 msgid "unknown repository type %s"
 msgstr "未知的仓库类型 %s"
 
-#: ../jhbuild/versioncontrol/mtn.py:91
+#: ../jhbuild/versioncontrol/mtn.py:93
 #, python-format
 msgid "Initializing %s"
 msgstr "正在初始化 %s"
 
-#: ../jhbuild/versioncontrol/mtn.py:99
+#: ../jhbuild/versioncontrol/mtn.py:101
 #, python-format
 msgid "Pulling branch %(branch)s from %(server)s"
 msgstr "正在从 %(server)s 拉取 %(branch)s 分支"
 
-#: ../jhbuild/versioncontrol/mtn.py:117
+#: ../jhbuild/versioncontrol/mtn.py:119
 #, python-format
 msgid "branch %(branch)s has %(num)d heads"
 msgstr "%(branch)s 分支有 %(num)d 个最新版本"
 
-#: ../jhbuild/versioncontrol/mtn.py:123
+#: ../jhbuild/versioncontrol/mtn.py:125
 #, python-format
 msgid "Checking out branch '%(branch)s' to directory '%(dir)s'"
 msgstr "正在检出 '%(branch)s' 分支到 '%(dir)s' 目录"
 
-#: ../jhbuild/versioncontrol/mtn.py:132
+#: ../jhbuild/versioncontrol/mtn.py:134
 #, python-format
 msgid "Updating working copy %s"
 msgstr "正在更新工作副本 %s"
@@ -1646,94 +1742,143 @@ msgstr "无法获取 %s 的 Subversion URI"
 msgid "could not parse \"svn info\" output for %s"
 msgstr "无法解析 %s 的 \"svn info\" 输出"
 
-#: ../jhbuild/versioncontrol/svn.py:307
+#: ../jhbuild/versioncontrol/svn.py:309
 msgid "Error checking for conflicts"
 msgstr "检查冲突失败"
 
-#: ../jhbuild/versioncontrol/tarball.py:85
+#: ../jhbuild/versioncontrol/tarball.py:90
 #, python-format
 msgid "branch for %s is not correct, check the moduleset file."
 msgstr "%s 分支不正确，请检查模块集文件。"
 
-#: ../jhbuild/versioncontrol/tarball.py:121
+#: ../jhbuild/versioncontrol/tarball.py:126
 #, python-format
 msgid "URL has no filename component: %s"
 msgstr "URL 中不含文件名：%s"
 
-#: ../jhbuild/versioncontrol/tarball.py:164
+#: ../jhbuild/versioncontrol/tarball.py:169
 msgid "file not downloaded"
 msgstr "文件未下载"
 
-#: ../jhbuild/versioncontrol/tarball.py:169
+#: ../jhbuild/versioncontrol/tarball.py:174
 #, python-format
 msgid "downloaded file size is incorrect (expected %(size1)d, got %(size2)d)"
 msgstr "下载文件大小不正确(应为 %(size1)d)，而得到的是 %(size2)d)"
 
-#: ../jhbuild/versioncontrol/tarball.py:175
+#: ../jhbuild/versioncontrol/tarball.py:180
 #, python-format
 msgid "invalid hash attribute on module %s"
 msgstr "%s 模块的 hash 属性无效"
 
-#: ../jhbuild/versioncontrol/tarball.py:188
+#: ../jhbuild/versioncontrol/tarball.py:193
 #, python-format
 msgid "file hash is incorrect (expected %(sum1)s, got %(sum2)s)"
 msgstr "文件 hash 不正确(应为 %(sum1)s，而得到是的 %(sum2)s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:191
+#: ../jhbuild/versioncontrol/tarball.py:196
 #, python-format
 msgid "skipped hash check (missing support for %s)"
 msgstr "已跳过 hash 检查(缺少 %s 支持)"
 
-#: ../jhbuild/versioncontrol/tarball.py:205
+#: ../jhbuild/versioncontrol/tarball.py:210
 msgid "unable to find wget or curl"
 msgstr "找不到 wget 或 curl"
 
-#: ../jhbuild/versioncontrol/tarball.py:221
+#: ../jhbuild/versioncontrol/tarball.py:226
 #, python-format
 msgid "tarball dir (%s) can not be created"
 msgstr "无法创建档案包目录(%s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:223
+#: ../jhbuild/versioncontrol/tarball.py:228
 #, python-format
 msgid "tarball dir (%s) must be writable"
 msgstr "档案包目录(%s)必须可写"
 
-#: ../jhbuild/versioncontrol/tarball.py:235
+#: ../jhbuild/versioncontrol/tarball.py:240
 #, python-format
 msgid "failed to unpack %s"
 msgstr "解开 %s 失败"
 
-#: ../jhbuild/versioncontrol/tarball.py:238
+#: ../jhbuild/versioncontrol/tarball.py:243
 #, python-format
 msgid "could not unpack tarball (expected %s dir)"
 msgstr "无法解开档案包(应为 %s 目录)"
 
-#: ../jhbuild/versioncontrol/tarball.py:253
+#: ../jhbuild/versioncontrol/tarball.py:258
 #, python-format
 msgid "could not download patch (error: %s)"
 msgstr "无法下载补丁(错误：%s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:255
+#: ../jhbuild/versioncontrol/tarball.py:260
 msgid "could not download patch"
 msgstr "无法下载补丁"
 
-#: ../jhbuild/versioncontrol/tarball.py:287
+#: ../jhbuild/versioncontrol/tarball.py:292
 #, python-format
 msgid "Failed to find patch: %s"
 msgstr "查找补丁失败：%s"
 
-#: ../jhbuild/versioncontrol/tarball.py:289
+#: ../jhbuild/versioncontrol/tarball.py:294
 msgid "Applying patch"
 msgstr "正在应用补丁"
 
-#: ../jhbuild/versioncontrol/tarball.py:297
+#: ../jhbuild/versioncontrol/tarball.py:302
 msgid "unable to find quilt"
 msgstr "找不到 quilt"
 
-#: ../jhbuild/versioncontrol/tarball.py:308
+#: ../jhbuild/versioncontrol/tarball.py:313
 msgid "could not checkout quilt patch set"
 msgstr "无法检出 quilt 补丁集"
 
+#~ msgid ""
+#~ "bootstrap moduleset has been updated since the last time you used it, "
+#~ "perhaps you should run jhbuild bootstrap."
+#~ msgstr ""
+#~ "bootstrap 模块集从您上次使用以来有了更新，也许您应该运行 jhbuild bootstrap"
+
+#~ msgid ""
+#~ "some bootstrap modules have been updated, perhaps you should update them: "
+#~ "%s."
+#~ msgstr "一些 bootstrap 模块有更新，也许您应该更新他们：%s。"
+
+#~ msgid "This option does nothing anymore"
+#~ msgstr "此选项不再有作用"
+
+#~ msgid "do not use system installed modules"
+#~ msgstr "不要使用系统中安装的模块"
+
+#~ msgid ""
+#~ "some modules (%s) were automatically ignored as a sufficient enough "
+#~ "version was found installed on your system. Use --ignore-system if you "
+#~ "want to build them nevertheless."
+#~ msgstr ""
+#~ "由于发现您的系统中已经安装了足够新的版本，一些模块(%s)被自动忽略。虽然如"
+#~ "此，如果您愿意，可以使用 --ignore-system 选项来构建它们。"
+
+#~ msgid ""
+#~ "Partial build is not enabled; add partial_build = True to ~/.jhbuildrc"
+#~ msgstr "部分构建未启用；请向 ~/.jhbuildrc 中添加 partial_build = True"
+
+#~ msgid "  %(pkg)s (required=%(req)s, installed=%(installed)s)"
+#~ msgstr "  %(pkg)s (要求=%(req)s，已安装=%(installed)s)"
+
+#~ msgid "  %(pkg)s (required=%(req)s)"
+#~ msgstr "  %(pkg)s (要求=%(req)s)"
+
+# fuzzy, python-format
+#~ msgid ""
+#~ "Default repository=%(missing)s not found for module id=%(module)s. "
+#~ "Possible repositories are %(possible)s"
+#~ msgstr ""
+#~ "找不到 id=%(module)s 的模块对应的默认仓库 repository=%(missing)s。可能的仓"
+#~ "库为 %(possible)s"
+
+#~ msgid "Failed to rename %(src)r to %(dest)r: %(msg)s"
+#~ msgstr "重命名 %(src)r 为 %(dest)r 失败：%(msg)s"
+
+#~ msgid "module \"%s\" not found"
+#~ msgstr "找不到 \"%s\" 模块"
+
 #~ msgid "gnome-doc-prepare not available"
 #~ msgstr "gnome-doc-prepare 不可用"
 
@@ -1743,9 +1888,6 @@ msgstr "无法检出 quilt 补丁集"
 #~ msgid "command not found"
 #~ msgstr "找不到命令"
 
-#~ msgid "Always run autogen.sh"
-#~ msgstr "总是运行 autogen.sh"
-
 #~ msgid "could not register archive %s"
 #~ msgstr "无法注册档案 %s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]