[jhbuild] Update Chinese (China) translation



commit eef1680d383ac1b5f761f6b7b2b8032404eba18a
Author: Luming Zh <lumingzh qq com>
Date:   Wed Feb 2 17:25:42 2022 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 1230 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 680 insertions(+), 550 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 97647764..1fbd2b32 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,241 +3,253 @@
 # This file is distributed under the same license as the jhbuild package.
 # Wylmer Wang <wantinghard gmail com>, 2010, 2011, 2013, 2014.
 # YunQiang Su <wzssyqa gmail com>, 2011.
+# lumingzh <lumingzh qq com>, 2022.
 #
 msgid ""
 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: 2014-02-28 21:29+0000\n"
-"PO-Revision-Date: 2014-03-01 08:31+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/jhbuild/issues\n";
+"POT-Creation-Date: 2022-02-01 00:46+0000\n"
+"PO-Revision-Date: 2022-02-02 12:25-0500\n"
+"Last-Translator: lumingzh <lumingzh qq com>\n"
+"Language-Team: Chinese - China <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"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.4.3\n"
 
-#: ../autogen.sh:103
+#: autogen.sh:110
 #, sh-format
 msgid "Configuring $PKG_NAME without autotools"
 msgstr "正在没有 autotools 的情况下配置 $PKG_NAME"
 
-#: ../autogen.sh:120 ../autogen.sh:125
+#: autogen.sh:133 autogen.sh:138
 #, sh-format
 msgid "Unable to create file $srcdir/Makefile.inc"
 msgstr "无法创建文件 $srcdir/Makefile.inc"
 
-#: ../autogen.sh:140
+#: autogen.sh:158
 #, sh-format
 msgid "Unable to read file $makefile"
 msgstr "无法读取 $makefile 文件"
 
-#: ../autogen.sh:145
+#: autogen.sh:163
 #, sh-format
 msgid "Unable to copy $makefile to $srcdir/Makefile"
 msgstr "无法将 $makefile 复制到 $srcdir/Makefile"
 
-#: ../autogen.sh:150
+#: autogen.sh:168
 #, sh-format
 msgid "Now type `make' to compile $PKG_NAME"
 msgstr "现在输入“make”来编译 $PKG_NAME"
 
-#: ../autogen.sh:188
+#: autogen.sh:228
 #, sh-format
 msgid ""
 "**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME "
 "directory"
 msgstr "**错误**:“$srcdir”似乎不是顶级的 $PKG_NAME 目录"
 
-#: ../autogen.sh:230
-msgid ""
-"WARNING: gnome-autogen.sh not available (usually part of package 'gnome-"
-"common')"
-msgstr "警告:gnome-autogen.sh 不可用(通常在“gnome-common”这个包里)"
+#: autogen.sh:282
+msgid "WARNING: aclocal not available (usually part of package 'autoconf')"
+msgstr "警告:aclocal 不可用(通常为“autoconf”软件包的一部分)"
+
+#: autogen.sh:285
+msgid "WARNING: automake not available (usually part of package 'automake')"
+msgstr "警告:automake 不可用(通常为“automake”软件包的一部分)"
+
+#: autogen.sh:288
+msgid "WARNING: autopoint not available (usually part of package 'gettext')"
+msgstr "警告:autopoint 不可用(通常为“gettext”软件包的一部分)"
+
+#: autogen.sh:291
+msgid "WARNING: pkg-config not available (usually part of package 'pkgconfig')"
+msgstr "警告:pkg-config 不可用(通常为“pkgconfig”软件包的一部分)"
 
-#: ../autogen.sh:233
+#: autogen.sh:294
 msgid ""
 "WARNING: yelp-tools not available (usually part of package 'yelp-tools')"
-msgstr "警告:yelp-tools 不可用(通常在“yelp-tools”这个包里)"
+msgstr "警告:yelp-tools 不可用(通常为“yelp-tools”软件包的一部分)"
 
-#: ../jhbuild/commands/autobuild.py:28
+#: jhbuild/commands/autobuild.py:28
 msgid "Build modules non-interactively and upload results to JhAutobuild"
 msgstr "以非交互方式构建模块并将结果上传到 JhAutobuild"
 
-#: ../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
+#: jhbuild/commands/autobuild.py:36 jhbuild/commands/base.py:166
+#: jhbuild/commands/base.py:278 jhbuild/commands/make.py:40
+#: jhbuild/commands/tinderbox.py:38
 msgid "always run autogen.sh"
 msgstr "总是运行 autogen.sh"
 
-#: ../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
+#: jhbuild/commands/autobuild.py:39 jhbuild/commands/base.py:172
+#: jhbuild/commands/base.py:281 jhbuild/commands/make.py:43
+#: jhbuild/commands/tinderbox.py:44
 msgid "run make clean before make"
 msgstr "在运行 make 前运行 make clean"
 
-#: ../jhbuild/commands/autobuild.py:42 ../jhbuild/commands/base.py:187
-#: ../jhbuild/commands/base.py:298
+#: jhbuild/commands/autobuild.py:42 jhbuild/commands/base.py:181
+#: jhbuild/commands/base.py:293
 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:437
-#: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:53
+#: jhbuild/commands/autobuild.py:45 jhbuild/commands/base.py:41
+#: jhbuild/commands/base.py:193 jhbuild/commands/base.py:443
+#: jhbuild/commands/clean.py:39 jhbuild/commands/tinderbox.py:56
 msgid "treat the given modules as up to date"
 msgstr "将给定模块视为最新"
 
-#: ../jhbuild/commands/autobuild.py:48 ../jhbuild/commands/base.py:202
-#: ../jhbuild/commands/clean.py:41 ../jhbuild/commands/tinderbox.py:56
+#: jhbuild/commands/autobuild.py:48 jhbuild/commands/base.py:196
+#: jhbuild/commands/clean.py:42 jhbuild/commands/tinderbox.py:59
 msgid "start building at the given module"
 msgstr "从给定模块开始构建"
 
-#: ../jhbuild/commands/autobuild.py:51
+#: jhbuild/commands/autobuild.py:51
 msgid "jhautobuild report URL"
 msgstr "jhbuild 报告 URL"
 
-#: ../jhbuild/commands/autobuild.py:54
+#: jhbuild/commands/autobuild.py:54
 msgid "verbose mode"
 msgstr "详细模式"
 
-#: ../jhbuild/commands/autobuild.py:71
+#: jhbuild/commands/autobuild.py:71
 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:475
-#: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:94
+#: jhbuild/commands/autobuild.py:82 jhbuild/commands/base.py:67
+#: jhbuild/commands/base.py:243 jhbuild/commands/base.py:481
+#: jhbuild/commands/clean.py:56 jhbuild/commands/tinderbox.py:97
 #, python-format
 msgid "%s not in module list"
 msgstr "%s 不在模块列表中"
 
-#: ../jhbuild/commands/base.py:38
+#: jhbuild/commands/base.py:32
 msgid "Update all modules from version control"
 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:428
-#: ../jhbuild/commands/tinderbox.py:32
+#: jhbuild/commands/base.py:35 jhbuild/commands/base.py:83
+#: jhbuild/commands/base.py:117 jhbuild/commands/base.py:160
+#: jhbuild/commands/base.py:272 jhbuild/commands/base.py:434
+#: jhbuild/commands/tinderbox.py:32
 msgid "[ options ... ] [ modules ... ]"
 msgstr "[ 选项 ... ] [ 模块 ... ]"
 
-#: ../jhbuild/commands/base.py:50
+#: jhbuild/commands/base.py:44
 msgid "start updating at the given module"
 msgstr "从给定模块开始更新"
 
-#: ../jhbuild/commands/base.py:53
+#: jhbuild/commands/base.py:47
 msgid "update only modules with the given tags"
 msgstr "只更新带有给定标记的模块"
 
-#: ../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
+#: jhbuild/commands/base.py:50 jhbuild/commands/base.py:89
+#: jhbuild/commands/base.py:202 jhbuild/commands/base.py:302
+#: jhbuild/commands/tinderbox.py:62
 msgid "set a sticky date when checking out modules"
 msgstr "在检出模块时设置一个粘性日期"
 
-#: ../jhbuild/commands/base.py:59 ../jhbuild/commands/base.py:190
-#: ../jhbuild/commands/base.py:446
+#: jhbuild/commands/base.py:53 jhbuild/commands/base.py:184
+#: jhbuild/commands/base.py:452
 msgid "ignore all soft-dependencies"
 msgstr "忽略所有软依赖"
 
-#: ../jhbuild/commands/base.py:86
+#: jhbuild/commands/base.py:80
 msgid "Update one or more modules from version control"
 msgstr "通过版本控制更新一个或多个模块"
 
-#: ../jhbuild/commands/base.py:104 ../jhbuild/commands/base.py:142
-#: ../jhbuild/commands/base.py:383 ../jhbuild/commands/rdepends.py:52
-#: ../jhbuild/moduleset.py:165
+#: jhbuild/commands/base.py:98 jhbuild/commands/base.py:136
+#: jhbuild/commands/base.py:389 jhbuild/commands/rdepends.py:53
+#: jhbuild/moduleset.py:177
 #, 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:340 ../jhbuild/commands/rdepends.py:47
-#: ../jhbuild/commands/uninstall.py:58
+#: jhbuild/commands/base.py:101 jhbuild/commands/base.py:139
+#: jhbuild/commands/base.py:346 jhbuild/commands/rdepends.py:48
+#: jhbuild/commands/uninstall.py:58
 msgid "This command requires a module parameter."
 msgstr "此命令需要一个模块参数。"
 
-#: ../jhbuild/commands/base.py:120
+#: jhbuild/commands/base.py:114
 msgid "Clean one or more modules"
 msgstr "清理一个或多个模块"
 
-#: ../jhbuild/commands/base.py:129
+#: jhbuild/commands/base.py:123
 msgid "honour the makeclean setting in config file"
 msgstr "接受 config 文件中的 makeclean 设置"
 
-#: ../jhbuild/commands/base.py:132 ../jhbuild/commands/base.py:175
-#: ../jhbuild/commands/base.py:289 ../jhbuild/commands/tinderbox.py:41
+#: jhbuild/commands/base.py:126 jhbuild/commands/base.py:169
+#: jhbuild/commands/base.py:284 jhbuild/commands/tinderbox.py:41
 msgid "completely clean source tree"
 msgstr "彻底清理源码树"
 
-#: ../jhbuild/commands/base.py:149
+#: jhbuild/commands/base.py:143
 msgid "clean command called while makeclean is set to False, skipped."
 msgstr "调用了 clean 命令,而 makeclean 设为关闭,已跳过。"
 
-#: ../jhbuild/commands/base.py:163
+#: jhbuild/commands/base.py:157
 msgid "Update and compile all modules (the default)"
 msgstr "更新并编译所有模块(默认)"
 
-#: ../jhbuild/commands/base.py:181 ../jhbuild/commands/base.py:292
-#: ../jhbuild/commands/make.py:48
+#: jhbuild/commands/base.py:175 jhbuild/commands/base.py:287
+#: jhbuild/commands/make.py:46 jhbuild/commands/tinderbox.py:47
 msgid "run make check after building"
 msgstr "在构建后运行 make check"
 
-#: ../jhbuild/commands/base.py:184 ../jhbuild/commands/base.py:295
+#: jhbuild/commands/base.py:178 jhbuild/commands/base.py:290
 msgid "run make dist after building"
 msgstr "在构建后运行 make dist"
 
-#: ../jhbuild/commands/base.py:193 ../jhbuild/commands/base.py:301
-#: ../jhbuild/commands/tinderbox.py:47
+#: jhbuild/commands/base.py:187 jhbuild/commands/base.py:296
+#: jhbuild/commands/tinderbox.py:50
 msgid "skip version control update"
 msgstr "跳过版本控制更新"
 
-#: ../jhbuild/commands/base.py:196 ../jhbuild/commands/base.py:304
-#: ../jhbuild/commands/make.py:51
+#: jhbuild/commands/base.py:190 jhbuild/commands/base.py:299
+#: jhbuild/commands/make.py:49
 msgid "quiet (no output)"
 msgstr "安静(无输出)"
 
-#: ../jhbuild/commands/base.py:205 ../jhbuild/commands/base.py:443
+#: jhbuild/commands/base.py:199 jhbuild/commands/base.py:449
 msgid "build only modules with the given tags"
 msgstr "只构建带给定标记的模块"
 
-#: ../jhbuild/commands/base.py:211 ../jhbuild/commands/base.py:310
+#: jhbuild/commands/base.py:205 jhbuild/commands/base.py:305
 msgid "run tests in real X and not in Xvfb"
 msgstr "在实际的 X 而非 Xvfb 中运行测试"
 
-#: ../jhbuild/commands/base.py:214 ../jhbuild/commands/tinderbox.py:62
+#: jhbuild/commands/base.py:208 jhbuild/commands/tinderbox.py:65
 msgid "try to force checkout and autogen on failure"
 msgstr "在失败时尝试强制进行检出和 autogen"
 
-#: ../jhbuild/commands/base.py:217 ../jhbuild/commands/tinderbox.py:65
+#: jhbuild/commands/base.py:211 jhbuild/commands/base.py:308
+#: jhbuild/commands/tinderbox.py:68
 msgid "don't poison modules on failure"
 msgstr "在失败时不要污染模块"
 
-#: ../jhbuild/commands/base.py:220 ../jhbuild/commands/base.py:313
-#: ../jhbuild/commands/tinderbox.py:68
+#: jhbuild/commands/base.py:214 jhbuild/commands/base.py:311
+#: jhbuild/commands/tinderbox.py:71
 msgid "build even if policy says not to"
 msgstr "即使策略不允许也构建"
 
-#: ../jhbuild/commands/base.py:223
+#: jhbuild/commands/base.py:217
 msgid "also build soft-dependencies that could be skipped"
 msgstr "同时构建无法跳过的软依赖"
 
-#: ../jhbuild/commands/base.py:226 ../jhbuild/commands/base.py:316
+#: jhbuild/commands/base.py:220 jhbuild/commands/base.py:314
 msgid "skip modules installed less than the given time ago"
 msgstr "跳过给定时间之后安装的模块"
 
-#: ../jhbuild/commands/base.py:229 ../jhbuild/commands/tinderbox.py:71
+#: jhbuild/commands/base.py:223 jhbuild/commands/tinderbox.py:74
 msgid "ignore missing system dependencies"
 msgstr "忽略缺少的系统依赖"
 
-#: ../jhbuild/commands/base.py:253
+#: jhbuild/commands/base.py:247
 msgid "requested module is in the ignore list, nothing to do."
 msgstr "要求的模块在忽略列表中,无事可做。"
 
-#: ../jhbuild/commands/base.py:260 ../jhbuild/commands/tinderbox.py:100
+#: jhbuild/commands/base.py:255 jhbuild/commands/tinderbox.py:103
 #, python-format
 msgid ""
 "Required system dependencies not installed. Install using the command "
@@ -246,918 +258,904 @@ msgstr ""
 "需要的系统依赖没有安装。请使用 %(cmd)s 命令安装,或使用命令行选项 %(opt)s 忽"
 "略系统依赖"
 
-#: ../jhbuild/commands/base.py:274
+#: jhbuild/commands/base.py:269
 msgid "Update and compile one or more modules"
 msgstr "更新和编译一个或多个模块"
 
-#: ../jhbuild/commands/base.py:335 ../jhbuild/commands/make.py:95
-#: ../jhbuild/commands/uninstall.py:50
+#: jhbuild/commands/base.py:341 jhbuild/commands/make.py:104
+#: 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:348
+#: jhbuild/commands/base.py:354
 msgid "Run a command under the JHBuild environment"
 msgstr "在 JHBuild 环境下运行命令"
 
-#: ../jhbuild/commands/base.py:351
+#: jhbuild/commands/base.py:357
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr "[ 选项 ... ] 程序名 [ 参数 ... ]"
 
-#: ../jhbuild/commands/base.py:357
+#: jhbuild/commands/base.py:363
 msgid "run command in build dir of the given module"
 msgstr "在给定模块的构建目录中运行命令"
 
-#: ../jhbuild/commands/base.py:360
+#: jhbuild/commands/base.py:366
 msgid "run command in checkout dir of the given module"
 msgstr "在给定模块的检出目录中运行命令"
 
-#: ../jhbuild/commands/base.py:373 ../jhbuild/commands/base.py:403
+#: jhbuild/commands/base.py:379 jhbuild/commands/base.py:409
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
 msgstr "无法执行 %(command)s 命令:%(err)s"
 
-#: ../jhbuild/commands/base.py:394
+#: jhbuild/commands/base.py:400
 #, python-format
 msgid "Unable to execute the command '%s'"
 msgstr "无法执行 %s 命令"
 
-#: ../jhbuild/commands/base.py:401 ../jhbuild/frontends/gtkui.py:447
-#: ../jhbuild/frontends/terminal.py:145
+#: jhbuild/commands/base.py:407 jhbuild/frontends/gtkui.py:447
+#: jhbuild/frontends/terminal.py:172
 msgid "No command given"
 msgstr "没有给出命令"
 
-#: ../jhbuild/commands/base.py:410
+#: jhbuild/commands/base.py:416
 msgid "Start a shell under the JHBuild environment"
 msgstr "在 JHBuild 环境下启动一个 shell"
 
-#: ../jhbuild/commands/base.py:425
+#: jhbuild/commands/base.py:431
 msgid "List the modules that would be built"
 msgstr "列出将构建的模块"
 
-#: ../jhbuild/commands/base.py:434
+#: jhbuild/commands/base.py:440
 msgid "show which revision will be built"
 msgstr "显示要构建的修订版本"
 
-#: ../jhbuild/commands/base.py:440
+#: jhbuild/commands/base.py:446
 msgid "start list at the given module"
 msgstr "从给定模块开始列表"
 
-#: ../jhbuild/commands/base.py:449
+#: jhbuild/commands/base.py:455
 msgid "also list soft-dependencies that could be skipped"
 msgstr "同时列出无法跳过的软依赖"
 
-#: ../jhbuild/commands/base.py:452
+#: jhbuild/commands/base.py:458
 msgid "list all modules, not only those that would be built"
 msgstr "列出所有模块,而不仅是要构建的模块"
 
-#: ../jhbuild/commands/base.py:459
+#: jhbuild/commands/base.py:465
 msgid "Conflicting options specified ('--start-at' and '--all-modules')"
 msgstr "指定了冲突的选项('--start-at' 和 '--all-modules')"
 
-#: ../jhbuild/commands/base.py:491
+#: jhbuild/commands/base.py:497
 msgid "Output a Graphviz dependency graph for one or more modules"
 msgstr "输出一个或多个模块的一张 Graphviz 依赖图"
 
-#: ../jhbuild/commands/base.py:494 ../jhbuild/commands/info.py:39
-#: ../jhbuild/commands/uninstall.py:34
+#: jhbuild/commands/base.py:500 jhbuild/commands/base.py:533
+#: jhbuild/commands/info.py:43 jhbuild/commands/uninstall.py:34
 msgid "[ modules ... ]"
 msgstr "[ 模块 ... ]"
 
-#: ../jhbuild/commands/base.py:500
+#: jhbuild/commands/base.py:506
 msgid "add dotted lines to soft dependencies"
 msgstr "向软依赖添加点线"
 
-#: ../jhbuild/commands/base.py:503
+#: jhbuild/commands/base.py:509
 msgid "group modules from metamodule together"
 msgstr "将 metamodule 中的模块归在一起"
 
-#: ../jhbuild/commands/bootstrap.py:24
+#: jhbuild/commands/base.py:530
+msgid "Run post-install triggers for named modules (or all)"
+msgstr "为已命名模块(或全部)运行 post-install 触发器"
+
+#: jhbuild/commands/bootstrap.py:25
 msgid "Build support tools"
 msgstr "构建支持工具"
 
-#: ../jhbuild/commands/bot.py:54
+#: jhbuild/commands/bot.py:34
 msgid "Control buildbot"
 msgstr "控制 buildbot"
 
-#: ../jhbuild/commands/bot.py:57 ../jhbuild/commands/__init__.py:45
-#: ../jhbuild/commands/make.py:36
+#: jhbuild/commands/bot.py:37 jhbuild/commands/__init__.py:49
+#: jhbuild/commands/make.py:34
 msgid "[ options ... ]"
 msgstr "[ 选项 ... ]"
 
-#: ../jhbuild/commands/bot.py:63
+#: jhbuild/commands/bot.py:43
 msgid "setup a buildbot environment"
 msgstr "设置一个 buildbot 环境"
 
-#: ../jhbuild/commands/bot.py:66
+#: jhbuild/commands/bot.py:46
 msgid "start a buildbot slave server"
 msgstr "启动一个 buildbot 从服务器"
 
-#: ../jhbuild/commands/bot.py:69
+#: jhbuild/commands/bot.py:49
 msgid "stop a buildbot slave server"
 msgstr "停止一个 buildbot 从服务器"
 
-#: ../jhbuild/commands/bot.py:72
+#: jhbuild/commands/bot.py:52
 msgid "start a buildbot master server"
 msgstr "开始一个 buildbot 主服务器"
 
-#: ../jhbuild/commands/bot.py:75
+#: jhbuild/commands/bot.py:55
 msgid "reload a buildbot master server configuration"
 msgstr "重新载入一个 buildbot 主服务器配置"
 
-#: ../jhbuild/commands/bot.py:78
+#: jhbuild/commands/bot.py:58
 msgid "stop a buildbot master server"
 msgstr "停止一个 buildbot 主服务器"
 
-#: ../jhbuild/commands/bot.py:81
+#: jhbuild/commands/bot.py:61
 msgid "start as daemon"
 msgstr "以守护进程启动"
 
-#: ../jhbuild/commands/bot.py:84
+#: jhbuild/commands/bot.py:64
 msgid "PID file location"
 msgstr "PID 文件位置"
 
-#: ../jhbuild/commands/bot.py:87
+#: jhbuild/commands/bot.py:67
 msgid "log file location"
 msgstr "日志文件位置"
 
-#: ../jhbuild/commands/bot.py:90
+#: jhbuild/commands/bot.py:70
 msgid "directory with slave files (only with --start-server)"
 msgstr "从文件所在的目录(只与 --start-server 同时使用)"
 
-#: ../jhbuild/commands/bot.py:93
+#: jhbuild/commands/bot.py:73
 msgid "directory with buildbot work files (only with --start-server)"
 msgstr "buildbot 工作文件所在的目录(只与 --start-server 同时使用)"
 
-#: ../jhbuild/commands/bot.py:96
+#: jhbuild/commands/bot.py:76
 msgid "master cfg file location (only with --start-server)"
 msgstr "主配置文件位置(只与 --start-server 同时使用)"
 
-#: ../jhbuild/commands/bot.py:99
+#: jhbuild/commands/bot.py:79
 msgid "exec a buildbot step (internal use only)"
 msgstr "单步执行一个 buildbot(仅内部使用)"
 
-#: ../jhbuild/commands/bot.py:118
-msgid "buildbot and twisted not found, run jhbuild bot --setup"
-msgstr "buildbot 和 twisted 找不到,请运行 jhbuild bot --setup"
-
-#: ../jhbuild/commands/bot.py:295
-#, python-format
-msgid "No description for slave %s."
-msgstr "没有从 %s 的描述。"
+#: jhbuild/commands/bot.py:83
+msgid "buildbot commands are no longer supported"
+msgstr "不再支持 buildbot 命令"
 
-#. parse error
-#: ../jhbuild/commands/bot.py:300
-#, python-format
-msgid "Failed to parse slave config for %s."
-msgstr "解析 %s 的从配置失败。"
-
-#: ../jhbuild/commands/bot.py:807 ../jhbuild/commands/bot.py:815
-msgid "failed to get buildbot PID"
-msgstr "获取 buildbot PID 失败"
-
-#: ../jhbuild/commands/checkbranches.py:28
+#: jhbuild/commands/checkbranches.py:29
 msgid ""
 "Check modules in GNOME Git repository have the correct branch definition"
 msgstr "检查 GNOME Git 仓库中的模块是否有正确的分支定义"
 
-#: ../jhbuild/commands/checkbranches.py:65
+#: jhbuild/commands/checkbranches.py:66
 #, python-format
 msgid "%(module)s is missing branch definition for %(branch)s"
 msgstr "%(module)s 缺少 %(branch)s 的分支定义"
 
-#: ../jhbuild/commands/checkmodulesets.py:30
+#: jhbuild/commands/checkmodulesets.py:27
 msgid "Check if modules in JHBuild have the correct definition"
 msgstr "检查 JHBuild 中的模块是否有正确的定义"
 
-#: ../jhbuild/commands/checkmodulesets.py:43
+#: jhbuild/commands/checkmodulesets.py:40
 #, python-format
 msgid "%(module)s is unreachable (%(href)s)"
 msgstr "%(module)s 无法访问 (%(href)s)"
 
-#: ../jhbuild/commands/checkmodulesets.py:46
+#: jhbuild/commands/checkmodulesets.py:43
 #, python-format
 msgid "Cannot check %(module)s (%(href)s)"
 msgstr "无法检查 %(module)s (%(href)s)"
 
-#: ../jhbuild/commands/clean.py:29
+#: jhbuild/commands/clean.py:30
 msgid "Clean all modules"
 msgstr "清理所有模块"
 
-#: ../jhbuild/commands/extdeps.py:70
+#: jhbuild/commands/extdeps.py:70
 msgid "Report details on GNOME external dependencies"
 msgstr "报告 GNOME 外部依赖的详细信息"
 
-#: ../jhbuild/commands/extdeps.py:98
+#: jhbuild/commands/extdeps.py:98
 msgid "External deps for GNOME"
 msgstr "GNOME 的外部依赖"
 
-#: ../jhbuild/commands/extdeps.py:104
+#: jhbuild/commands/extdeps.py:104
 #, python-format
 msgid "External deps for GNOME %s"
 msgstr "GNOME %s 的外部依赖"
 
-#: ../jhbuild/commands/extdeps.py:138
+#: jhbuild/commands/extdeps.py:138
 msgid "patched"
 msgstr "已修补"
 
-#: ../jhbuild/commands/extdeps.py:142
+#: jhbuild/commands/extdeps.py:142
 #, python-format
 msgid "and %d others."
 msgstr "及其他 %d 个。"
 
-#: ../jhbuild/commands/goalreport.py:328
+#: jhbuild/commands/goalreport.py:333
 msgid "Report GNOME modules status wrt various goals"
 msgstr "报告与各种目标无关的 GNOME 模块状态"
 
-#: ../jhbuild/commands/goalreport.py:351
+#: jhbuild/commands/goalreport.py:356
 msgid "check to perform"
 msgstr "检查以执行"
 
-#: ../jhbuild/commands/gui.py:30
+#: jhbuild/commands/gui.py:26
 msgid "Build targets from a GUI app"
 msgstr "通过 GUI 程序构建目标"
 
-#: ../jhbuild/commands/info.py:36
+#: jhbuild/commands/info.py:40
 msgid "Display information about one or more modules"
 msgstr "显示有关一个或多个模块的信息"
 
-#: ../jhbuild/commands/info.py:51
+#: jhbuild/commands/info.py:49
+msgid ""
+"only display information for installed modules. This will not list system "
+"dependencies. If one or more module names are specified and at least one "
+"module is not installed, then the command will return 1."
+msgstr ""
+"仅为已安装模块显示信息。这样将不会列出系统依赖。如果指定了一个或更多模块名称"
+"且至少一个模块未安装,那么该命令将返回 1。"
+
+#: jhbuild/commands/info.py:66
 #, python-format
 msgid "unknown module %s"
 msgstr "未知模块 %s"
 
-#: ../jhbuild/commands/info.py:60
+#: jhbuild/commands/info.py:88
 msgid "Name:"
 msgstr "名称:"
 
-#: ../jhbuild/commands/info.py:61
+#: jhbuild/commands/info.py:89
 msgid "Module Set:"
 msgstr "模块集:"
 
-#: ../jhbuild/commands/info.py:62
+#: jhbuild/commands/info.py:90
 msgid "Type:"
 msgstr "类型:"
 
-#: ../jhbuild/commands/info.py:65 ../jhbuild/commands/info.py:69
+#: jhbuild/commands/info.py:93 jhbuild/commands/info.py:97
 msgid "Install version:"
 msgstr "安装版本:"
 
-#: ../jhbuild/commands/info.py:66 ../jhbuild/commands/info.py:70
+#: jhbuild/commands/info.py:94 jhbuild/commands/info.py:98
 msgid "Install date:"
 msgstr "安装日期:"
 
-#: ../jhbuild/commands/info.py:69 ../jhbuild/commands/info.py:70
+#: jhbuild/commands/info.py:97 jhbuild/commands/info.py:98
 msgid "not installed"
 msgstr "未安装"
 
-#: ../jhbuild/commands/info.py:75
+#: jhbuild/commands/info.py:103
 msgid "CVS Root:"
 msgstr "CVS 根:"
 
-#: ../jhbuild/commands/info.py:76
+#: jhbuild/commands/info.py:104
 msgid "CVS Module:"
 msgstr "CVS 模块:"
 
-#: ../jhbuild/commands/info.py:78
+#: jhbuild/commands/info.py:106
 msgid "CVS Revision:"
 msgstr "CVS 版本:"
 
-#: ../jhbuild/commands/info.py:80
+#: jhbuild/commands/info.py:108
 msgid "Subversion Module:"
 msgstr "Subversion 模块:"
 
-#: ../jhbuild/commands/info.py:82
+#: jhbuild/commands/info.py:110
 msgid "Darcs Archive:"
 msgstr "Darcs 档案:"
 
-#: ../jhbuild/commands/info.py:84
+#: jhbuild/commands/info.py:112
 msgid "Git Module:"
 msgstr "Git 模块:"
 
-#: ../jhbuild/commands/info.py:86
+#: jhbuild/commands/info.py:114
 msgid "Git Origin Module:"
 msgstr "Git 原始模块:"
 
-#: ../jhbuild/commands/info.py:90
+#: jhbuild/commands/info.py:118
 msgid "Git Branch:"
 msgstr "Git 分支:"
 
-#: ../jhbuild/commands/info.py:92
+#: jhbuild/commands/info.py:120
 msgid "Git Tag:"
 msgstr "Git 标签:"
 
-#: ../jhbuild/commands/info.py:94
+#: jhbuild/commands/info.py:122
 msgid "URL:"
 msgstr "URL:"
 
-#: ../jhbuild/commands/info.py:95
+#: jhbuild/commands/info.py:123
 msgid "Version:"
 msgstr "版本:"
 
-#: ../jhbuild/commands/info.py:98
+#: jhbuild/commands/info.py:126
 msgid "Tree-ID:"
-msgstr "树-标识"
+msgstr "树-标识:"
 
-#: ../jhbuild/commands/info.py:103
+#: jhbuild/commands/info.py:131
 msgid "Sourcedir:"
 msgstr "源目录"
 
-#: ../jhbuild/commands/info.py:109
+#: jhbuild/commands/info.py:137
 msgid "Requires:"
 msgstr "依赖于:"
 
-#: ../jhbuild/commands/info.py:113
+#: jhbuild/commands/info.py:141
 msgid "Required by:"
 msgstr "需要者:"
 
-#: ../jhbuild/commands/info.py:115
+#: jhbuild/commands/info.py:143
 msgid "Suggests:"
 msgstr "建议:"
 
-#: ../jhbuild/commands/info.py:117
+#: jhbuild/commands/info.py:145
 msgid "After:"
 msgstr "后于:"
 
-#: ../jhbuild/commands/info.py:121
+#: jhbuild/commands/info.py:149
 msgid "Before:"
 msgstr "先于:"
 
-#: ../jhbuild/commands/__init__.py:84 ../jhbuild/commands/sysdeps.py:49
+#: jhbuild/commands/__init__.py:95 jhbuild/commands/sysdeps.py:66
 #, python-format
 msgid "required=%s"
 msgstr "依赖=%s"
 
-#: ../jhbuild/commands/__init__.py:86 ../jhbuild/commands/sysdeps.py:51
+#: jhbuild/commands/__init__.py:97 jhbuild/commands/sysdeps.py:68
 #, 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
+#: jhbuild/commands/__init__.py:99 jhbuild/commands/sysdeps.py:70
 msgid ", "
 msgstr ", "
 
-#: ../jhbuild/commands/__init__.py:90 ../jhbuild/commands/sysdeps.py:55
+#: jhbuild/commands/__init__.py:101 jhbuild/commands/sysdeps.py:72
 #, python-format
 msgid "(%s)"
 msgstr "(%s)"
 
-#: ../jhbuild/commands/__init__.py:94 ../jhbuild/commands/sysdeps.py:80
+#: jhbuild/commands/__init__.py:105 jhbuild/commands/sysdeps.py:148
 msgid "Required packages:"
 msgstr "依赖的包:"
 
-#: ../jhbuild/commands/__init__.py:95 ../jhbuild/commands/sysdeps.py:81
-#: ../jhbuild/commands/sysdeps.py:124
+#: jhbuild/commands/__init__.py:106 jhbuild/commands/sysdeps.py:149
+#: jhbuild/commands/sysdeps.py:180
 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
+#: jhbuild/commands/__init__.py:116 jhbuild/commands/__init__.py:128
+#: jhbuild/commands/sysdeps.py:158 jhbuild/commands/sysdeps.py:174
+#: jhbuild/commands/sysdeps.py:189 jhbuild/commands/sysdeps.py:202
 msgid "    (none)"
 msgstr "    (无)"
 
-#: ../jhbuild/commands/__init__.py:107 ../jhbuild/commands/sysdeps.py:92
-#: ../jhbuild/commands/sysdeps.py:135
+#: jhbuild/commands/__init__.py:118 jhbuild/commands/sysdeps.py:160
+#: jhbuild/commands/sysdeps.py:191
 msgid "  No matching system package installed:"
 msgstr "  没有安装匹配的系统包:"
 
-#: ../jhbuild/commands/__init__.py:134
+#: jhbuild/commands/__init__.py:142
 msgid "JHBuild commands are:"
 msgstr "JHBuild 命令有:"
 
-#: ../jhbuild/commands/__init__.py:140
+#: jhbuild/commands/__init__.py:148
 msgid "For more information run \"jhbuild <command> --help\""
 msgstr "要获得更多信息,请运行 \"jhbuild <command> --help\""
 
-#: ../jhbuild/commands/__init__.py:149
+#: jhbuild/commands/__init__.py:157
 msgid "Information about available JHBuild commands"
 msgstr "可用 JHBuild 命令的有关信息"
 
-#: ../jhbuild/commands/__init__.py:176
+#: jhbuild/commands/__init__.py:181
 #, python-format
 msgid "no such command (did you mean \"jhbuild build %s\"?)"
 msgstr "没有这样的命令(您指的是“jhbuild build %s”吗?)"
 
-#: ../jhbuild/commands/__init__.py:178
+#: jhbuild/commands/__init__.py:183
 #, python-format
 msgid "no such command (did you mean \"jhbuild run %s\"?)"
 msgstr "没有这样的命令(您指的是“jhbuild run %s”吗?)"
 
-#: ../jhbuild/commands/make.py:33
+#: jhbuild/commands/make.py:31
 msgid "Compile and install the module for the current directory"
 msgstr "针对当前目录编译和安装该模块"
 
-#: ../jhbuild/commands/make.py:78
+#: jhbuild/commands/make.py:76
 #, python-format
 msgid "The current directory is not in the checkout root %r"
 msgstr "当前目录不在检出根位置 %r 下"
 
-#: ../jhbuild/commands/make.py:90
+#: jhbuild/commands/make.py:88
 #, python-format
 msgid "No module matching current directory %r in the moduleset"
 msgstr "模块集中没有与当前目录 %r 匹配的模块"
 
-#: ../jhbuild/commands/rdepends.py:28
+#: jhbuild/commands/rdepends.py:29
 msgid "Display reverse-dependencies of a module"
 msgstr "显示模块的反向依赖"
 
-#: ../jhbuild/commands/rdepends.py:31
+#: jhbuild/commands/rdepends.py:32
 msgid "[ module ]"
 msgstr "[ 模块 ]"
 
-#: ../jhbuild/commands/rdepends.py:37
+#: jhbuild/commands/rdepends.py:38
 msgid "display dependency path next to modules"
 msgstr "在模块旁显示依赖路径"
 
-#: ../jhbuild/commands/rdepends.py:40
+#: jhbuild/commands/rdepends.py:41
 msgid "limit display to modules directly depending on given module"
 msgstr "只显示直接依赖于给定模块的模块"
 
-#: ../jhbuild/commands/sanitycheck.py:46
+#: jhbuild/commands/sanitycheck.py:36
 msgid "Check that required support tools are available"
 msgstr "检查需要的工具是否可用"
 
-#: ../jhbuild/commands/sanitycheck.py:53
+#: jhbuild/commands/sanitycheck.py:43
 msgid "no extra arguments expected"
 msgstr "不应有额外参数"
 
-#: ../jhbuild/commands/sanitycheck.py:65
+#: jhbuild/commands/sanitycheck.py:55
 #, python-format
 msgid "checkout root (%s) is not writable"
 msgstr "检出根位置(%s) 不可写"
 
-#: ../jhbuild/commands/sanitycheck.py:68
+#: jhbuild/commands/sanitycheck.py:58
 #, python-format
 msgid "install prefix (%s) is not writable"
 msgstr "install 的前缀位置(%s) 不可写"
 
-#: ../jhbuild/commands/sanitycheck.py:75 ../jhbuild/commands/sanitycheck.py:78
-#: ../jhbuild/commands/sanitycheck.py:81 ../jhbuild/commands/sanitycheck.py:85
-#: ../jhbuild/commands/sanitycheck.py:88
-#: ../jhbuild/commands/sanitycheck.py:120
-#: ../jhbuild/commands/sanitycheck.py:132
-#: ../jhbuild/commands/sanitycheck.py:141
-#: ../jhbuild/commands/sanitycheck.py:147
-#: ../jhbuild/commands/sanitycheck.py:149
-#: ../jhbuild/commands/sanitycheck.py:151 ../jhbuild/modtypes/cmake.py:82
-#: ../jhbuild/versioncontrol/bzr.py:215 ../jhbuild/versioncontrol/cvs.py:297
-#: ../jhbuild/versioncontrol/darcs.py:110
-#: ../jhbuild/versioncontrol/fossil.py:107
-#: ../jhbuild/versioncontrol/git.py:457 ../jhbuild/versioncontrol/hg.py:103
-#: ../jhbuild/versioncontrol/mtn.py:142 ../jhbuild/versioncontrol/svn.py:313
+#: jhbuild/commands/sanitycheck.py:65 jhbuild/commands/sanitycheck.py:68
+#: jhbuild/commands/sanitycheck.py:71 jhbuild/commands/sanitycheck.py:75
+#: jhbuild/commands/sanitycheck.py:78 jhbuild/commands/sanitycheck.py:115
+#: jhbuild/commands/sanitycheck.py:124 jhbuild/commands/sanitycheck.py:130
+#: jhbuild/commands/sanitycheck.py:132 jhbuild/commands/sanitycheck.py:134
+#: jhbuild/commands/sanitycheck.py:141 jhbuild/commands/sanitycheck.py:146
+#: jhbuild/modtypes/cmake.py:96 jhbuild/modtypes/meson.py:94
+#: jhbuild/versioncontrol/bzr.py:219 jhbuild/versioncontrol/cvs.py:302
+#: jhbuild/versioncontrol/darcs.py:105 jhbuild/versioncontrol/fossil.py:103
+#: jhbuild/versioncontrol/git.py:490 jhbuild/versioncontrol/hg.py:105
+#: jhbuild/versioncontrol/mtn.py:142 jhbuild/versioncontrol/svn.py:322
 #, python-format
 msgid "%s not found"
 msgstr "找不到 %s"
 
-#: ../jhbuild/commands/sanitycheck.py:99
-#| msgid ""
-#| "Could not find %s in XML catalog (usually part of package 'docbook-xsl')"
+#: jhbuild/commands/sanitycheck.py:89
 msgid ""
 "Could not find XML catalog (usually part of the package 'libxml2-utils')"
 msgstr "找不到 XML 目录(通常属于包“libxml2-utils”)"
 
-#: ../jhbuild/commands/sanitycheck.py:109
+#: jhbuild/commands/sanitycheck.py:99
 #, python-format
 msgid ""
 "Could not find %s in XML catalog (usually part of package 'docbook-xsl')"
 msgstr "在 XML 目录中找不到 %s (通常属于包“docbook-xsl”)"
 
-#: ../jhbuild/commands/sanitycheck.py:116
+#: jhbuild/commands/sanitycheck.py:106
 #, python-format
 msgid ""
 "Could not find the Perl module %s (usually part of package 'libxml-parser-"
 "perl' or 'perl-XML-Parser')"
-msgstr "找不到 Perl 模块 %s(通常是包“libxml-parser-perl”或“perl-XML-Parser”的一部分。"
-
-#: ../jhbuild/commands/sanitycheck.py:124
-#, python-format
-#| msgid ""
-#| "Could not find %s in XML catalog (usually part of package 'docbook-xsl')"
-msgid "%s not found (usually part of the package 'subversion')"
-msgstr "找不到 %s (通常属于包“subversion”)"
+msgstr ""
+"找不到 Perl 模块 %s(通常是包“libxml-parser-perl”或“perl-XML-Parser”的一部分。"
 
-#: ../jhbuild/commands/sanitycheck.py:128
+#: jhbuild/commands/sanitycheck.py:111
 msgid "curl or wget not found"
 msgstr "curl 或 wget 未找到"
 
-#: ../jhbuild/commands/sanitycheck.py:137
+#: jhbuild/commands/sanitycheck.py:120
 msgid "Installed git program is not the right git"
 msgstr "安装的 git 程序不是正确的 git 程序"
 
-#: ../jhbuild/commands/sanitycheck.py:143
+#: jhbuild/commands/sanitycheck.py:126
 msgid "Could not check git program"
 msgstr "无法检查 git 程序"
 
-#: ../jhbuild/commands/sanitycheck.py:161
+#: jhbuild/commands/sanitycheck.py:156
 #, python-format
 msgid "aclocal can't see %s macros"
 msgstr "aclocal 看不到 %s 宏"
 
-#: ../jhbuild/commands/sanitycheck.py:166
+#: jhbuild/commands/sanitycheck.py:161
 #, python-format
 msgid ""
 "Please copy the lacking macros (%(macros)s) in one of the following paths: "
 "%(path)s"
 msgstr "请从以下路径复制缺少的宏 (%(macros)s):%(path)s"
 
-#: ../jhbuild/commands/snapshot.py:34
+#: jhbuild/commands/snapshot.py:31
 msgid "Print out a moduleset for the exact versions that are checked out"
 msgstr "打印完全对应于所检出版本的模块集"
 
-#: ../jhbuild/commands/sysdeps.py:32
+#: jhbuild/commands/sysdeps.py:38
 msgid "Check and install tarball dependencies using system packages"
 msgstr "使用系统包检查并安装档案包依赖"
 
-#: ../jhbuild/commands/sysdeps.py:40
+#: jhbuild/commands/sysdeps.py:46
+msgid "Machine readable list of missing sysdeps"
+msgstr "机器可读的系统依赖缺失列表"
+
+#: jhbuild/commands/sysdeps.py:49
+msgid "Machine readable list of all sysdeps"
+msgstr "机器可读的全部系统依赖列表"
+
+#: jhbuild/commands/sysdeps.py:52
 msgid "Install pkg-config modules via system"
 msgstr "通过系统安装 pkg-config 模块"
 
-#: ../jhbuild/commands/sysdeps.py:69
+#: jhbuild/commands/sysdeps.py:56
+msgid ""
+"assume yes/the default answer to interactive questions during installation "
+"of system dependencies"
+msgstr "默认 yes/安装系统依赖期间交互式问题的默认答案"
+
+#: jhbuild/commands/sysdeps.py:137
 msgid "System installed packages which are new enough:"
 msgstr "系统中已安装的、足够新的包:"
 
-#: ../jhbuild/commands/sysdeps.py:78 ../jhbuild/commands/sysdeps.py:148
+#: jhbuild/commands/sysdeps.py:146
 msgid "  (none)"
 msgstr "  (无)"
 
-#: ../jhbuild/commands/sysdeps.py:123
+#: jhbuild/commands/sysdeps.py:179
 msgid "Optional packages: (JHBuild will build the missing packages)"
 msgstr "可选包:(JHBuild 会构建缺少的包)"
 
-#: ../jhbuild/commands/sysdeps.py:156
+#: jhbuild/commands/sysdeps.py:210
 #, python-format
 msgid ""
 "%(cmd)s is required to install packages on this system. Please install "
 "%(cmd)s."
 msgstr "在此系统上安装包需要 %(cmd)s。请安装 %(cmd)s"
 
-#: ../jhbuild/commands/sysdeps.py:161
+#: jhbuild/commands/sysdeps.py:215
 msgid "Don't know how to install packages on this system"
 msgstr "不知道如何在此系统上安装包"
 
-#: ../jhbuild/commands/sysdeps.py:165
+#: jhbuild/commands/sysdeps.py:218
 #, python-format
 msgid "No uninstalled system dependencies to install for modules: %r"
 msgstr "没有要为模块安装的、已卸载的系统依赖:%r"
 
-#: ../jhbuild/commands/sysdeps.py:167
+#: jhbuild/commands/sysdeps.py:220
 #, python-format
 msgid "Installing dependencies on system: %s"
 msgstr "在系统上安装依赖:%s"
 
-#: ../jhbuild/commands/tinderbox.py:29
+#: jhbuild/commands/tinderbox.py:29
 msgid "Build modules non-interactively and store build logs"
 msgstr "以非交互方式构建模块并保存构建日志"
 
-#: ../jhbuild/commands/tinderbox.py:50
+#: jhbuild/commands/tinderbox.py:53
 msgid "directory to store build logs in"
 msgstr "保存构建日志的目录"
 
-#: ../jhbuild/commands/tinderbox.py:82
+#: jhbuild/commands/tinderbox.py:85
 msgid "output directory for tinderbox build not specified"
 msgstr "没有指定 tinderbox 构建的输出目录"
 
-#: ../jhbuild/commands/twoninetynine.py:161
+#: jhbuild/commands/twoninetynine.py:162
 msgid "Report GNOME modules status wrt 3.0 goals"
 msgstr "报告与 3.0 目标无关的 GNOME 模块状态"
 
-#: ../jhbuild/commands/uninstall.py:31
+#: jhbuild/commands/uninstall.py:31
 msgid "Uninstall all modules"
 msgstr "卸载所有模块"
 
-#: ../jhbuild/commands/uninstall.py:48
+#: 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
+#: jhbuild/commands/uninstall.py:64
 #, python-format
 msgid "Module %(mod)r is not installed"
 msgstr "模块 %(mod)r 未安装"
 
-#: ../jhbuild/config.py:180
+#: jhbuild/config.py:91
 #, python-format
 msgid "Invalid condition set modifier: '%s'.  Must start with '+' or '-'."
 msgstr "无效的条件集修饰符“%s”。必须以“+”或“-”开头。"
 
-#: ../jhbuild/config.py:206
-msgid ""
-"JHBuild start script has been installed in ~/.local/bin/jhbuild, you should "
-"remove the old version that is still in ~/bin/ (or make it a symlink to ~/."
-"local/bin/jhbuild)"
-msgstr ""
-"JHBuild 启动脚本安装在 ~/.local/bin/jhbuild,您应该移除仍在 ~/bin/ 中的旧版本"
-"(或将它作为 ~/.local/bin/jhbuild 的符号链接)"
-
-#: ../jhbuild/config.py:218
-msgid ""
-"Obsolete JHBuild start script, make sure it is removed then do run 'make "
-"install'"
-msgstr "废弃的 JHBuild 启动脚本,请确信它已经删除,然后运行 'make install'"
-
-#: ../jhbuild/config.py:226
+#: jhbuild/config.py:114
 msgid "could not load config defaults"
 msgstr "无法载入默认配置"
 
-#: ../jhbuild/config.py:237
+#: jhbuild/config.py:123
 #, python-format
 msgid "could not load config file, %s is missing"
 msgstr "无法载入配置文件,%s 缺失。"
 
-#: ../jhbuild/config.py:243
+#: jhbuild/config.py:129
 #, 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:292
+#: jhbuild/config.py:188
 #, python-format
 msgid "Could not include config file (%s)"
 msgstr "无法包含配置文件(%s)"
 
-#: ../jhbuild/config.py:306
+#: jhbuild/config.py:202
 msgid "could not load config file"
 msgstr "无法载入配置文件"
 
-#: ../jhbuild/config.py:320
+#: jhbuild/config.py:216
 #, python-format
 msgid "unknown keys defined in configuration file: %s"
 msgstr "配置文件中定义的键为未知:%s"
 
-#: ../jhbuild/config.py:327
+#: jhbuild/config.py:223
 #, python-format
 msgid ""
 "the \"%s\" configuration variable is deprecated, you should use "
 "\"repos['gnome.org']\"."
 msgstr "配置变量 %s 已经废弃,您应该使用 repos['gnome.org']。"
 
-#: ../jhbuild/config.py:332 ../jhbuild/config.py:337
+#: jhbuild/config.py:228 jhbuild/config.py:233
 #, python-format
 msgid ""
 "the \"%s\" configuration variable is deprecated, you should use \"repos\"."
 msgstr "配置变量 %s 已经废弃,您应该使用 repos。"
 
-#: ../jhbuild/config.py:371
+#: jhbuild/config.py:267
 msgid "invalid checkout mode"
 msgstr "无效的检出模式"
 
-#: ../jhbuild/config.py:375
+#: jhbuild/config.py:271
 #, python-format
 msgid "invalid checkout mode (module: %s)"
 msgstr "无效的检出模式(模块:%s)"
 
-#: ../jhbuild/config.py:377
+#: jhbuild/config.py:273
 msgid "copy mode requires copy_dir to be set"
 msgstr "复制模式需要设置 copy_dir"
 
-#: ../jhbuild/config.py:382
+#: jhbuild/config.py:278
 #, python-format
 msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
 msgstr "模块集目录(%s) 找不到,禁用 use_local_modulesets"
 
-#: ../jhbuild/config.py:388 ../jhbuild/config.py:390 ../jhbuild/config.py:392
-#: ../jhbuild/config.py:394 ../jhbuild/config.py:397
+#: jhbuild/config.py:284 jhbuild/config.py:286 jhbuild/config.py:288
+#: jhbuild/config.py:290 jhbuild/config.py:293
 #, python-format
 msgid "%s must be an absolute path"
 msgstr "%s 必须是绝对路径"
 
-#: ../jhbuild/config.py:410
+#: jhbuild/config.py:304
 #, python-format
 msgid "install prefix (%s) can not be created"
 msgstr "安装前缀(%s)无法创建"
 
-#: ../jhbuild/config.py:417
+#: jhbuild/config.py:311
 #, python-format
 msgid "working directory (%s) can not be created"
 msgstr "无法创建工作目录(%s)"
 
-#: ../jhbuild/config.py:533
-#, python-format
-msgid "Can't create %s directory"
-msgstr "无法创建 %s 目录"
-
-#: ../jhbuild/config.py:564
-#, python-format
+#: jhbuild/config.py:314
 msgid ""
-"Unable to determine python version using the PYTHON environment variable "
-"(%s). Using default \"%s\""
-msgstr "无法通过 PYTHON 环境变量(%s)检测 python 版本。将使用默认的“%s“"
-
-#: ../jhbuild/config.py:579
-#, python-format
-msgid ""
-"Unable to determine python site-packages directory using the PYTHON "
-"environment variable (%s). Using default \"%s\""
+"Your install prefix contains a 'lib64' directory, which is no longer "
+"supported by jhbuild.  This is likely the result of a previous build with an "
+"older version of jhbuild or of a broken package.  Please consider removing "
+"your install and checkout directories and starting fresh."
 msgstr ""
-"无法通过 PYTHON 环境变量(%s)检测 python site-packages 目录。将使用默认的“%s”"
-
-#: ../jhbuild/config.py:626
-#, python-format
-msgid "Could not create GConf config (%s)"
-msgstr "无法创建 GConf 配置(%s)"
+"您的安装前缀包含了不再被 jhbuild 支持的“lib64”目录。这可能是之前用旧版本 "
+"jhbuild 构建或已损害软件包的结果。请考虑移除您的安装且检查目录并重新开始。"
 
-#: ../jhbuild/config.py:718
+#: jhbuild/config.py:392
 msgid "Failed to parse 'min_age' relative time"
 msgstr "解析“min_age”相对时间失败"
 
-#: ../jhbuild/config.py:732
+#: jhbuild/config.py:407
 msgid ""
 "quiet mode has been disabled because the Python curses module is missing."
 msgstr "安静模式已禁用,因为 Python curses 模块缺失。"
 
-#: ../jhbuild.desktop.in.in.h:1
+#: jhbuild.desktop.in.in:4
 msgid "GNOME Build Tool"
 msgstr "GNOME 构建工具"
 
-#: ../jhbuild.desktop.in.in.h:2
+#: jhbuild.desktop.in.in:5
 msgid "Build GNOME modules"
 msgstr "构建 GNOME 模块"
 
-#: ../jhbuild/frontends/autobuild.py:72
+#: jhbuild/frontends/autobuild.py:78
 #, python-format
 msgid "Server Error, retrying in %d seconds"
 msgstr "服务器错误,将在 %d 秒后重试"
 
-#: ../jhbuild/frontends/autobuild.py:76
+#: jhbuild/frontends/autobuild.py:82
 msgid "Server Error, aborting"
 msgstr "服务器错误,中止"
 
-#: ../jhbuild/frontends/autobuild.py:180
+#: jhbuild/frontends/autobuild.py:188
 #, python-format
 msgid "Error: %s"
 msgstr "错误:%s"
 
-#: ../jhbuild/frontends/autobuild.py:185 ../jhbuild/utils/cmds.py:66
+#: jhbuild/frontends/autobuild.py:193 jhbuild/utils/cmds.py:68
 #, python-format
 msgid "Error running %s"
 msgstr "运行 %s 出错"
 
-#: ../jhbuild/frontends/autobuild.py:212
+#: jhbuild/frontends/autobuild.py:220
 msgid "ERROR: Wrong credentials, please check username/password"
 msgstr "错误:证书错误,请检查用户名/密码"
 
-#: ../jhbuild/frontends/autobuild.py:218
+#: jhbuild/frontends/autobuild.py:226
 #, python-format
 msgid "Starting Build #%s"
 msgstr "开始构建 #%s"
 
-#: ../jhbuild/frontends/autobuild.py:232
+#: jhbuild/frontends/autobuild.py:240
 #, python-format
 msgid "**** Starting module %s ****"
 msgstr "**** 正在启动模块 %s ****"
 
-#: ../jhbuild/frontends/buildscript.py:42
+#: jhbuild/frontends/buildscript.py:44
 #, python-format
 msgid "install prefix (%s) must be writable"
 msgstr "安装前缀(%s) 必须可写"
 
-#: ../jhbuild/frontends/buildscript.py:49
+#: jhbuild/frontends/buildscript.py:51
 #, python-format
 msgid "checkout root (%s) can not be created"
 msgstr "检出根位置(%s) 无法创建"
 
-#: ../jhbuild/frontends/buildscript.py:51
+#: jhbuild/frontends/buildscript.py:53
 #, python-format
 msgid "checkout root (%s) must be writable"
 msgstr "检出根位置(%s) 必须可写"
 
-#: ../jhbuild/frontends/buildscript.py:58
+#: jhbuild/frontends/buildscript.py:60
 #, python-format
 msgid "checkout copy dir (%s) can not be created"
 msgstr "检出复制目录(%s) 无法创建"
 
-#: ../jhbuild/frontends/buildscript.py:60
+#: jhbuild/frontends/buildscript.py:62
 #, python-format
 msgid "checkout copy dir (%s) must be writable"
 msgstr "检出复制目录(%s) 必须可写"
 
-#: ../jhbuild/frontends/buildscript.py:110
+#: jhbuild/frontends/buildscript.py:69
+#, python-format
+msgid "checkout export dir (%s) can not be created"
+msgstr "检出导出目录(%s) 无法创建"
+
+#: jhbuild/frontends/buildscript.py:71
+#, python-format
+msgid "checkout export dir (%s) must be writable"
+msgstr "检出导出目录(%s) 必须可写"
+
+#: jhbuild/frontends/buildscript.py:120
 #, python-format
 msgid "Skipping %s (installed recently)"
 msgstr "跳过 %s(为最近安装)"
 
-#: ../jhbuild/frontends/buildscript.py:119
+#: jhbuild/frontends/buildscript.py:129
 #, python-format
 msgid "module %(mod)s will be built even though %(dep)s failed"
 msgstr "尽管 %(dep)s 模块构建失败,仍将构建 %(mod)s 模块"
 
-#: ../jhbuild/frontends/buildscript.py:122
+#: jhbuild/frontends/buildscript.py:132
 #, python-format
 msgid "module %(mod)s not built due to non buildable %(dep)s"
 msgstr "由于 %(dep)s 无法构建,未构建 %(mod)s 模块"
 
-#: ../jhbuild/frontends/buildscript.py:248
+#: jhbuild/frontends/buildscript.py:251
+#, python-format
+msgid "Ignoring uninstalled package: %s"
+msgstr "忽略已卸载软件包:%s"
+
+#: jhbuild/frontends/buildscript.py:270
 #, python-format
 msgid "Running post-installation trigger script: %r"
 msgstr "运行安装后的触发器脚本:%r"
 
-#: ../jhbuild/frontends/buildscript.py:256 ../jhbuild/frontends/gtkui.py:596
+#: jhbuild/frontends/buildscript.py:278 jhbuild/frontends/gtkui.py:605
 #, python-format
 msgid "%(command)s returned with an error code (%(rc)s)"
 msgstr "%(command)s 返回了错误代码(%(rc)s)"
 
-#: ../jhbuild/frontends/gtkui.py:99
+#: jhbuild/frontends/gtkui.py:99
 msgid "Others..."
 msgstr "其他..."
 
-#: ../jhbuild/frontends/gtkui.py:140
+#: jhbuild/frontends/gtkui.py:140
 msgid "Choose Module:"
 msgstr "选择模块:"
 
-#: ../jhbuild/frontends/gtkui.py:160
+#: jhbuild/frontends/gtkui.py:160
 msgid "Build Progress"
 msgstr "构建过程"
 
-#: ../jhbuild/frontends/gtkui.py:163
+#: jhbuild/frontends/gtkui.py:163
 msgid "Terminal"
 msgstr "终端"
 
 #. Translators: This is a button label (to start build)
-#: ../jhbuild/frontends/gtkui.py:203
+#: jhbuild/frontends/gtkui.py:203
 msgid "Start"
 msgstr "开始"
 
-#: ../jhbuild/frontends/gtkui.py:348
+#: jhbuild/frontends/gtkui.py:348
 msgid "Build Completed"
 msgstr "构建完成"
 
-#: ../jhbuild/frontends/gtkui.py:377 ../jhbuild/frontends/terminal.py:286
+#: jhbuild/frontends/gtkui.py:377 jhbuild/frontends/terminal.py:316
 #, python-format
 msgid "Error during phase %(phase)s of %(module)s"
 msgstr "在 %(module)s 的 %(phase)s 阶段出错"
 
-#: ../jhbuild/frontends/gtkui.py:394
+#: jhbuild/frontends/gtkui.py:394
 msgid "Pick an Action"
 msgstr "选择一项操作"
 
-#: ../jhbuild/frontends/gtkui.py:397 ../jhbuild/frontends/terminal.py:313
+#: jhbuild/frontends/gtkui.py:397 jhbuild/frontends/terminal.py:343
 #, python-format
 msgid "Rerun phase %s"
 msgstr "重做 %s 阶段"
 
-#: ../jhbuild/frontends/gtkui.py:400 ../jhbuild/frontends/terminal.py:315
+#: jhbuild/frontends/gtkui.py:400 jhbuild/frontends/terminal.py:345
 #, python-format
 msgid "Ignore error and continue to %s"
 msgstr "忽略错误并继续 %s"
 
-#: ../jhbuild/frontends/gtkui.py:403 ../jhbuild/frontends/terminal.py:317
+#: jhbuild/frontends/gtkui.py:403 jhbuild/frontends/terminal.py:347
 msgid "Ignore error and continue to next module"
 msgstr "忽略错误并继续下个模块"
 
-#: ../jhbuild/frontends/gtkui.py:405 ../jhbuild/frontends/terminal.py:318
+#: jhbuild/frontends/gtkui.py:405 jhbuild/frontends/terminal.py:348
 msgid "Give up on module"
 msgstr "放弃模块"
 
-#: ../jhbuild/frontends/gtkui.py:412 ../jhbuild/frontends/terminal.py:327
+#: jhbuild/frontends/gtkui.py:412 jhbuild/frontends/terminal.py:357
 #, python-format
 msgid "Go to phase \"%s\""
 msgstr "转到 \"%s\" 阶段"
 
-#: ../jhbuild/frontends/gtkui.py:415
+#: jhbuild/frontends/gtkui.py:415
 msgid "Open Terminal"
 msgstr "打开终端"
 
-#: ../jhbuild/frontends/gtkui.py:591
+#: jhbuild/frontends/gtkui.py:600
 #, python-format
 msgid "%(command)s died with signal %(rc)s"
 msgstr "%(command)s 以 %(rc)s 信号死亡"
 
-#: ../jhbuild/frontends/gtkui.py:646
+#: jhbuild/frontends/gtkui.py:655
 msgid "Module"
 msgstr "模块"
 
-#: ../jhbuild/frontends/gtkui.py:665
+#: jhbuild/frontends/gtkui.py:674
 msgid "Start At"
 msgstr "开始于"
 
-#: ../jhbuild/frontends/gtkui.py:708
+#: jhbuild/frontends/gtkui.py:722
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../jhbuild/frontends/gtkui.py:720
+#: jhbuild/frontends/gtkui.py:734
 msgid "Disable network access"
 msgstr "禁用网络访问"
 
-#: ../jhbuild/frontends/gtkui.py:721
+#: jhbuild/frontends/gtkui.py:735
 msgid "Always run autogen.sh"
 msgstr "总是运行 autogen.sh"
 
-#: ../jhbuild/frontends/gtkui.py:722
+#: jhbuild/frontends/gtkui.py:736
 msgid "Don't poison modules on failure"
 msgstr "失败时不要污染模块"
 
-#: ../jhbuild/frontends/terminal.py:180 ../jhbuild/frontends/tinderbox.py:251
-#: ../jhbuild/frontends/tinderbox.py:384 ../jhbuild/frontends/tinderbox.py:439
+#: jhbuild/frontends/terminal.py:207 jhbuild/frontends/tinderbox.py:213
+#: jhbuild/frontends/tinderbox.py:344 jhbuild/frontends/tinderbox.py:399
 #, python-format
 msgid "%(configuration_variable)s invalid key %(key)s"
 msgstr "%(configuration_variable)s 有无效的键 %(key)s"
 
-#: ../jhbuild/frontends/terminal.py:236
+#: jhbuild/frontends/terminal.py:265
 msgid ""
 "\n"
 "Conflicts during checkout:\n"
@@ -1166,163 +1164,175 @@ msgstr ""
 "检出时的冲突:\n"
 
 #. it could happen on a really badly-timed ctrl-c (see bug 551641)
-#: ../jhbuild/frontends/terminal.py:259 ../jhbuild/frontends/terminal.py:263
+#: jhbuild/frontends/terminal.py:289 jhbuild/frontends/terminal.py:293
 #, python-format
 msgid "########## Error running %s"
 msgstr "########## 运行 %s 出错"
 
-#: ../jhbuild/frontends/terminal.py:277
+#: jhbuild/frontends/terminal.py:307
 msgid "success"
 msgstr "成功"
 
-#: ../jhbuild/frontends/terminal.py:279
+#: jhbuild/frontends/terminal.py:309
 msgid "the following modules were not built"
 msgstr "以下模块未构建"
 
-#: ../jhbuild/frontends/terminal.py:301 ../jhbuild/frontends/tinderbox.py:415
+#: jhbuild/frontends/terminal.py:331 jhbuild/frontends/tinderbox.py:375
 msgid "automatically retrying configure"
 msgstr "自动重试配置"
 
-#: ../jhbuild/frontends/terminal.py:305 ../jhbuild/frontends/tinderbox.py:420
+#: jhbuild/frontends/terminal.py:335 jhbuild/frontends/tinderbox.py:380
 msgid "automatically forcing a fresh checkout"
 msgstr "自动强制一次刷新检出"
 
-#: ../jhbuild/frontends/terminal.py:319
+#: jhbuild/frontends/terminal.py:349
 msgid "Start shell"
 msgstr "启动 shell"
 
-#: ../jhbuild/frontends/terminal.py:320
+#: jhbuild/frontends/terminal.py:350
 msgid "Reload configuration"
 msgstr "重新载入配置"
 
-#: ../jhbuild/frontends/terminal.py:329
+#: jhbuild/frontends/terminal.py:359
 msgid "choice: "
 msgstr "选项:"
 
-#: ../jhbuild/frontends/terminal.py:344
+#: jhbuild/frontends/terminal.py:382
 msgid "exit shell to continue with build"
 msgstr "退出 shell 以继续构建"
 
-#: ../jhbuild/frontends/terminal.py:354
+#: jhbuild/frontends/terminal.py:397
 msgid "invalid choice"
 msgstr "无效选择"
 
-#: ../jhbuild/frontends/terminal.py:362
+#: jhbuild/frontends/terminal.py:405
 msgid "Type \"yes\" to confirm the action: "
 msgstr "输入 yes 以确认操作:"
 
-#: ../jhbuild/frontends/terminal.py:365
+#: jhbuild/frontends/terminal.py:410
 msgid "yes"
 msgstr "yes"
 
-#: ../jhbuild/main.py:98
+#: jhbuild/main.py:60
 msgid "You should not run jhbuild as root.\n"
 msgstr "您不应该以 root 身份运行 jhbuild。\n"
 
-#: ../jhbuild/main.py:106
+#: jhbuild/main.py:68
 msgid "%prog [ -f config ] command [ options ... ]"
 msgstr "%prog [ -f config ] 命令 [ 选项 ... ]"
 
-#: ../jhbuild/main.py:108
+#: jhbuild/main.py:70
 msgid ""
 "Build a set of modules from diverse repositories in correct dependency order "
 "(such as GNOME)."
 msgstr "以正确的顺序构建源自不同仓库的一组模块(如 GNOME)"
 
-#: ../jhbuild/main.py:113
+#: jhbuild/main.py:75
 msgid "Display this help and exit"
 msgstr "显示此帮助并退出"
 
-#: ../jhbuild/main.py:120
+#: jhbuild/main.py:82
 msgid "use a non default configuration file"
 msgstr "使用非默认的配置文件"
 
-#: ../jhbuild/main.py:123
+#: jhbuild/main.py:85
 msgid "use a non default module set"
 msgstr "使用非默认的模块集"
 
-#: ../jhbuild/main.py:126
+#: jhbuild/main.py:88
 msgid "do not prompt for input"
 msgstr "不要提示输入"
 
-#: ../jhbuild/main.py:129
+#: jhbuild/main.py:91
+msgid "exit immediately when the build fails"
+msgstr "构建失败时立即退出"
+
+#: jhbuild/main.py:94
 msgid "modify the condition set"
 msgstr "修改条件集"
 
-#: ../jhbuild/main.py:160
+#: jhbuild/main.py:129
 msgid "Interrupted"
 msgstr "被打断"
 
-#: ../jhbuild/main.py:163
+#: jhbuild/main.py:132
 msgid "EOF"
 msgstr "EOF"
 
-#: ../jhbuild/modtypes/autotools.py:228 ../jhbuild/modtypes/cmake.py:75
-#: ../jhbuild/modtypes/linux.py:109 ../jhbuild/modtypes/waf.py:76
+#: jhbuild/modtypes/autotools.py:221 jhbuild/modtypes/cmake.py:82
+#: jhbuild/modtypes/linux.py:110 jhbuild/modtypes/meson.py:84
+#: jhbuild/modtypes/waf.py:75
 msgid "Configuring"
 msgstr "正在配置"
 
-#: ../jhbuild/modtypes/autotools.py:268 ../jhbuild/modtypes/cmake.py:102
-#: ../jhbuild/modtypes/linux.py:141 ../jhbuild/modtypes/waf.py:87
+#: jhbuild/modtypes/autotools.py:252 jhbuild/modtypes/cmake.py:113
+#: jhbuild/modtypes/linux.py:142 jhbuild/modtypes/meson.py:122
+#: jhbuild/modtypes/waf.py:84
 msgid "Cleaning"
 msgstr "正在清理"
 
-#: ../jhbuild/modtypes/autotools.py:277 ../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
+#: jhbuild/modtypes/autotools.py:258 jhbuild/modtypes/cmake.py:122
+#: jhbuild/modtypes/distutils.py:58 jhbuild/modtypes/linux.py:155
+#: jhbuild/modtypes/meson.py:128 jhbuild/modtypes/perl.py:52
+#: jhbuild/modtypes/waf.py:92
 msgid "Building"
 msgstr "正在构建"
 
-#: ../jhbuild/modtypes/autotools.py:311 ../jhbuild/modtypes/waf.py:113
+#: jhbuild/modtypes/autotools.py:289 jhbuild/modtypes/meson.py:135
+#: jhbuild/modtypes/waf.py:110
 msgid "Checking"
 msgstr "正在检查"
 
-#: ../jhbuild/modtypes/autotools.py:324 ../jhbuild/modtypes/cmake.py:120
-#: ../jhbuild/modtypes/waf.py:125
+#: jhbuild/modtypes/autotools.py:299 jhbuild/modtypes/cmake.py:131
+#: jhbuild/modtypes/meson.py:141 jhbuild/modtypes/waf.py:122
 msgid "Creating tarball for"
 msgstr "正在创建档案包"
 
-#: ../jhbuild/modtypes/autotools.py:333
+#: jhbuild/modtypes/autotools.py:305
 msgid "Dist checking"
 msgstr "Dist 检查"
 
-#: ../jhbuild/modtypes/autotools.py:342 ../jhbuild/modtypes/cmake.py:129
-#: ../jhbuild/modtypes/distutils.py:69 ../jhbuild/modtypes/perl.py:66
-#: ../jhbuild/modtypes/waf.py:136
+#: jhbuild/modtypes/autotools.py:314
+msgid "Uninstalling old installed version"
+msgstr "正在卸载旧的安装版本"
+
+#: jhbuild/modtypes/autotools.py:317 jhbuild/modtypes/cmake.py:143
+#: jhbuild/modtypes/distutils.py:69 jhbuild/modtypes/meson.py:150
+#: jhbuild/modtypes/perl.py:66 jhbuild/modtypes/waf.py:133
 msgid "Installing"
 msgstr "正在安装"
 
-#: ../jhbuild/modtypes/autotools.py:371
+#: jhbuild/modtypes/autotools.py:339
 msgid "Distcleaning"
 msgstr "正在进行 distclean"
 
-#: ../jhbuild/modtypes/autotools.py:405
+#: jhbuild/modtypes/autotools.py:375
 #, python-format
 msgid "<%s/> tag must contain value=''"
 msgstr "<%s/> 标签必须包含 value=''"
 
-#: ../jhbuild/modtypes/__init__.py:60
+#: jhbuild/modtypes/__init__.py:60
 #, python-format
 msgid "unknown module type %s"
 msgstr "未知的模块类型 %s"
 
-#: ../jhbuild/modtypes/__init__.py:77
+#: jhbuild/modtypes/__init__.py:77
 #, python-format
 msgid "dep node for module %s is missing package attribute"
 msgstr "模块 %s 对应的依赖节点缺少包属性"
 
-#: ../jhbuild/modtypes/__init__.py:86 ../jhbuild/modtypes/__init__.py:93
+#: 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
+#: jhbuild/modtypes/__init__.py:143
 #, python-format
 msgid "no <branch> element found for %s"
 msgstr "没有找到 %s 的 <branch> 元素"
 
 # fuzzy, python-format
-#: ../jhbuild/modtypes/__init__.py:148
+#: jhbuild/modtypes/__init__.py:152
 #, python-format
 msgid ""
 "Repository=%(missing)s not found for module id=%(module)s. Possible "
@@ -1331,51 +1341,56 @@ msgstr ""
 "未找到 id=%(module)s 的模块对应的 repository=%(missing)s。可能的仓库为 "
 "%(possible)s"
 
-#: ../jhbuild/modtypes/__init__.py:155
+#: jhbuild/modtypes/__init__.py:159
 #, python-format
 msgid ""
 "No repository for module id=%(module)s. Either set branch/repo or default "
 "repository."
 msgstr "没有对应模块 id=%(module)s 的仓库。请设置 branch/repo 或默认仓库。"
 
-#: ../jhbuild/modtypes/__init__.py:227
+#: jhbuild/modtypes/__init__.py:228
 #, python-format
 msgid "Deleting .la file: %r"
 msgstr "正在删除 .la 文件:%r"
 
-#: ../jhbuild/modtypes/__init__.py:312
+#: jhbuild/modtypes/__init__.py:250
+#, python-format
+msgid "Deleting dir file: %r"
+msgstr "正在删除目录文件:%r"
+
+#: jhbuild/modtypes/__init__.py:320
 #, python-format
 msgid "Moving temporary DESTDIR %r into build prefix"
 msgstr "正在将临时 DESTDIR %r 移动到构建前缀目录"
 
-#: ../jhbuild/modtypes/__init__.py:334
+#: jhbuild/modtypes/__init__.py:342
 #, python-format
 msgid ""
 "Files remaining in buildroot %(dest)r; module may have installed files "
 "outside of prefix."
 msgstr "文件仍在构建根目录 %(dest)r 中;模块可能安装了前缀目录外的文件。"
 
-#: ../jhbuild/modtypes/__init__.py:352
+#: jhbuild/modtypes/__init__.py:360
 #, python-format
 msgid "Module failed to install into DESTDIR %(dest)r"
 msgstr "模块无法安装至 DESTDIR %(dest)r"
 
-#: ../jhbuild/modtypes/__init__.py:362
+#: jhbuild/modtypes/__init__.py:376
 #, python-format
 msgid "%d files remaining from previous build"
 msgstr "上次构建时留下了 %d 个文件"
 
-#: ../jhbuild/modtypes/__init__.py:365 ../jhbuild/utils/packagedb.py:282
+#: jhbuild/modtypes/__init__.py:379 jhbuild/utils/packagedb.py:218
 #, python-format
 msgid "Deleted: %(file)r"
 msgstr "已删除:%(file)r"
 
-#: ../jhbuild/modtypes/__init__.py:370
+#: jhbuild/modtypes/__init__.py:384
 #, python-format
 msgid "Failed to delete no longer installed file %(file)r: %(msg)s"
 msgstr "删除已不安装的 %(file)r 文件失败:%(msg)s"
 
-#: ../jhbuild/modtypes/__init__.py:378
+#: jhbuild/modtypes/__init__.py:392
 #, python-format
 msgid ""
 "Install encountered errors: %(num)d errors raised, %(files)d files copied. "
@@ -1385,58 +1400,62 @@ msgstr ""
 "安装遇到了错误:出现 %(num)d 个错误,已复制 %(files)d 个文件。错误为:\n"
 "  %(err)s"
 
-#: ../jhbuild/modtypes/__init__.py:385
+#: jhbuild/modtypes/__init__.py:399
 #, python-format
 msgid "Install complete: %d files copied"
 msgstr "安装完成:复制了 %d 个文件"
 
-#: ../jhbuild/modtypes/__init__.py:433
+#: jhbuild/modtypes/__init__.py:447
 #, python-format
 msgid "Skipping %s (not updated)"
 msgstr "跳过 %s(未更新)"
 
-#: ../jhbuild/modtypes/__init__.py:445
+#: jhbuild/modtypes/__init__.py:459
 #, python-format
 msgid "Skipping %s (package and dependencies not updated)"
 msgstr "跳过 %s(包和依赖未更新)"
 
-#: ../jhbuild/modtypes/__init__.py:534 ../jhbuild/modtypes/__init__.py:552
-#: ../jhbuild/modtypes/linux.py:81 ../jhbuild/modtypes/linux.py:88
+#: jhbuild/modtypes/__init__.py:551
+msgid "ninja not found; use NINJA to point to a specific ninja binary"
+msgstr "未找到 ninja;使用 NINJA 来指向特定的 ninja 二进制文件"
+
+#: jhbuild/modtypes/__init__.py:617 jhbuild/modtypes/__init__.py:643
+#: jhbuild/modtypes/linux.py:82 jhbuild/modtypes/linux.py:89
 msgid "Checking out"
 msgstr "正在检出"
 
-#: ../jhbuild/modtypes/__init__.py:538
+#: jhbuild/modtypes/__init__.py:621
 #, python-format
 msgid "source directory %s was not created"
 msgstr "源目录 %s 没有创建"
 
-#: ../jhbuild/modtypes/__init__.py:555
+#: jhbuild/modtypes/__init__.py:646
 msgid "wipe directory and start over"
 msgstr "清理目录并重新开始"
 
-#: ../jhbuild/modtypes/linux.py:45
+#: jhbuild/modtypes/linux.py:46
 #, python-format
 msgid "kconfig file %s was not created"
 msgstr "kconfig 文件 %s 没有创建"
 
-#: ../jhbuild/modtypes/linux.py:93
+#: jhbuild/modtypes/linux.py:94
 msgid "make mrproper"
 msgstr "make mrproper"
 
-#: ../jhbuild/modtypes/linux.py:167
+#: jhbuild/modtypes/linux.py:168
 msgid "Installing kernel"
 msgstr "正在安装内核"
 
-#: ../jhbuild/modtypes/linux.py:185
+#: jhbuild/modtypes/linux.py:186
 msgid "Installing modules"
 msgstr "正在安装模块"
 
-#: ../jhbuild/modtypes/linux.py:200
+#: jhbuild/modtypes/linux.py:201
 msgid "Installing kernel headers"
 msgstr "正在安装内核头文件"
 
 # fuzzy, python-format
-#: ../jhbuild/modtypes/linux.py:240
+#: jhbuild/modtypes/linux.py:242
 #, python-format
 msgid ""
 "Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. "
@@ -1446,7 +1465,7 @@ msgstr ""
 "能的仓库为 %(possible)s"
 
 # fuzzy, python-format
-#: ../jhbuild/modtypes/linux.py:246
+#: jhbuild/modtypes/linux.py:248
 #, python-format
 msgid ""
 "Default repository=%(missing)s not found for kconfig in linux id="
@@ -1455,116 +1474,112 @@ msgstr ""
 "找不到模块 id=%(linux_id)s 中 kconfig 对应的默认仓库 repository=%(missing)s。"
 "可能的仓库为%(possible)s"
 
-#: ../jhbuild/modtypes/tarball.py:68
+#: jhbuild/modtypes/tarball.py:64
 #, python-format
 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 包,但找不到"
-
-#: ../jhbuild/moduleset.py:79
+#: jhbuild/moduleset.py:91
 #, python-format
 msgid "fixed case of module '%(orig)s' to '%(new)s'"
 msgstr "已将'%(orig)s' 模块的实例修复为 '%(new)s'"
 
-#: ../jhbuild/moduleset.py:118
+#: jhbuild/moduleset.py:130
 #, python-format
 msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
 msgstr "%(module)s 依赖于未知模块 \"%(invalid)s\""
 
-#: ../jhbuild/moduleset.py:131
+#: jhbuild/moduleset.py:143
 #, python-format
 msgid "Circular dependencies detected: %s"
 msgstr "检测到循环依赖:%s"
 
-#: ../jhbuild/moduleset.py:282
+#: jhbuild/moduleset.py:292
 msgid "Unknown module:"
 msgstr "未知模块:"
 
-#: ../jhbuild/moduleset.py:408
+#: jhbuild/moduleset.py:431
 msgid "<if> must have exactly one of condition-set='' or condition-unset=''"
 msgstr "<if> 必须严格为 condition-set='' 或 condition-unset=''"
 
-#: ../jhbuild/moduleset.py:427
+#: jhbuild/moduleset.py:450
 #, python-format
 msgid "could not download %s: %s"
 msgstr "无法下载 %s:%s"
 
-#: ../jhbuild/moduleset.py:432 ../jhbuild/moduleset.py:434
+#: jhbuild/moduleset.py:455 jhbuild/moduleset.py:457
 #, python-format
 msgid "failed to parse %s: %s"
 msgstr "解析 %s 失败:%s"
 
-#: ../jhbuild/moduleset.py:464
+#: jhbuild/moduleset.py:492
 msgid "Duplicate repository:"
 msgstr "重复仓库:"
 
-#: ../jhbuild/moduleset.py:567
+#: jhbuild/moduleset.py:595
 #, 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 %s."
 msgstr ""
 "在本地修改了模块集,但 JHBuild 配置为从网络获取它们。或许您应该向您的 %s 中添"
-"加 use_local_modulesets = True"
+"加 use_local_modulesets = True。"
 
-#: ../jhbuild/utils/cmds.py:40
+#: jhbuild/utils/cmds.py:42
 msgid "Call to undefined command"
 msgstr "调用了未定义的命令"
 
-#: ../jhbuild/utils/httpcache.py:185
+#: jhbuild/utils/httpcache.py:182
 msgid "file not in cache, but not allowed to check network"
 msgstr "文件不在缓存中,但又不允许检查网络"
 
-#: ../jhbuild/utils/lockfile.py:108
-#, python-format
-msgid "Removing stale lock left by no longer extant pid %(pid)d, uid %(uid)d"
-msgstr "移除已不存在的 pid %(pid)d、uid %(uid)d (的进程)留下的失效锁"
-
-#: ../jhbuild/utils/lockfile.py:120
-#, python-format
-msgid ""
-"Lock %(path)r taken by pid %(pid)d; waiting for it to exit.  Press Control-C "
-"to interrupt."
-msgstr "锁 %(path)r 由 pid %(pid)d 占用;正在等它退出。按 Control-C 强行中止。"
-
-#: ../jhbuild/utils/packagedb.py:75
+#: jhbuild/utils/packagedb.py:66
 #, python-format
 msgid "package %s has files with embedded new lines"
 msgstr "包 %s 有嵌入了新行的文件"
 
-#: ../jhbuild/utils/packagedb.py:158
-msgid "Package DB modified externally, rereading"
-msgstr "包数据库在他处被修改,重新读取"
-
-#: ../jhbuild/utils/packagedb.py:269
+#: jhbuild/utils/packagedb.py:205
 #, python-format
 msgid ""
 "no manifest for '%s', can't uninstall.  Try building again, then "
 "uninstalling."
 msgstr "没有“%s”的清单,无法卸载。请尝试重新构建后再卸载。"
 
-#: ../jhbuild/utils/packagedb.py:286
+#: jhbuild/utils/packagedb.py:222
 #, python-format
 msgid "Failed to delete %(file)r: %(msg)s"
 msgstr "删除 %(file)r 失败:%(msg)s"
 
-#: ../jhbuild/utils/systeminstall.py:140
-msgid "No suitable root privilege command found; you should install \"pkexec\""
-msgstr "没有找到适合的,具有 root 权限的命令;您应该重新安装“pkexec”"
+#: jhbuild/utils/systeminstall.py:233
+msgid ""
+"No suitable root privilege command found; you should install \"sudo\" or "
+"\"pkexec\" (or the system package that provides it)"
+msgstr ""
+"未找到提供 root 权限的合适命令;您应该安装“sudo”或“pkexec”(或提供它的系统软"
+"件包)"
 
-#: ../jhbuild/utils/systeminstall.py:172 ../jhbuild/utils/systeminstall.py:175
+#: jhbuild/utils/systeminstall.py:262 jhbuild/utils/systeminstall.py:265
 #, python-format
 msgid "PackageKit: %s"
 msgstr "包套件:%s"
 
-#: ../jhbuild/utils/systeminstall.py:251
+#: jhbuild/utils/systeminstall.py:272
+msgid "Error: python-gobject package not found."
+msgstr "错误:未找到 python-gobject 软件包。"
+
+#: jhbuild/utils/systeminstall.py:278
+msgid "Error: dbus-python package not found."
+msgstr "错误:未找到 dbus-python 软件包。"
+
+#: jhbuild/utils/systeminstall.py:295
+msgid "Computing packages to install. This might be slow. Please wait."
+msgstr "正在计算要安装的软件包。这可能会较慢。请稍等。"
+
+#: jhbuild/utils/systeminstall.py:325
 msgid "Nothing available to install"
 msgstr "无可安装"
 
-#: ../jhbuild/utils/systeminstall.py:254
+#: jhbuild/utils/systeminstall.py:328
 #, python-format
 msgid ""
 "Installing:\n"
@@ -1573,73 +1588,117 @@ msgstr ""
 "正在安装:\n"
 "  %s"
 
-#: ../jhbuild/utils/systeminstall.py:260
+#: jhbuild/utils/systeminstall.py:329
+msgid ""
+"This might take a very long time. Do not turn off your computer. You can run "
+"`pkmon' to monitor progress."
+msgstr ""
+"这可能会花费很长时间。不要关闭您的计算机。您可以运行“pkmon”来监测进度。"
+
+#: jhbuild/utils/systeminstall.py:335
 msgid "Complete!"
 msgstr "完成!"
 
-#: ../jhbuild/utils/systeminstall.py:271
-msgid "Using yum to install packages.  Please wait."
-msgstr "正在使用 yum 安装包。请稍候。"
-
-#: ../jhbuild/utils/systeminstall.py:274
-#, python-format
-msgid ""
-"Installing:\n"
-"  %(pkgs)s"
-msgstr ""
-"正在安装:\n"
-"  %(pkgs)s"
+#: jhbuild/utils/systeminstall.py:348
+msgid "Using dnf to install packages.  Please wait."
+msgstr "正在使用 dnf 安装软件包。请稍等。"
 
-#: ../jhbuild/utils/systeminstall.py:284 ../jhbuild/utils/systeminstall.py:334
+#: jhbuild/utils/systeminstall.py:352 jhbuild/utils/systeminstall.py:362
+#: jhbuild/utils/systeminstall.py:410 jhbuild/utils/systeminstall.py:428
+#: jhbuild/utils/systeminstall.py:583
 msgid "Nothing to install"
 msgstr "无可安装"
 
-#: ../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:370 jhbuild/utils/systeminstall.py:433
+msgid "Install failed"
+msgstr "安装失败"
+
+#: jhbuild/utils/systeminstall.py:372 jhbuild/utils/systeminstall.py:435
+msgid "Completed!"
+msgstr "已完成!"
+
+#: jhbuild/utils/systeminstall.py:385
+msgid "pkgfile not found, automatically installing"
+msgstr "未找到 pkgfile,正在自动安装"
+
+#: jhbuild/utils/systeminstall.py:387
+msgid "Failed to install pkgfile"
+msgstr "安装 pkgfile 失败"
+
+#: jhbuild/utils/systeminstall.py:393
+msgid "pkgfile cache is old or doesn't exist, automatically updating"
+msgstr "pkgfile 缓存太旧或不存在,正在自动更新"
+
+#: jhbuild/utils/systeminstall.py:396
+msgid "Failed to create pkgfile cache"
+msgstr "创建 pkgfile 缓存失败"
+
+#: jhbuild/utils/systeminstall.py:399
+msgid "Failed to update pkgfile cache"
+msgstr "更新 pkgfile 缓存失败"
 
-#: ../jhbuild/utils/systeminstall.py:324
+#: jhbuild/utils/systeminstall.py:401
+msgid "Successfully updated pkgfile cache"
+msgstr "已成功更新 pkgfile 缓存"
+
+#: jhbuild/utils/systeminstall.py:406
+msgid "Using pacman to install packages.  Please wait."
+msgstr "正在使用 pacman 安装软件包。请稍等。"
+
+#: jhbuild/utils/systeminstall.py:425
+#, python-format
+msgid "Provider for \"%s\" was not found, ignoring"
+msgstr "未找到“%s”的提供者,将忽略"
+
+#: jhbuild/utils/systeminstall.py:517 jhbuild/utils/systeminstall.py:528
+#: jhbuild/utils/systeminstall.py:542
 #, python-format
 msgid "No native package found for %(id)s (%(filename)s)"
 msgstr "没有找到 %(id)s 的本地包(%(filename)s)"
 
-#: ../jhbuild/utils/systeminstall.py:329
+#: jhbuild/utils/systeminstall.py:547
 #, python-format
 msgid "Installing: %(pkgs)s"
 msgstr "正在安装:%(pkgs)s"
 
-#: ../jhbuild/utils/trigger.py:57
+#: jhbuild/utils/systeminstall.py:557
+msgid ""
+"Using apt-file to search for providers; this may be extremely slow. Please "
+"wait. Patience!"
+msgstr "正在使用 apt-file 搜索提供者;这可能极其缓慢。请稍等。要有耐心!"
+
+#: jhbuild/utils/trigger.py:55
 #, python-format
 msgid "No keys specified in trigger script %r"
 msgstr "在触发器脚本 %r 中没有指定键"
 
-#: ../jhbuild/utils/unpack.py:145
+#: jhbuild/utils/unpack.py:145
 #, python-format
 msgid "Failed to unpack %s (unknown archive type)"
 msgstr "解开 %s 失败(未知的档案类型)"
 
-#: ../jhbuild/utils/unpack.py:147
+#: jhbuild/utils/unpack.py:147
 #, python-format
 msgid "Failed to unpack %s"
 msgstr "解开 %s 失败"
 
-#: ../jhbuild/utils/unpack.py:153
+#: jhbuild/utils/unpack.py:153
 #, python-format
 msgid "Failed to unpack %s (empty file?)"
 msgstr "解开 %s 失败(空文件?)"
 
-#: ../jhbuild/versioncontrol/bzr.py:74 ../jhbuild/versioncontrol/darcs.py:55
-#: ../jhbuild/versioncontrol/fossil.py:49 ../jhbuild/versioncontrol/hg.py:53
-#: ../jhbuild/versioncontrol/mtn.py:52 ../jhbuild/versioncontrol/tarball.py:67
+#: jhbuild/versioncontrol/bzr.py:73 jhbuild/versioncontrol/darcs.py:50
+#: jhbuild/versioncontrol/fossil.py:48 jhbuild/versioncontrol/hg.py:52
+#: jhbuild/versioncontrol/mtn.py:52 jhbuild/versioncontrol/tarball.py:64
 #, python-format
 msgid "branch for %(name)s has wrong override, check your %(filename)s"
 msgstr "%(name)s 的分支有覆盖错误,请检查您的 %(filename)s"
 
-#: ../jhbuild/versioncontrol/bzr.py:119
+#: jhbuild/versioncontrol/bzr.py:124
 msgid "attribute is deprecated. Use revspec instead."
-msgstr "属性已废弃。请转而使用 revspec"
+msgstr "属性已废弃。请转而使用 revspec。"
 
-#: ../jhbuild/versioncontrol/bzr.py:175
+#: jhbuild/versioncontrol/bzr.py:179
 #, python-format
 msgid ""
 "\n"
@@ -1650,86 +1709,86 @@ msgstr ""
 "路径 %s 似乎不是从 dvcs_mirror_dir 检出的副本。\n"
 "移除它或者修改您的 dvcs_mirror_dir 设置。"
 
-#: ../jhbuild/versioncontrol/cvs.py:104
+#: jhbuild/versioncontrol/cvs.py:104
 #, python-format
-msgid "could not log into %s\n"
-msgstr "无法将日志记入 %s\n"
+msgid "could not log into %s"
+msgstr "无法将日志记入 %s"
 
-#: ../jhbuild/versioncontrol/cvs.py:122
+#: jhbuild/versioncontrol/cvs.py:122
 #, python-format
 msgid "%s is not managed by CVS"
 msgstr "%s 不是用 CVS 管理的"
 
-#: ../jhbuild/versioncontrol/cvs.py:274
+#: jhbuild/versioncontrol/cvs.py:279
 #, python-format
 msgid "\"%s\" does not appear to be a CVS working copy"
 msgstr "\"%s\" 似乎不是一份 CVS 工作副本"
 
-#: ../jhbuild/versioncontrol/cvs.py:277
+#: jhbuild/versioncontrol/cvs.py:282
 #, python-format
 msgid ""
 "working copy points at the wrong repository (expected %(root1)s but got "
 "%(root2)s). "
 msgstr "工作副本指向了错误的仓库(应为 %(root1)s),而得到的是 %(root2)s)。"
 
-#: ../jhbuild/versioncontrol/cvs.py:279
+#: jhbuild/versioncontrol/cvs.py:284
 msgid "Consider using the changecvsroot.py script to fix this."
 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:567
-#: ../jhbuild/versioncontrol/git.py:607 ../jhbuild/versioncontrol/git.py:683
-#: ../jhbuild/versioncontrol/hg.py:87 ../jhbuild/versioncontrol/hg.py:93
+#: jhbuild/versioncontrol/darcs.py:81 jhbuild/versioncontrol/darcs.py:87
+#: jhbuild/versioncontrol/fossil.py:80 jhbuild/versioncontrol/fossil.py:93
+#: jhbuild/versioncontrol/git.py:602 jhbuild/versioncontrol/git.py:642
+#: jhbuild/versioncontrol/git.py:718 jhbuild/versioncontrol/hg.py:89
+#: jhbuild/versioncontrol/hg.py:95
 msgid "date based checkout not yet supported\n"
 msgstr "尚未支持基于日期的检出\n"
 
-#: ../jhbuild/versioncontrol/git.py:111
+#: jhbuild/versioncontrol/git.py:110
 msgid "ignored bad branch redefinition for module:"
 msgstr "已忽略有问题的模块分支重定义:"
 
-#: ../jhbuild/versioncontrol/git.py:201
+#: jhbuild/versioncontrol/git.py:203
 msgid "Need at least git-1.5.6 from June/08 to operate"
 msgstr "至少需要08年6月发布的 git-1.5.6 才能工作"
 
-#: ../jhbuild/versioncontrol/git.py:215
+#: jhbuild/versioncontrol/git.py:217
 msgid "Unexpected: Checkoutdir is not a git repository:"
 msgstr "异常:检出目录不是一个 git 仓库:"
 
-#: ../jhbuild/versioncontrol/git.py:271
+#: jhbuild/versioncontrol/git.py:284
 #, python-format
 msgid ""
 "The requested branch \"%s\" is not available. Neither locally, nor remotely "
 "in the origin remote."
 msgstr "请求的分支 \"%s\" 不可用。无论本地还是远程都不在初始的远程位置中。"
 
-#: ../jhbuild/versioncontrol/git.py:279
+#: jhbuild/versioncontrol/git.py:292
 msgid "Refusing to switch a dirty tree."
 msgstr "拒绝切换到一个污染的树。"
 
-#: ../jhbuild/versioncontrol/git.py:357
+#: jhbuild/versioncontrol/git.py:370
 #, python-format
 msgid "Command %s returned no output"
 msgstr "%s 命令返回了空输出"
 
-#: ../jhbuild/versioncontrol/git.py:362
+#: jhbuild/versioncontrol/git.py:375
 #, python-format
 msgid "Command %s did not include commit line: %r"
 msgstr "%s 命令并未包含提交(commit)行:%r"
 
-#: ../jhbuild/versioncontrol/git.py:429
+#: jhbuild/versioncontrol/git.py:462
 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:430
+#: jhbuild/versioncontrol/git.py:463
 msgid ""
 "Failed to update module (missing .git) (you should check for changes then "
 "remove the directory)."
 msgstr "更新模块失败(缺少 .git)(您应该检查改动然后移除该目录)。"
 
-#: ../jhbuild/versioncontrol/git.py:534
+#: jhbuild/versioncontrol/git.py:567
 msgid ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
@@ -1737,143 +1796,214 @@ msgstr ""
 "外部处理失败\n"
 "如果您运行的 git 版本 < 1.5.6,建议您更新它。\n"
 
-#: ../jhbuild/versioncontrol/git.py:579
+#: jhbuild/versioncontrol/git.py:614
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr "无法从 %s 获取最新版本。请检查模块位置。"
 
-#: ../jhbuild/versioncontrol/__init__.py:196
+#: jhbuild/versioncontrol/__init__.py:197
 #, python-format
 msgid "unknown repository type %s"
 msgstr "未知的仓库类型 %s"
 
-#: ../jhbuild/versioncontrol/mtn.py:93
+#: jhbuild/versioncontrol/mtn.py:93
 #, python-format
 msgid "Initializing %s"
 msgstr "正在初始化 %s"
 
-#: ../jhbuild/versioncontrol/mtn.py:101
+#: jhbuild/versioncontrol/mtn.py:101
 #, python-format
 msgid "Pulling branch %(branch)s from %(server)s"
 msgstr "正在从 %(server)s 拉取 %(branch)s 分支"
 
-#: ../jhbuild/versioncontrol/mtn.py:119
+#: jhbuild/versioncontrol/mtn.py:119
 #, python-format
 msgid "branch %(branch)s has %(num)d heads"
 msgstr "%(branch)s 分支有 %(num)d 个最新版本"
 
-#: ../jhbuild/versioncontrol/mtn.py:125
+#: 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:134
+#: jhbuild/versioncontrol/mtn.py:134
 #, python-format
 msgid "Updating working copy %s"
 msgstr "正在更新工作副本 %s"
 
-#: ../jhbuild/versioncontrol/svn.py:74
+#: jhbuild/versioncontrol/svn.py:75
 msgid "Getting SVN subdirs: this operation might be long..."
 msgstr "正在获取 SVN 子目录:该操作可能时间很长..."
 
-#: ../jhbuild/versioncontrol/svn.py:97
+#: jhbuild/versioncontrol/svn.py:100
 #, python-format
 msgid "could not get Subversion URI for %s"
 msgstr "无法获取 %s 的 Subversion URI"
 
-#: ../jhbuild/versioncontrol/svn.py:100
+#: jhbuild/versioncontrol/svn.py:103
 #, python-format
 msgid "could not parse \"svn info\" output for %s"
 msgstr "无法解析 %s 的 \"svn info\" 输出"
 
-#: ../jhbuild/versioncontrol/svn.py:309
+#: jhbuild/versioncontrol/svn.py:318
 msgid "Error checking for conflicts"
 msgstr "检查冲突失败"
 
-#: ../jhbuild/versioncontrol/tarball.py:90
+#: jhbuild/versioncontrol/tarball.py:90
 #, python-format
 msgid "branch for %s is not correct, check the moduleset file."
 msgstr "%s 分支不正确,请检查模块集文件。"
 
-#: ../jhbuild/versioncontrol/tarball.py:126
+#: jhbuild/versioncontrol/tarball.py:132
 #, python-format
 msgid "URL has no filename component: %s"
 msgstr "URL 中不含文件名:%s"
 
-#: ../jhbuild/versioncontrol/tarball.py:169
+#: jhbuild/versioncontrol/tarball.py:174
 msgid "file not downloaded"
 msgstr "文件未下载"
 
-#: ../jhbuild/versioncontrol/tarball.py:174
+#: jhbuild/versioncontrol/tarball.py:179
 #, python-format
 msgid "downloaded file size is incorrect (expected %(size1)d, got %(size2)d)"
 msgstr "下载文件大小不正确(应为 %(size1)d),而得到的是 %(size2)d)"
 
-#: ../jhbuild/versioncontrol/tarball.py:180
+#: jhbuild/versioncontrol/tarball.py:185
 #, python-format
 msgid "invalid hash attribute on module %s"
 msgstr "%s 模块的 hash 属性无效"
 
-#: ../jhbuild/versioncontrol/tarball.py:193
+#: jhbuild/versioncontrol/tarball.py:198
 #, python-format
 msgid "file hash is incorrect (expected %(sum1)s, got %(sum2)s)"
 msgstr "文件 hash 不正确(应为 %(sum1)s,而得到是的 %(sum2)s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:196
+#: jhbuild/versioncontrol/tarball.py:201
 #, python-format
 msgid "skipped hash check (missing support for %s)"
 msgstr "已跳过 hash 检查(缺少 %s 支持)"
 
-#: ../jhbuild/versioncontrol/tarball.py:210
+#: jhbuild/versioncontrol/tarball.py:205
+#, python-format
+msgid "tarball dir (%s) must be writable"
+msgstr "档案包目录(%s)必须可写"
+
+#: jhbuild/versioncontrol/tarball.py:217
 msgid "unable to find wget or curl"
 msgstr "找不到 wget 或 curl"
 
-#: ../jhbuild/versioncontrol/tarball.py:226
+#: jhbuild/versioncontrol/tarball.py:233
 #, python-format
 msgid "tarball dir (%s) can not be created"
 msgstr "无法创建档案包目录(%s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:228
-#, python-format
-msgid "tarball dir (%s) must be writable"
-msgstr "档案包目录(%s)必须可写"
-
-#: ../jhbuild/versioncontrol/tarball.py:240
+#: jhbuild/versioncontrol/tarball.py:245
 #, python-format
 msgid "failed to unpack %s"
 msgstr "解开 %s 失败"
 
-#: ../jhbuild/versioncontrol/tarball.py:243
+#: jhbuild/versioncontrol/tarball.py:248
 #, python-format
 msgid "could not unpack tarball (expected %s dir)"
 msgstr "无法解开档案包(应为 %s 目录)"
 
-#: ../jhbuild/versioncontrol/tarball.py:258
+#: jhbuild/versioncontrol/tarball.py:265
 #, python-format
 msgid "could not download patch (error: %s)"
 msgstr "无法下载补丁(错误:%s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:260
+#: jhbuild/versioncontrol/tarball.py:267
 msgid "could not download patch"
 msgstr "无法下载补丁"
 
-#: ../jhbuild/versioncontrol/tarball.py:292
+#: jhbuild/versioncontrol/tarball.py:299
 #, python-format
 msgid "Failed to find patch: %s"
 msgstr "查找补丁失败:%s"
 
-#: ../jhbuild/versioncontrol/tarball.py:294
+#: jhbuild/versioncontrol/tarball.py:309
 msgid "Applying patch"
 msgstr "正在应用补丁"
 
-#: ../jhbuild/versioncontrol/tarball.py:302
+#: jhbuild/versioncontrol/tarball.py:317
 msgid "unable to find quilt"
 msgstr "找不到 quilt"
 
-#: ../jhbuild/versioncontrol/tarball.py:313
+#: jhbuild/versioncontrol/tarball.py:328
 msgid "could not checkout quilt patch set"
 msgstr "无法检出 quilt 补丁集"
 
+#~ msgid "buildbot and twisted not found, run jhbuild bot --setup"
+#~ msgstr "buildbot 和 twisted 找不到,请运行 jhbuild bot --setup"
+
+#~ msgid "No description for slave %s."
+#~ msgstr "没有从 %s 的描述。"
+
+#~ msgid "Failed to parse slave config for %s."
+#~ msgstr "解析 %s 的从配置失败。"
+
+#~ msgid "failed to get buildbot PID"
+#~ msgstr "获取 buildbot PID 失败"
+
+#~| msgid ""
+#~| "Could not find %s in XML catalog (usually part of package 'docbook-xsl')"
+#~ msgid "%s not found (usually part of the package 'subversion')"
+#~ msgstr "找不到 %s (通常属于包“subversion”)"
+
+#~ msgid ""
+#~ "JHBuild start script has been installed in ~/.local/bin/jhbuild, you "
+#~ "should remove the old version that is still in ~/bin/ (or make it a "
+#~ "symlink to ~/.local/bin/jhbuild)"
+#~ msgstr ""
+#~ "JHBuild 启动脚本安装在 ~/.local/bin/jhbuild,您应该移除仍在 ~/bin/ 中的旧"
+#~ "版本(或将它作为 ~/.local/bin/jhbuild 的符号链接)"
+
+#~ msgid ""
+#~ "Obsolete JHBuild start script, make sure it is removed then do run 'make "
+#~ "install'"
+#~ msgstr "废弃的 JHBuild 启动脚本,请确信它已经删除,然后运行 'make install'"
+
+#~ msgid "Can't create %s directory"
+#~ msgstr "无法创建 %s 目录"
+
+#~ msgid ""
+#~ "Unable to determine python version using the PYTHON environment variable "
+#~ "(%s). Using default \"%s\""
+#~ msgstr "无法通过 PYTHON 环境变量(%s)检测 python 版本。将使用默认的“%s“"
+
+#~ msgid ""
+#~ "Unable to determine python site-packages directory using the PYTHON "
+#~ "environment variable (%s). Using default \"%s\""
+#~ msgstr ""
+#~ "无法通过 PYTHON 环境变量(%s)检测 python site-packages 目录。将使用默认"
+#~ "的“%s”"
+
+#~ msgid "Could not create GConf config (%s)"
+#~ msgstr "无法创建 GConf 配置(%s)"
+
+#~ msgid "Python XML packages are required but could not be found"
+#~ msgstr "需要 Python XML 包,但找不到"
+
+#~ msgid ""
+#~ "Removing stale lock left by no longer extant pid %(pid)d, uid %(uid)d"
+#~ msgstr "移除已不存在的 pid %(pid)d、uid %(uid)d (的进程)留下的失效锁"
+
+#~ msgid ""
+#~ "Lock %(path)r taken by pid %(pid)d; waiting for it to exit.  Press "
+#~ "Control-C to interrupt."
+#~ msgstr ""
+#~ "锁 %(path)r 由 pid %(pid)d 占用;正在等它退出。按 Control-C 强行中止。"
+
+#~ msgid "Package DB modified externally, rereading"
+#~ msgstr "包数据库在他处被修改,重新读取"
+
+#~ msgid ""
+#~ "Installing:\n"
+#~ "  %(pkgs)s"
+#~ msgstr ""
+#~ "正在安装:\n"
+#~ "  %(pkgs)s"
+
 #~ msgid "Could not find XML catalog"
 #~ msgstr "找不到 XML 目录"
 


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