[jhbuild] Update Japanese translation

[Translations User D-L <translations src gnome org>]

commit da756cfeea20561cd2041c477584a4e85dbdf0d8
Author: sicklylife <translation sicklylife jp>
Date:   Wed May 6 10:01:22 2020 +0000

    Update Japanese translation

 po/ja.po | 1477 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 894 insertions(+), 583 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 498df4b2..0974dcff 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
 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: 2013-08-21 16:31+0900\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/jhbuild/issues\n";
+"POT-Creation-Date: 2020-03-25 21:36+0000\n"
 "PO-Revision-Date: 2010-10-25 22:52+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -17,1072 +17,1160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../autogen.sh:104
+#: autogen.sh:110
 #, sh-format
 msgid "Configuring $PKG_NAME without autotools"
 msgstr "Configuring $PKG_NAME without autotools"
 
-#: ../autogen.sh:121 ../autogen.sh:126
+#: autogen.sh:133 autogen.sh:138
 #, sh-format
 msgid "Unable to create file $srcdir/Makefile.inc"
 msgstr "Unable to create file $srcdir/Makefile.inc"
 
-#: ../autogen.sh:141
+#: autogen.sh:158
 #, sh-format
 msgid "Unable to read file $makefile"
 msgstr "Unable to read file $makefile"
 
-#: ../autogen.sh:146
+#: autogen.sh:163
 #, sh-format
 msgid "Unable to copy $makefile to $srcdir/Makefile"
 msgstr "Unable to copy $makefile to $srcdir/Makefile"
 
-#: ../autogen.sh:151
+#: autogen.sh:168
 #, sh-format
 msgid "Now type `make' to compile $PKG_NAME"
 msgstr "Now type `make' to compile $PKG_NAME"
 
-#: ../autogen.sh:187
+#: autogen.sh:228
 #, sh-format
-msgid "**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME directory"
-msgstr "**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME directory"
+msgid ""
+"**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME "
+"directory"
+msgstr ""
+"**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME "
+"directory"
 
-#: ../autogen.sh:220
-msgid "gnome-autogen.sh not available"
-msgstr "gnome-autogen.sh not available"
+#: autogen.sh:282
+msgid "WARNING: aclocal not available (usually part of package 'autoconf')"
+msgstr ""
 
-#: ../autogen.sh:223
-msgid "yelp-tools not available"
-msgstr "yelp-tools not available"
+#: autogen.sh:285
+msgid "WARNING: automake not available (usually part of package 'automake')"
+msgstr ""
 
-#: ../jhbuild/commands/autobuild.py:28
+#: autogen.sh:288
+msgid "WARNING: autopoint not available (usually part of package 'gettext')"
+msgstr ""
+
+#: autogen.sh:291
+msgid "WARNING: pkg-config not available (usually part of package 'pkgconfig')"
+msgstr ""
+
+#: autogen.sh:294
+msgid ""
+"WARNING: yelp-tools not available (usually part of package 'yelp-tools')"
+msgstr ""
+
+#: 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:435
+#: 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 "å ±å‘Šå…ˆã¨ãªã‚‹ jhautobuild の URL を指定する"
 
-#: ../jhbuild/commands/autobuild.py:54
+#: jhbuild/commands/autobuild.py:54
 msgid "verbose mode"
 msgstr "verbose mode"
 
-#: ../jhbuild/commands/autobuild.py:71
+#: jhbuild/commands/autobuild.py:71
 msgid "report URL for autobuild not specified"
 msgstr "report URL for autobuild not specified"
 
-#: ../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:473
+#: jhbuild/commands/clean.py:56 jhbuild/commands/tinderbox.py:97
 #, python-format
 msgid "%s not in module list"
 msgstr "%s not in module list"
 
-#: ../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:426
+#: jhbuild/commands/tinderbox.py:32
 msgid "[ options ... ] [ modules ... ]"
 msgstr "[ options ... ] [ modules ... ]"
 
-#: ../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:444
 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 "バージョン管理システムを利用して、ひとつ、あるいは複数のモジュールを更新する"
+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:381 jhbuild/commands/rdepends.py:53
+#: jhbuild/moduleset.py:177
 #, python-format
 msgid "A module called '%s' could not be found."
 msgstr "A module called '%s' could not be found."
 
-#: ../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:338 jhbuild/commands/rdepends.py:48
+#: jhbuild/commands/uninstall.py:58
 msgid "This command requires a module parameter."
 msgstr "This command requires a module parameter."
 
-#: ../jhbuild/commands/base.py:120
+#: jhbuild/commands/base.py:114
 msgid "Clean one or more modules"
 msgstr "ひとつ、あるいは複数のモジュールに対して clean を行う"
 
-#: ../jhbuild/commands/base.py:129
+#: jhbuild/commands/base.py:123
 msgid "honour the makeclean setting in config file"
 msgstr "コンフィグファイルで指定した 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 "ソースツリーを完全に clean する"
 
-#: ../jhbuild/commands/base.py:149
+#: jhbuild/commands/base.py:143
 msgid "clean command called while makeclean is set to False, skipped."
 msgstr "clean command called while makeclean is set to False, skipped."
 
-#: ../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:441
 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 "Xvfb ではなく実際の X 上でテストを行う"
 
-#: ../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 "ビルド失敗時に checkout と 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 "requested module is in the ignore list, nothing to do."
 
-#: ../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 %(cmd)s or to ignore system 
dependencies use command-line option %(opt)s"
-msgstr "Required system dependencies not installed. Install using the command %(cmd)s or to ignore system 
dependencies use command-line option %(opt)s"
+msgid ""
+"Required system dependencies not installed. Install using the command "
+"%(cmd)s or to ignore system dependencies use command-line option %(opt)s"
+msgstr ""
+"Required system dependencies not installed. Install using the command "
+"%(cmd)s or to ignore system dependencies use command-line option %(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:333 jhbuild/commands/make.py:100
+#: jhbuild/commands/uninstall.py:50
 #, python-format
-msgid "module \"%(modname)s\" does not exist, created automatically using repository \"%(reponame)s\""
-msgstr "module \"%(modname)s\" does not exist, created automatically using repository \"%(reponame)s\""
+msgid ""
+"module \"%(modname)s\" does not exist, created automatically using "
+"repository \"%(reponame)s\""
+msgstr ""
+"module \"%(modname)s\" does not exist, created automatically using "
+"repository \"%(reponame)s\""
 
-#: ../jhbuild/commands/base.py:348
+#: jhbuild/commands/base.py:346
 msgid "Run a command under the JHBuild environment"
 msgstr "JHBuild 環境でコマンドを実行する"
 
-#: ../jhbuild/commands/base.py:351
+#: jhbuild/commands/base.py:349
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr "[ options ... ] program [ arguments ... ]"
 
-#: ../jhbuild/commands/base.py:357
+#: jhbuild/commands/base.py:355
 msgid "run command in build dir of the given module"
 msgstr "指定モジュールのビルドディレクトリでコマンドを実行する"
 
-#: ../jhbuild/commands/base.py:360
+#: jhbuild/commands/base.py:358
 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:371 jhbuild/commands/base.py:401
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
 msgstr "Unable to execute the command '%(command)s': %(err)s"
 
-#: ../jhbuild/commands/base.py:394
+#: jhbuild/commands/base.py:392
 #, python-format
 msgid "Unable to execute the command '%s'"
 msgstr "Unable to execute the command '%s'"
 
-#: ../jhbuild/commands/base.py:401 ../jhbuild/frontends/gtkui.py:447
-#: ../jhbuild/frontends/terminal.py:145
+#: jhbuild/commands/base.py:399 jhbuild/frontends/gtkui.py:447
+#: jhbuild/frontends/terminal.py:172
 msgid "No command given"
 msgstr "No command given"
 
-#: ../jhbuild/commands/base.py:410
+#: jhbuild/commands/base.py:408
 msgid "Start a shell under the JHBuild environment"
 msgstr "JHBuild 環境でシェルを起動する"
 
-#: ../jhbuild/commands/base.py:425
+#: jhbuild/commands/base.py:423
 msgid "List the modules that would be built"
 msgstr "ビルド対象のモジュールの一覧を表示する"
 
-#: ../jhbuild/commands/base.py:434
+#: jhbuild/commands/base.py:432
 msgid "show which revision will be built"
 msgstr "ビルドするリビジョンを表示する"
 
-#: ../jhbuild/commands/base.py:440
+#: jhbuild/commands/base.py:438
 msgid "start list at the given module"
 msgstr "指定のモジュールから一覧を表示する"
 
-#: ../jhbuild/commands/base.py:449
+#: jhbuild/commands/base.py:447
 msgid "also list soft-dependencies that could be skipped"
 msgstr "スキップ可能な弱い依存関係になるモジュールも表示する"
 
-#: ../jhbuild/commands/base.py:452
+#: jhbuild/commands/base.py:450
 msgid "list all modules, not only those that would be built"
 msgstr "ビルド対象となるモジュールだけでなくすべてのモジュールの一覧を表示する"
 
-#: ../jhbuild/commands/base.py:459
+#: jhbuild/commands/base.py:457
 msgid "Conflicting options specified ('--start-at' and '--all-modules')"
 msgstr "Conflicting options specified ('--start-at' and '--all-modules')"
 
-#: ../jhbuild/commands/base.py:491
+#: jhbuild/commands/base.py:489
 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:492 jhbuild/commands/base.py:525
+#: jhbuild/commands/info.py:43 jhbuild/commands/uninstall.py:34
 msgid "[ modules ... ]"
 msgstr "[ modules ... ]"
 
-#: ../jhbuild/commands/base.py:500
+#: jhbuild/commands/base.py:498
 msgid "add dotted lines to soft dependencies"
 msgstr "å¼±ã„ä¾å­˜é–¢ä¿‚ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’è¿½åŠ ã™ã‚‹"
 
-#: ../jhbuild/commands/base.py:503
+#: jhbuild/commands/base.py:501
 msgid "group modules from metamodule together"
 msgstr "メタモジュール内のモジュールをグループ化する"
 
-#: ../jhbuild/commands/bootstrap.py:24
+#: jhbuild/commands/base.py:522
+msgid "Run post-install triggers for named modules (or all)"
+msgstr ""
+
+#: jhbuild/commands/bootstrap.py:25
 msgid "Build support tools"
 msgstr "サポートツールをビルドする"
 
-#: ../jhbuild/commands/bot.py:54
+#: jhbuild/commands/bot.py:34
 msgid "Control buildbot"
 msgstr "Control 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 "[ options ... ]"
 
-#: ../jhbuild/commands/bot.py:63
+#: jhbuild/commands/bot.py:43
 msgid "setup a buildbot environment"
 msgstr "setup a buildbot environment"
 
-#: ../jhbuild/commands/bot.py:66
+#: jhbuild/commands/bot.py:46
 msgid "start a buildbot slave server"
 msgstr "start a buildbot slave server"
 
-#: ../jhbuild/commands/bot.py:69
+#: jhbuild/commands/bot.py:49
 msgid "stop a buildbot slave server"
 msgstr "stop a buildbot slave server"
 
-#: ../jhbuild/commands/bot.py:72
+#: jhbuild/commands/bot.py:52
 msgid "start a buildbot master server"
 msgstr "start a buildbot master server"
 
-#: ../jhbuild/commands/bot.py:75
+#: jhbuild/commands/bot.py:55
 msgid "reload a buildbot master server configuration"
 msgstr "reload a buildbot master server configuration"
 
-#: ../jhbuild/commands/bot.py:78
+#: jhbuild/commands/bot.py:58
 msgid "stop a buildbot master server"
 msgstr "stop a buildbot master server"
 
-#: ../jhbuild/commands/bot.py:81
+#: jhbuild/commands/bot.py:61
 msgid "start as daemon"
 msgstr "start as daemon"
 
-#: ../jhbuild/commands/bot.py:84
+#: jhbuild/commands/bot.py:64
 msgid "PID file location"
 msgstr "PID file location"
 
-#: ../jhbuild/commands/bot.py:87
+#: jhbuild/commands/bot.py:67
 msgid "log file location"
 msgstr "log file location"
 
-#: ../jhbuild/commands/bot.py:90
+#: jhbuild/commands/bot.py:70
 msgid "directory with slave files (only with --start-server)"
 msgstr "directory with slave files (only with --start-server)"
 
-#: ../jhbuild/commands/bot.py:93
+#: jhbuild/commands/bot.py:73
 msgid "directory with buildbot work files (only with --start-server)"
 msgstr "directory with buildbot work files (only with --start-server)"
 
-#: ../jhbuild/commands/bot.py:96
+#: jhbuild/commands/bot.py:76
 msgid "master cfg file location (only with --start-server)"
 msgstr "master cfg file location (only with --start-server)"
 
-#: ../jhbuild/commands/bot.py:99
+#: jhbuild/commands/bot.py:79
 msgid "exec a buildbot step (internal use only)"
 msgstr "exec a buildbot step (internal use only)"
 
-#: ../jhbuild/commands/bot.py:118
-msgid "buildbot and twisted not found, run jhbuild bot --setup"
-msgstr "buildbot and twisted not found, run jhbuild bot --setup"
-
-#: ../jhbuild/commands/bot.py:295
-#, python-format
-msgid "No description for slave %s."
-msgstr "No description for slave %s."
-
-#. parse error
-#: ../jhbuild/commands/bot.py:300
-#, python-format
-msgid "Failed to parse slave config for %s."
-msgstr "Failed to parse slave config for %s."
-
-#: ../jhbuild/commands/bot.py:807 ../jhbuild/commands/bot.py:815
-msgid "failed to get buildbot PID"
-msgstr "failed to get buildbot PID"
+#: jhbuild/commands/bot.py:83
+msgid "buildbot commands are no longer supported"
+msgstr ""
 
-#: ../jhbuild/commands/checkbranches.py:28
-msgid "Check modules in GNOME Git repository have the correct branch definition"
-msgstr "GNOME Git リポジトリのモジュールに正しいブランチ定義があるかチェックする"
+#: 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 is missing branch definition for %(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 is unreachable (%(href)s)"
 
-#: ../jhbuild/commands/checkmodulesets.py:46
+#: jhbuild/commands/checkmodulesets.py:43
 #, python-format
 msgid "Cannot check %(module)s (%(href)s)"
 msgstr "Cannot check %(module)s (%(href)s)"
 
-#: ../jhbuild/commands/clean.py:29
+#: jhbuild/commands/clean.py:30
 msgid "Clean all modules"
 msgstr "すべてのモジュールに対して clean を行う"
 
-#: ../jhbuild/commands/goalreport.py:328
+#: jhbuild/commands/extdeps.py:70
+msgid "Report details on GNOME external dependencies"
+msgstr ""
+
+#: jhbuild/commands/extdeps.py:98
+msgid "External deps for GNOME"
+msgstr ""
+
+#: jhbuild/commands/extdeps.py:104
+#, python-format
+msgid "External deps for GNOME %s"
+msgstr ""
+
+#: jhbuild/commands/extdeps.py:138
+msgid "patched"
+msgstr ""
+
+#: jhbuild/commands/extdeps.py:142
+#, python-format
+msgid "and %d others."
+msgstr ""
+
+#: jhbuild/commands/goalreport.py:333
 msgid "Report GNOME modules status wrt various goals"
 msgstr "Report GNOME modules status wrt various goals"
 
-#: ../jhbuild/commands/goalreport.py:351
+#: jhbuild/commands/goalreport.py:356
 msgid "check to perform"
 msgstr "check to perform"
 
-#: ../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 ""
+
+#: jhbuild/commands/info.py:66
 #, python-format
 msgid "unknown module %s"
 msgstr "unknown module %s"
 
-#: ../jhbuild/commands/info.py:60
+#: jhbuild/commands/info.py:88
 msgid "Name:"
 msgstr "Name:"
 
-#: ../jhbuild/commands/info.py:61
+#: jhbuild/commands/info.py:89
 msgid "Module Set:"
 msgstr "Module Set:"
 
-#: ../jhbuild/commands/info.py:62
+#: jhbuild/commands/info.py:90
 msgid "Type:"
 msgstr "Type:"
 
-#: ../jhbuild/commands/info.py:65 ../jhbuild/commands/info.py:69
+#: jhbuild/commands/info.py:93 jhbuild/commands/info.py:97
 msgid "Install version:"
 msgstr "Install version:"
 
-#: ../jhbuild/commands/info.py:66 ../jhbuild/commands/info.py:70
+#: jhbuild/commands/info.py:94 jhbuild/commands/info.py:98
 msgid "Install date:"
 msgstr "Install date:"
 
-#: ../jhbuild/commands/info.py:69 ../jhbuild/commands/info.py:70
+#: jhbuild/commands/info.py:97 jhbuild/commands/info.py:98
 msgid "not installed"
 msgstr "not installed"
 
-#: ../jhbuild/commands/info.py:75
+#: jhbuild/commands/info.py:103
 msgid "CVS Root:"
 msgstr "CVS Root:"
 
-#: ../jhbuild/commands/info.py:76
+#: jhbuild/commands/info.py:104
 msgid "CVS Module:"
 msgstr "CVS Module:"
 
-#: ../jhbuild/commands/info.py:78
+#: jhbuild/commands/info.py:106
 msgid "CVS Revision:"
 msgstr "CVS Revision:"
 
-#: ../jhbuild/commands/info.py:80
+#: jhbuild/commands/info.py:108
 msgid "Subversion Module:"
 msgstr "Subversion Module:"
 
-#: ../jhbuild/commands/info.py:82
+#: jhbuild/commands/info.py:110
 msgid "Darcs Archive:"
 msgstr "Darcs Archive:"
 
-#: ../jhbuild/commands/info.py:84
+#: jhbuild/commands/info.py:112
 msgid "Git Module:"
 msgstr "Git Module:"
 
-#: ../jhbuild/commands/info.py:86
+#: jhbuild/commands/info.py:114
 msgid "Git Origin Module:"
 msgstr "Git Origin Module:"
 
-#: ../jhbuild/commands/info.py:90
+#: jhbuild/commands/info.py:118
 msgid "Git Branch:"
 msgstr "Git Branch:"
 
-#: ../jhbuild/commands/info.py:92
+#: jhbuild/commands/info.py:120
 msgid "Git Tag:"
 msgstr "Git Tag:"
 
-#: ../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 "Version:"
 
-#: ../jhbuild/commands/info.py:98
+#: jhbuild/commands/info.py:126
 msgid "Tree-ID:"
 msgstr "Tree-ID:"
 
-#: ../jhbuild/commands/info.py:103
+#: jhbuild/commands/info.py:131
 msgid "Sourcedir:"
 msgstr "Sourcedir:"
 
-#: ../jhbuild/commands/info.py:109
+#: jhbuild/commands/info.py:137
 msgid "Requires:"
 msgstr "Requires:"
 
-#: ../jhbuild/commands/info.py:113
+#: jhbuild/commands/info.py:141
 msgid "Required by:"
 msgstr "Required by:"
 
-#: ../jhbuild/commands/info.py:115
+#: jhbuild/commands/info.py:143
 msgid "Suggests:"
 msgstr "Suggests:"
 
-#: ../jhbuild/commands/info.py:117
+#: jhbuild/commands/info.py:145
 msgid "After:"
 msgstr "After:"
 
-#: ../jhbuild/commands/info.py:121
+#: jhbuild/commands/info.py:149
 msgid "Before:"
 msgstr "Before:"
 
-#: ../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 "required=%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 "installed=%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 "Required packages:"
 
-#: ../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 "  System installed packages which are too old:"
 
-#: ../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 "    (none)"
 
-#: ../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 "  No matching system package installed:"
 
-#: ../jhbuild/commands/__init__.py:134
+#: jhbuild/commands/__init__.py:142
 msgid "JHBuild commands are:"
 msgstr "JHBuild commands are:"
 
-#: ../jhbuild/commands/__init__.py:140
+#: jhbuild/commands/__init__.py:148
 msgid "For more information run \"jhbuild <command> --help\""
-msgstr "ã‚ˆã‚Šè©³ç´°ãªæƒ…å ±ã«ã¤ã„ã¦ã¯ \"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 "no such command (did you mean \"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 "no such command (did you mean \"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 "The current directory is not in the checkout root %r"
 
-#: ../jhbuild/commands/make.py:90
+#: jhbuild/commands/make.py:88
 #, python-format
 msgid "No module matching current directory %r in the moduleset"
 msgstr "No module matching current directory %r in the moduleset"
 
-#: ../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 "[ module ]"
 
-#: ../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 "no extra arguments expected"
 
-#: ../jhbuild/commands/sanitycheck.py:58
+#: jhbuild/commands/sanitycheck.py:55
 #, python-format
 msgid "checkout root (%s) is not writable"
 msgstr "checkout root (%s) is not writable"
 
-#: ../jhbuild/commands/sanitycheck.py:61
+#: jhbuild/commands/sanitycheck.py:58
 #, python-format
 msgid "install prefix (%s) is not writable"
 msgstr "install prefix (%s) is not writable"
 
-#: ../jhbuild/commands/sanitycheck.py:66 ../jhbuild/commands/sanitycheck.py:69
-#: ../jhbuild/commands/sanitycheck.py:72 ../jhbuild/commands/sanitycheck.py:75
-#: ../jhbuild/commands/sanitycheck.py:78
-#: ../jhbuild/commands/sanitycheck.py:120
-#: ../jhbuild/commands/sanitycheck.py:124
-#: ../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:480 jhbuild/versioncontrol/hg.py:105
+#: jhbuild/versioncontrol/mtn.py:142 jhbuild/versioncontrol/svn.py:322
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../jhbuild/commands/sanitycheck.py:87
-#, python-format
-msgid "aclocal can't see %s macros"
-msgstr "aclocal can't see %s macros"
-
-#: ../jhbuild/commands/sanitycheck.py:92
-#, python-format
-msgid "Please copy the lacking macros (%(macros)s) in one of the following paths: %(path)s"
-msgstr "Please copy the lacking macros (%(macros)s) in one of the following paths: %(path)s"
-
-#: ../jhbuild/commands/sanitycheck.py:100
-msgid "Could not find XML catalog"
-msgstr "Could not find XML catalog"
+#: jhbuild/commands/sanitycheck.py:89
+msgid ""
+"Could not find XML catalog (usually part of the package 'libxml2-utils')"
+msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:109
-#, python-format
-msgid "Could not find %s in XML catalog"
+#: jhbuild/commands/sanitycheck.py:99
+#, fuzzy, python-format
+#| msgid "Could not find %s in XML catalog"
+msgid ""
+"Could not find %s in XML catalog (usually part of package 'docbook-xsl')"
 msgstr "Could not find %s in XML catalog"
 
-#: ../jhbuild/commands/sanitycheck.py:116
+#: jhbuild/commands/sanitycheck.py:106
 #, python-format
-msgid "Could not find the Perl module %s"
-msgstr "Could not find the Perl module %s"
+msgid ""
+"Could not find the Perl module %s (usually part of package 'libxml-parser-"
+"perl' or 'perl-XML-Parser')"
+msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:128
+#: jhbuild/commands/sanitycheck.py:111
 msgid "curl or wget not found"
 msgstr "curl or wget not found"
 
-#: ../jhbuild/commands/sanitycheck.py:137
+#: jhbuild/commands/sanitycheck.py:120
 msgid "Installed git program is not the right git"
 msgstr "Installed git program is not the right git"
 
-#: ../jhbuild/commands/sanitycheck.py:143
+#: jhbuild/commands/sanitycheck.py:126
 msgid "Could not check git program"
 msgstr "Could not check git program"
 
-#: ../jhbuild/commands/snapshot.py:34
+#: jhbuild/commands/sanitycheck.py:156
+#, python-format
+msgid "aclocal can't see %s macros"
+msgstr "aclocal can't see %s macros"
+
+#: jhbuild/commands/sanitycheck.py:161
+#, python-format
+msgid ""
+"Please copy the lacking macros (%(macros)s) in one of the following paths: "
+"%(path)s"
+msgstr ""
+"Please copy the lacking macros (%(macros)s) in one of the following paths: "
+"%(path)s"
+
+#: jhbuild/commands/snapshot.py:31
 msgid "Print out a moduleset for the exact versions that are checked out"
 msgstr "Print out a moduleset for the exact versions that are checked out"
 
-#: ../jhbuild/commands/sysdeps.py:32
+#: jhbuild/commands/sysdeps.py:38
 msgid "Check and install tarball dependencies using system packages"
-msgstr "システムパッケージを使用する依存モジュールのチェック、およびインストールを行う"
+msgstr ""
+"システムパッケージを使用する依存モジュールのチェック、およびインストールを行"
+"う"
+
+#: jhbuild/commands/sysdeps.py:46
+msgid "Machine readable list of missing sysdeps"
+msgstr ""
 
-#: ../jhbuild/commands/sysdeps.py:40
+#: 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 ファイルを提供するモジュールをインストールする"
+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 ""
+
+#: jhbuild/commands/sysdeps.py:137
 msgid "System installed packages which are new enough:"
 msgstr "System installed packages which are new enough:"
 
-#: ../jhbuild/commands/sysdeps.py:78 ../jhbuild/commands/sysdeps.py:148
+#: jhbuild/commands/sysdeps.py:146
 msgid "  (none)"
 msgstr "  (none)"
 
-#: ../jhbuild/commands/sysdeps.py:123
+#: jhbuild/commands/sysdeps.py:179
 msgid "Optional packages: (JHBuild will build the missing packages)"
 msgstr "Optional packages: (JHBuild will build the missing packages)"
 
-#: ../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 is required to install packages on this system. Please install %(cmd)s."
+msgid ""
+"%(cmd)s is required to install packages on this system. Please install "
+"%(cmd)s."
+msgstr ""
+"%(cmd)s is required to install packages on this system. Please install "
+"%(cmd)s."
 
-#: ../jhbuild/commands/sysdeps.py:161
+#: jhbuild/commands/sysdeps.py:215
 msgid "Don't know how to install packages on this system"
 msgstr "Don't know how to install packages on this system"
 
-#: ../jhbuild/commands/sysdeps.py:165
+#: jhbuild/commands/sysdeps.py:218
 #, python-format
 msgid "No uninstalled system dependencies to install for modules: %r"
 msgstr "No uninstalled system dependencies to install for modules: %r"
 
-#: ../jhbuild/commands/sysdeps.py:167
+#: jhbuild/commands/sysdeps.py:220
 #, python-format
 msgid "Installing dependencies on system: %s"
 msgstr "Installing dependencies on system: %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 "output directory for tinderbox build not specified"
 
-#: ../jhbuild/commands/twoninetynine.py:161
+#: jhbuild/commands/twoninetynine.py:162
 msgid "Report GNOME modules status wrt 3.0 goals"
 msgstr "Report GNOME modules status wrt 3.0 goals"
 
-#: ../jhbuild/commands/uninstall.py:31
+#: jhbuild/commands/uninstall.py:31
 msgid "Uninstall all modules"
 msgstr "すべてのモジュールに対して uninstall を行う"
 
-#: ../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 "unknown module %s and no default repository to try an automatic module"
 
-#: ../jhbuild/commands/uninstall.py:64
+#: jhbuild/commands/uninstall.py:64
 #, python-format
 msgid "Module %(mod)r is not installed"
 msgstr "Module %(mod)r is not installed"
 
-#: ../jhbuild/config.py:174
-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 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)"
-
-#: ../jhbuild/config.py:186
-msgid "Obsolete JHBuild start script, make sure it is removed then do run 'make install'"
-msgstr "Obsolete JHBuild start script, make sure it is removed then do run 'make install'"
+#: jhbuild/config.py:91
+#, python-format
+msgid "Invalid condition set modifier: '%s'.  Must start with '+' or '-'."
+msgstr ""
 
-#: ../jhbuild/config.py:194
+#: jhbuild/config.py:114
 msgid "could not load config defaults"
 msgstr "could not load config defaults"
 
-#: ../jhbuild/config.py:205
+#: jhbuild/config.py:123
 #, python-format
 msgid "could not load config file, %s is missing"
 msgstr "could not load config file, %s is missing"
 
-#: ../jhbuild/config.py:211
+#: 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 "The default location of the configuration file has changed. Please move %(old_path)s to 
%(new_path)s."
+msgid ""
+"The default location of the configuration file has changed. Please move "
+"%(old_path)s to %(new_path)s."
+msgstr ""
+"The default location of the configuration file has changed. Please move "
+"%(old_path)s to %(new_path)s."
 
-#: ../jhbuild/config.py:241
+#: jhbuild/config.py:188
 #, python-format
 msgid "Could not include config file (%s)"
 msgstr "Could not include config file (%s)"
 
-#: ../jhbuild/config.py:255
+#: jhbuild/config.py:202
 msgid "could not load config file"
 msgstr "could not load config file"
 
-#: ../jhbuild/config.py:269
+#: jhbuild/config.py:216
 #, python-format
 msgid "unknown keys defined in configuration file: %s"
 msgstr "unknown keys defined in configuration file: %s"
 
-#: ../jhbuild/config.py:276
+#: jhbuild/config.py:223
 #, python-format
-msgid "the \"%s\" configuration variable is deprecated, you should use \"repos['gnome.org']\"."
-msgstr "the \"%s\" configuration variable is deprecated, you should use \"repos['gnome.org']\"."
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use "
+"\"repos['gnome.org']\"."
+msgstr ""
+"the \"%s\" configuration variable is deprecated, you should use "
+"\"repos['gnome.org']\"."
 
-#: ../jhbuild/config.py:281 ../jhbuild/config.py:286
+#: jhbuild/config.py:228 jhbuild/config.py:233
 #, python-format
-msgid "the \"%s\" configuration variable is deprecated, you should use \"repos\"."
-msgstr "the \"%s\" configuration variable is deprecated, you should use \"repos\"."
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos\"."
+msgstr ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos\"."
 
-#: ../jhbuild/config.py:320
+#: jhbuild/config.py:267
 msgid "invalid checkout mode"
 msgstr "invalid checkout mode"
 
-#: ../jhbuild/config.py:324
+#: jhbuild/config.py:271
 #, python-format
 msgid "invalid checkout mode (module: %s)"
 msgstr "invalid checkout mode (module: %s)"
 
-#: ../jhbuild/config.py:326
+#: jhbuild/config.py:273
 msgid "copy mode requires copy_dir to be set"
 msgstr "copy mode requires copy_dir to be set"
 
-#: ../jhbuild/config.py:331
+#: jhbuild/config.py:278
 #, python-format
 msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
 msgstr "modulesets directory (%s) not found, disabling use_local_modulesets"
 
-#: ../jhbuild/config.py:337 ../jhbuild/config.py:339 ../jhbuild/config.py:341
-#: ../jhbuild/config.py:343 ../jhbuild/config.py:346
+#: 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 must be an absolute path"
 
-#: ../jhbuild/config.py:359
+#: jhbuild/config.py:304
 #, python-format
 msgid "install prefix (%s) can not be created"
 msgstr "install prefix (%s) can not be created"
 
-#: ../jhbuild/config.py:366
+#: jhbuild/config.py:311
 #, python-format
 msgid "working directory (%s) can not be created"
 msgstr "working directory (%s) can not be created"
 
-#: ../jhbuild/config.py:482
-#, python-format
-msgid "Can't create %s directory"
-msgstr "Can't create %s directory"
-
-#: ../jhbuild/config.py:513
-#, python-format
-msgid "Unable to determine python version using the PYTHON environment variable (%s). Using default \"%s\""
-msgstr "Unable to determine python version using the PYTHON environment variable (%s). Using default \"%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 "Unable to determine python site-packages directory using the PYTHON environment variable (%s). Using 
default \"%s\""
-
-#: ../jhbuild/config.py:575
-#, python-format
-msgid "Could not create GConf config (%s)"
-msgstr "Could not create GConf config (%s)"
+#: jhbuild/config.py:314
+msgid ""
+"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 ""
 
-#: ../jhbuild/config.py:667
+#: jhbuild/config.py:392
 msgid "Failed to parse 'min_age' relative time"
 msgstr "Failed to parse 'min_age' relative time"
 
-#: ../jhbuild/config.py:681
-msgid "quiet mode has been disabled because the Python curses module is missing."
-msgstr "quiet mode has been disabled because the Python curses module is missing."
+#: jhbuild/config.py:407
+msgid ""
+"quiet mode has been disabled because the Python curses module is missing."
+msgstr ""
+"quiet mode has been disabled because the Python curses module is missing."
 
-#: ../jhbuild.desktop.in.in.h:1
+#: jhbuild.desktop.in.in:4
 msgid "GNOME Build Tool"
 msgstr "GNOME Build Tool"
 
-#: ../jhbuild.desktop.in.in.h:2
+#: jhbuild.desktop.in.in:5
 msgid "Build GNOME modules"
 msgstr "Build GNOME modules"
 
-#: ../jhbuild/frontends/autobuild.py:72
+#: jhbuild/frontends/autobuild.py:78
 #, python-format
 msgid "Server Error, retrying in %d seconds"
 msgstr "Server Error, retrying in %d seconds"
 
-#: ../jhbuild/frontends/autobuild.py:76
+#: jhbuild/frontends/autobuild.py:82
 msgid "Server Error, aborting"
 msgstr "Server Error, aborting"
 
-#: ../jhbuild/frontends/autobuild.py:180
+#: jhbuild/frontends/autobuild.py:188
 #, python-format
 msgid "Error: %s"
 msgstr "Error: %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 "Error running %s"
 
-#: ../jhbuild/frontends/autobuild.py:212
+#: jhbuild/frontends/autobuild.py:220
 msgid "ERROR: Wrong credentials, please check username/password"
 msgstr "ERROR: Wrong credentials, please check username/password"
 
-#: ../jhbuild/frontends/autobuild.py:218
+#: jhbuild/frontends/autobuild.py:226
 #, python-format
 msgid "Starting Build #%s"
 msgstr "Starting Build #%s"
 
-#: ../jhbuild/frontends/autobuild.py:232
+#: jhbuild/frontends/autobuild.py:240
 #, python-format
 msgid "**** Starting module %s ****"
 msgstr "**** Starting module %s ****"
 
-#: ../jhbuild/frontends/buildscript.py:42
+#: jhbuild/frontends/buildscript.py:44
 #, python-format
 msgid "install prefix (%s) must be writable"
 msgstr "install prefix (%s) must be writable"
 
-#: ../jhbuild/frontends/buildscript.py:49
+#: jhbuild/frontends/buildscript.py:51
 #, python-format
 msgid "checkout root (%s) can not be created"
 msgstr "checkout root (%s) can not be created"
 
-#: ../jhbuild/frontends/buildscript.py:51
+#: jhbuild/frontends/buildscript.py:53
 #, python-format
 msgid "checkout root (%s) must be writable"
 msgstr "checkout root (%s) must be writable"
 
-#: ../jhbuild/frontends/buildscript.py:58
+#: jhbuild/frontends/buildscript.py:60
 #, python-format
 msgid "checkout copy dir (%s) can not be created"
 msgstr "checkout copy dir (%s) can not be created"
 
-#: ../jhbuild/frontends/buildscript.py:60
+#: jhbuild/frontends/buildscript.py:62
 #, python-format
 msgid "checkout copy dir (%s) must be writable"
 msgstr "checkout copy dir (%s) must be writable"
 
-#: ../jhbuild/frontends/buildscript.py:110
+#: jhbuild/frontends/buildscript.py:69
+#, fuzzy, python-format
+#| msgid "checkout copy dir (%s) can not be created"
+msgid "checkout export dir (%s) can not be created"
+msgstr "checkout copy dir (%s) can not be created"
+
+#: jhbuild/frontends/buildscript.py:71
+#, fuzzy, python-format
+#| msgid "checkout copy dir (%s) must be writable"
+msgid "checkout export dir (%s) must be writable"
+msgstr "checkout copy dir (%s) must be writable"
+
+#: jhbuild/frontends/buildscript.py:120
 #, python-format
 msgid "Skipping %s (installed recently)"
 msgstr "Skipping %s (installed recently)"
 
-#: ../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 "module %(mod)s will be built even though %(dep)s failed"
 
-#: ../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 "module %(mod)s not built due to non buildable %(dep)s"
 
-#: ../jhbuild/frontends/buildscript.py:246
+#: jhbuild/frontends/buildscript.py:251
+#, python-format
+msgid "Ignoring uninstalled package: %s"
+msgstr ""
+
+#: jhbuild/frontends/buildscript.py:270
 #, python-format
 msgid "Running post-installation trigger script: %r"
 msgstr "Running post-installation trigger script: %r"
 
-#: ../jhbuild/frontends/buildscript.py:254 ../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 returned with an error code (%(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:283
+#: 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:310
+#: 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:312
+#: 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:314
+#: 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:315
+#: 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:324
+#: 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 died with signal %(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 invalid key %(key)s"
 
-#: ../jhbuild/frontends/terminal.py:236
+#: jhbuild/frontends/terminal.py:265
 msgid ""
 "\n"
 "Conflicts during checkout:\n"
@@ -1091,375 +1179,433 @@ msgstr ""
 "Conflicts during checkout:\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 "########## Error running %s"
 
-#: ../jhbuild/frontends/terminal.py:274
+#: jhbuild/frontends/terminal.py:307
 msgid "success"
 msgstr "success"
 
-#: ../jhbuild/frontends/terminal.py:276
+#: jhbuild/frontends/terminal.py:309
 msgid "the following modules were not built"
 msgstr "the following modules were not built"
 
-#: ../jhbuild/frontends/terminal.py:298 ../jhbuild/frontends/tinderbox.py:415
+#: jhbuild/frontends/terminal.py:331 jhbuild/frontends/tinderbox.py:375
 msgid "automatically retrying configure"
 msgstr "automatically retrying configure"
 
-#: ../jhbuild/frontends/terminal.py:302 ../jhbuild/frontends/tinderbox.py:420
+#: jhbuild/frontends/terminal.py:335 jhbuild/frontends/tinderbox.py:380
 msgid "automatically forcing a fresh checkout"
 msgstr "automatically forcing a fresh checkout"
 
-#: ../jhbuild/frontends/terminal.py:316
+#: jhbuild/frontends/terminal.py:349
 msgid "Start shell"
 msgstr "Start shell"
 
-#: ../jhbuild/frontends/terminal.py:317
+#: jhbuild/frontends/terminal.py:350
 msgid "Reload configuration"
 msgstr "Reload configuration"
 
-#: ../jhbuild/frontends/terminal.py:326
+#: jhbuild/frontends/terminal.py:359
 msgid "choice: "
 msgstr "choice: "
 
-#: ../jhbuild/frontends/terminal.py:341
+#: jhbuild/frontends/terminal.py:382
 msgid "exit shell to continue with build"
 msgstr "exit shell to continue with build"
 
-#: ../jhbuild/frontends/terminal.py:351
+#: jhbuild/frontends/terminal.py:397
 msgid "invalid choice"
 msgstr "invalid choice"
 
-#: ../jhbuild/frontends/terminal.py:359
+#: jhbuild/frontends/terminal.py:405
 msgid "Type \"yes\" to confirm the action: "
 msgstr "Type \"yes\" to confirm the action: "
 
-#: ../jhbuild/frontends/terminal.py:362
+#: 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 "You should not run jhbuild as root.\n"
 
-#: ../jhbuild/main.py:106
+#: jhbuild/main.py:68
 msgid "%prog [ -f config ] command [ options ... ]"
 msgstr "%prog [ -f config ] command [ options ... ]"
 
-#: ../jhbuild/main.py:108
-msgid "Build a set of modules from diverse repositories in correct dependency order (such as GNOME)."
-msgstr "様々なリポジトリにあるモジュールを適切な依存関係に基づいてビルドします (GNOME など)"
+#: 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:157
+#: 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:129
 msgid "Interrupted"
 msgstr "Interrupted"
 
-#: ../jhbuild/main.py:160
+#: jhbuild/main.py:132
 msgid "EOF"
 msgstr "EOF"
 
-#: ../jhbuild/modtypes/autotools.py:224 ../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 "Configuring"
 
-#: ../jhbuild/modtypes/autotools.py:264 ../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 "Cleaning"
 
-#: ../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
+#: 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 "Building"
 
-#: ../jhbuild/modtypes/autotools.py:307 ../jhbuild/modtypes/waf.py:113
+#: jhbuild/modtypes/autotools.py:289 jhbuild/modtypes/meson.py:135
+#: jhbuild/modtypes/waf.py:110
 msgid "Checking"
 msgstr "Checking"
 
-#: ../jhbuild/modtypes/autotools.py:320 ../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 "Creating tarball for"
 
-#: ../jhbuild/modtypes/autotools.py:329
+#: jhbuild/modtypes/autotools.py:305
 msgid "Dist checking"
 msgstr "Dist checking"
 
-#: ../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
+#: 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 "Installing"
 
-#: ../jhbuild/modtypes/autotools.py:367
+#: jhbuild/modtypes/autotools.py:339
 msgid "Distcleaning"
 msgstr "Distcleaning"
 
-#: ../jhbuild/modtypes/__init__.py:60
+#: jhbuild/modtypes/autotools.py:375
+#, python-format
+msgid "<%s/> tag must contain value=''"
+msgstr ""
+
+#: jhbuild/modtypes/__init__.py:60
 #, python-format
 msgid "unknown module type %s"
 msgstr "unknown module type %s"
 
-#: ../jhbuild/modtypes/__init__.py:77
+#: jhbuild/modtypes/__init__.py:77
 #, python-format
 msgid "dep node for module %s is missing package attribute"
 msgstr "dep node for module %s is missing package attribute"
 
-#: ../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 "%(node)s node for %(module)s module is missing %(attribute)s attribute"
 
-#: ../jhbuild/modtypes/__init__.py:139
+#: jhbuild/modtypes/__init__.py:143
 #, python-format
 msgid "no <branch> element found for %s"
 msgstr "no <branch> element found for %s"
 
-#: ../jhbuild/modtypes/__init__.py:148
+#: jhbuild/modtypes/__init__.py:152
 #, python-format
-msgid "Repository=%(missing)s not found for module id=%(module)s. Possible repositories are %(possible)s"
-msgstr "Repository=%(missing)s not found for module id=%(module)s. Possible repositories are %(possible)s"
+msgid ""
+"Repository=%(missing)s not found for module id=%(module)s. Possible "
+"repositories are %(possible)s"
+msgstr ""
+"Repository=%(missing)s not found for module id=%(module)s. Possible "
+"repositories are %(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 "No repository for module id=%(module)s. Either set branch/repo or default repository."
+msgid ""
+"No repository for module id=%(module)s. Either set branch/repo or default "
+"repository."
+msgstr ""
+"No repository for module id=%(module)s. Either set branch/repo or default "
+"repository."
 
-#: ../jhbuild/modtypes/__init__.py:227
+#: jhbuild/modtypes/__init__.py:228
 #, python-format
 msgid "Deleting .la file: %r"
 msgstr "Deleting .la file: %r"
 
-#: ../jhbuild/modtypes/__init__.py:312
+#: jhbuild/modtypes/__init__.py:250
+#, fuzzy, python-format
+#| msgid "Deleting .la file: %r"
+msgid "Deleting dir file: %r"
+msgstr "Deleting .la file: %r"
+
+#: jhbuild/modtypes/__init__.py:320
 #, python-format
 msgid "Moving temporary DESTDIR %r into build prefix"
 msgstr "Moving temporary DESTDIR %r into build prefix"
 
-#: ../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 "Files remaining in buildroot %(dest)r; module may have installed files outside of prefix."
+msgid ""
+"Files remaining in buildroot %(dest)r; module may have installed files "
+"outside of prefix."
+msgstr ""
+"Files remaining in buildroot %(dest)r; module may have installed files "
+"outside of prefix."
 
-#: ../jhbuild/modtypes/__init__.py:352
+#: jhbuild/modtypes/__init__.py:360
 #, python-format
 msgid "Module failed to install into DESTDIR %(dest)r"
 msgstr "Module failed to install into DESTDIR %(dest)r"
 
-#: ../jhbuild/modtypes/__init__.py:362
+#: jhbuild/modtypes/__init__.py:376
 #, python-format
 msgid "%d files remaining from previous build"
 msgstr "%d files remaining from previous build"
 
-#: ../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 "Deleted: %(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 "Failed to delete no longer installed file %(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. The errors are:\n"
+"Install encountered errors: %(num)d errors raised, %(files)d files copied. "
+"The errors are:\n"
 "  %(err)s"
 msgstr ""
-"Install encountered errors: %(num)d errors raised, %(files)d files copied. The errors are:\n"
+"Install encountered errors: %(num)d errors raised, %(files)d files copied. "
+"The errors are:\n"
 "  %(err)s"
 
-#: ../jhbuild/modtypes/__init__.py:385
+#: jhbuild/modtypes/__init__.py:399
 #, python-format
 msgid "Install complete: %d files copied"
 msgstr "Install complete: %d files copied"
 
-#: ../jhbuild/modtypes/__init__.py:433
+#: jhbuild/modtypes/__init__.py:447
 #, python-format
 msgid "Skipping %s (not updated)"
 msgstr "Skipping %s (not updated)"
 
-#: ../jhbuild/modtypes/__init__.py:445
+#: jhbuild/modtypes/__init__.py:459
 #, python-format
 msgid "Skipping %s (package and dependencies not updated)"
 msgstr "Skipping %s (package and dependencies not updated)"
 
-#: ../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 ""
+
+#: jhbuild/modtypes/__init__.py:617 jhbuild/modtypes/__init__.py:643
+#: jhbuild/modtypes/linux.py:82 jhbuild/modtypes/linux.py:89
 msgid "Checking out"
 msgstr "Checking out"
 
-#: ../jhbuild/modtypes/__init__.py:538
+#: jhbuild/modtypes/__init__.py:621
 #, python-format
 msgid "source directory %s was not created"
 msgstr "source directory %s was not created"
 
-#: ../jhbuild/modtypes/__init__.py:555
+#: jhbuild/modtypes/__init__.py:646
 msgid "wipe directory and start over"
 msgstr "wipe directory and start over"
 
-#: ../jhbuild/modtypes/linux.py:45
+#: jhbuild/modtypes/linux.py:46
 #, python-format
 msgid "kconfig file %s was not created"
 msgstr "kconfig file %s was not created"
 
-#: ../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 "Installing kernel"
 
-#: ../jhbuild/modtypes/linux.py:185
+#: jhbuild/modtypes/linux.py:186
 msgid "Installing modules"
 msgstr "Installing modules"
 
-#: ../jhbuild/modtypes/linux.py:200
+#: jhbuild/modtypes/linux.py:201
 msgid "Installing kernel headers"
 msgstr "Installing kernel headers"
 
-#: ../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. Possible repositories are 
%(possible)s"
-msgstr "Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. Possible repositories are 
%(possible)s"
+msgid ""
+"Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. "
+"Possible repositories are %(possible)s"
+msgstr ""
+"Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. "
+"Possible repositories are %(possible)s"
 
-#: ../jhbuild/modtypes/linux.py:246
+#: jhbuild/modtypes/linux.py:248
 #, python-format
-msgid "Default repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. Possible repositories 
are %(possible)s"
-msgstr "Default repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. Possible repositories 
are %(possible)s"
+msgid ""
+"Default repository=%(missing)s not found for kconfig in linux id="
+"%(linux_id)s. Possible repositories are %(possible)s"
+msgstr ""
+"Default repository=%(missing)s not found for kconfig in linux id="
+"%(linux_id)s. Possible repositories are %(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 '%(module)s' has invalid size attribute ('%(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 packages are required but could not be found"
-
-#: ../jhbuild/moduleset.py:79
+#: jhbuild/moduleset.py:91
 #, python-format
 msgid "fixed case of module '%(orig)s' to '%(new)s'"
 msgstr "fixed case of module '%(orig)s' to '%(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 has a dependency on unknown \"%(invalid)s\" module"
 
-#: ../jhbuild/moduleset.py:131
+#: jhbuild/moduleset.py:143
 #, python-format
 msgid "Circular dependencies detected: %s"
 msgstr "Circular dependencies detected: %s"
 
-#: ../jhbuild/moduleset.py:282
+#: jhbuild/moduleset.py:292
 msgid "Unknown module:"
 msgstr "Unknown module:"
 
-#: ../jhbuild/moduleset.py:385
+#: jhbuild/moduleset.py:431
+msgid "<if> must have exactly one of condition-set='' or condition-unset=''"
+msgstr ""
+
+#: jhbuild/moduleset.py:450
 #, python-format
 msgid "could not download %s: %s"
 msgstr "could not download %s: %s"
 
-#: ../jhbuild/moduleset.py:390 ../jhbuild/moduleset.py:392
+#: jhbuild/moduleset.py:455 jhbuild/moduleset.py:457
 #, python-format
 msgid "failed to parse %s: %s"
 msgstr "failed to parse %s: %s"
 
-#: ../jhbuild/moduleset.py:419
+#: jhbuild/moduleset.py:492
 msgid "Duplicate repository:"
 msgstr "Duplicate repository:"
 
-#: ../jhbuild/moduleset.py:522
-#, 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 "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."
-
-#: ../jhbuild/monkeypatch.py:102
+#: jhbuild/moduleset.py:595
 #, python-format
-msgid "Invalid placeholder in string: line %d, col %d"
-msgstr "Invalid placeholder in string: line %d, col %d"
-
-#: ../jhbuild/monkeypatch.py:107 ../jhbuild/monkeypatch.py:133
-msgid "Too many positional arguments"
-msgstr "Too many positional arguments"
-
-#: ../jhbuild/monkeypatch.py:127 ../jhbuild/monkeypatch.py:160
-msgid "Unrecognized named group in pattern"
-msgstr "Unrecognized named group in pattern"
+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 ""
+"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."
 
-#: ../jhbuild/utils/cmds.py:40
+#: jhbuild/utils/cmds.py:42
 msgid "Call to undefined command"
 msgstr "Call to undefined command"
 
-#: ../jhbuild/utils/httpcache.py:185
+#: jhbuild/utils/httpcache.py:182
 msgid "file not in cache, but not allowed to check network"
 msgstr "file not in cache, but not allowed to check network"
 
-#: ../jhbuild/utils/lockfile.py:108
-#, python-format
-msgid "Removing stale lock left by no longer extant pid %(pid)d, uid %(uid)d"
-msgstr "Removing stale lock left by no longer extant 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 "Lock %(path)r taken by pid %(pid)d; waiting for it to exit.  Press Control-C to interrupt."
-
-#: ../jhbuild/utils/packagedb.py:75
+#: jhbuild/utils/packagedb.py:66
 #, python-format
 msgid "package %s has files with embedded new lines"
 msgstr "package %s has files with embedded new lines"
 
-#: ../jhbuild/utils/packagedb.py:158
-msgid "Package DB modified externally, rereading"
-msgstr "Package DB modified externally, rereading"
-
-#: ../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 "no manifest for '%s', can't uninstall.  Try building again, then uninstalling."
+msgid ""
+"no manifest for '%s', can't uninstall.  Try building again, then "
+"uninstalling."
+msgstr ""
+"no manifest for '%s', can't uninstall.  Try building again, then "
+"uninstalling."
 
-#: ../jhbuild/utils/packagedb.py:286
+#: jhbuild/utils/packagedb.py:222
 #, python-format
 msgid "Failed to delete %(file)r: %(msg)s"
 msgstr "Failed to delete %(file)r: %(msg)s"
 
-#: ../jhbuild/utils/systeminstall.py:134
-msgid "No suitable root privilege command found; you should install \"pkexec\""
-msgstr "No suitable root privilege command found; you should install \"pkexec\""
+#: jhbuild/utils/systeminstall.py:233
+#, fuzzy
+#| msgid ""
+#| "No suitable root privilege command found; you should install \"pkexec\""
+msgid ""
+"No suitable root privilege command found; you should install \"sudo\" or "
+"\"pkexec\" (or the system package that provides it)"
+msgstr ""
+"No suitable root privilege command found; you should install \"pkexec\""
 
-#: ../jhbuild/utils/systeminstall.py:166 ../jhbuild/utils/systeminstall.py:169
+#: jhbuild/utils/systeminstall.py:262 jhbuild/utils/systeminstall.py:265
 #, python-format
 msgid "PackageKit: %s"
 msgstr "PackageKit: %s"
 
-#: ../jhbuild/utils/systeminstall.py:245
+#: jhbuild/utils/systeminstall.py:272
+msgid "Error: python-gobject package not found."
+msgstr ""
+
+#: jhbuild/utils/systeminstall.py:278
+msgid "Error: dbus-python package not found."
+msgstr ""
+
+#: jhbuild/utils/systeminstall.py:295
+#, fuzzy
+#| msgid "Using yum to install packages.  Please wait."
+msgid "Computing packages to install. This might be slow. Please wait."
+msgstr "Using yum to install packages.  Please wait."
+
+#: jhbuild/utils/systeminstall.py:325
 msgid "Nothing available to install"
 msgstr "Nothing available to install"
 
-#: ../jhbuild/utils/systeminstall.py:248
+#: jhbuild/utils/systeminstall.py:328
 #, python-format
 msgid ""
 "Installing:\n"
@@ -1468,73 +1614,127 @@ msgstr ""
 "Installing:\n"
 "  %s"
 
-#: ../jhbuild/utils/systeminstall.py:254
+#: 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 ""
+
+#: jhbuild/utils/systeminstall.py:335
 msgid "Complete!"
 msgstr "Complete!"
 
-#: ../jhbuild/utils/systeminstall.py:265
-msgid "Using yum to install packages.  Please wait."
-msgstr "Using yum to install packages.  Please wait."
+#: jhbuild/utils/systeminstall.py:348
+msgid "pkgfile not found, automatically installing"
+msgstr ""
 
-#: ../jhbuild/utils/systeminstall.py:268
-#, python-format
-msgid ""
-"Installing:\n"
-"  %(pkgs)s"
+#: jhbuild/utils/systeminstall.py:350
+#, fuzzy
+#| msgid "Failed to unpack %s (empty file?)"
+msgid "Failed to install pkgfile"
+msgstr "Failed to unpack %s (empty file?)"
+
+#: jhbuild/utils/systeminstall.py:356
+msgid "pkgfile cache is old or doesn't exist, automatically updating"
 msgstr ""
-"Installing:\n"
-"  %(pkgs)s"
 
-#: ../jhbuild/utils/systeminstall.py:278 ../jhbuild/utils/systeminstall.py:328
+#: jhbuild/utils/systeminstall.py:359
+#, fuzzy
+#| msgid "Unable to create file $srcdir/Makefile.inc"
+msgid "Failed to create pkgfile cache"
+msgstr "Unable to create file $srcdir/Makefile.inc"
+
+#: jhbuild/utils/systeminstall.py:362
+#, fuzzy
+#| msgid "Failed to unpack %s"
+msgid "Failed to update pkgfile cache"
+msgstr "Failed to unpack %s"
+
+#: jhbuild/utils/systeminstall.py:364
+msgid "Successfully updated pkgfile cache"
+msgstr ""
+
+#: jhbuild/utils/systeminstall.py:369
+#, fuzzy
+#| msgid "Using yum to install packages.  Please wait."
+msgid "Using pacman to install packages.  Please wait."
+msgstr "Using yum to install packages.  Please wait."
+
+#: jhbuild/utils/systeminstall.py:373 jhbuild/utils/systeminstall.py:391
+#: jhbuild/utils/systeminstall.py:546
 msgid "Nothing to install"
 msgstr "Nothing to install"
 
-#: ../jhbuild/utils/systeminstall.py:309
-msgid "Using apt-file to search for providers; this may be slow.  Please wait."
-msgstr "Using apt-file to search for providers; this may be slow.  Please wait."
+#: jhbuild/utils/systeminstall.py:388
+#, python-format
+msgid "Provider for \"%s\" was not found, ignoring"
+msgstr ""
+
+#: jhbuild/utils/systeminstall.py:396
+#, fuzzy
+#| msgid "Install date:"
+msgid "Install failed"
+msgstr "Install date:"
+
+#: jhbuild/utils/systeminstall.py:398
+#, fuzzy
+#| msgid "Complete!"
+msgid "Completed!"
+msgstr "Complete!"
 
-#: ../jhbuild/utils/systeminstall.py:318
+#: jhbuild/utils/systeminstall.py:480 jhbuild/utils/systeminstall.py:491
+#: jhbuild/utils/systeminstall.py:505
 #, python-format
 msgid "No native package found for %(id)s (%(filename)s)"
 msgstr "No native package found for %(id)s (%(filename)s)"
 
-#: ../jhbuild/utils/systeminstall.py:323
+#: jhbuild/utils/systeminstall.py:510
 #, python-format
 msgid "Installing: %(pkgs)s"
 msgstr "Installing: %(pkgs)s"
 
-#: ../jhbuild/utils/trigger.py:57
+#: jhbuild/utils/systeminstall.py:520
+#, fuzzy
+#| msgid ""
+#| "Using apt-file to search for providers; this may be slow.  Please wait."
+msgid ""
+"Using apt-file to search for providers; this may be extremely slow. Please "
+"wait. Patience!"
+msgstr ""
+"Using apt-file to search for providers; this may be slow.  Please wait."
+
+#: jhbuild/utils/trigger.py:55
 #, python-format
 msgid "No keys specified in trigger script %r"
 msgstr "No keys specified in trigger script %r"
 
-#: ../jhbuild/utils/unpack.py:145
+#: jhbuild/utils/unpack.py:145
 #, python-format
 msgid "Failed to unpack %s (unknown archive type)"
 msgstr "Failed to unpack %s (unknown archive type)"
 
-#: ../jhbuild/utils/unpack.py:147
+#: jhbuild/utils/unpack.py:147
 #, python-format
 msgid "Failed to unpack %s"
 msgstr "Failed to unpack %s"
 
-#: ../jhbuild/utils/unpack.py:153
+#: jhbuild/utils/unpack.py:153
 #, python-format
 msgid "Failed to unpack %s (empty file?)"
 msgstr "Failed to unpack %s (empty file?)"
 
-#: ../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 "branch for %(name)s has wrong override, check your %(filename)s"
 
-#: ../jhbuild/versioncontrol/bzr.py:119
+#: jhbuild/versioncontrol/bzr.py:124
 msgid "attribute is deprecated. Use revspec instead."
 msgstr "attribute is deprecated. Use revspec instead."
 
-#: ../jhbuild/versioncontrol/bzr.py:175
+#: jhbuild/versioncontrol/bzr.py:179
 #, python-format
 msgid ""
 "\n"
@@ -1545,78 +1745,95 @@ msgstr ""
 "Path %s does not seem to be a checkout from dvcs_mirror_dir.\n"
 "Remove it or change your dvcs_mirror_dir settings."
 
-#: ../jhbuild/versioncontrol/cvs.py:104
-#, python-format
-msgid "could not log into %s\n"
+#: jhbuild/versioncontrol/cvs.py:104
+#, fuzzy, python-format
+#| msgid "could not log into %s\n"
+msgid "could not log into %s"
 msgstr "could not log into %s\n"
 
-#: ../jhbuild/versioncontrol/cvs.py:122
+#: jhbuild/versioncontrol/cvs.py:122
 #, python-format
 msgid "%s is not managed by CVS"
 msgstr "%s is not managed by 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\" does not appear to be a CVS working copy"
 
-#: ../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 "working copy points at the wrong repository (expected %(root1)s but got %(root2)s). "
+msgid ""
+"working copy points at the wrong repository (expected %(root1)s but got "
+"%(root2)s). "
+msgstr ""
+"working copy points at the wrong repository (expected %(root1)s but got "
+"%(root2)s). "
 
-#: ../jhbuild/versioncontrol/cvs.py:279
+#: jhbuild/versioncontrol/cvs.py:284
 msgid "Consider using the changecvsroot.py script to fix this."
 msgstr "Consider using the changecvsroot.py script to fix this."
 
-#: ../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:592 jhbuild/versioncontrol/git.py:632
+#: jhbuild/versioncontrol/git.py:708 jhbuild/versioncontrol/hg.py:89
+#: jhbuild/versioncontrol/hg.py:95
 msgid "date based checkout not yet supported\n"
 msgstr "date based checkout not yet supported\n"
 
-#: ../jhbuild/versioncontrol/git.py:111
+#: jhbuild/versioncontrol/git.py:110
 msgid "ignored bad branch redefinition for module:"
 msgstr "ignored bad branch redefinition for module:"
 
-#: ../jhbuild/versioncontrol/git.py:201
+#: jhbuild/versioncontrol/git.py:203
 msgid "Need at least git-1.5.6 from June/08 to operate"
 msgstr "Need at least git-1.5.6 from June/08 to operate"
 
-#: ../jhbuild/versioncontrol/git.py:215
+#: jhbuild/versioncontrol/git.py:217
 msgid "Unexpected: Checkoutdir is not a git repository:"
 msgstr "Unexpected: Checkoutdir is not a git repository:"
 
-#: ../jhbuild/versioncontrol/git.py:271
+#: jhbuild/versioncontrol/git.py:274
 #, python-format
-msgid "The requested branch \"%s\" is not available. Neither locally, nor remotely in the origin remote."
-msgstr "The requested branch \"%s\" is not available. Neither locally, nor remotely in the origin remote."
+msgid ""
+"The requested branch \"%s\" is not available. Neither locally, nor remotely "
+"in the origin remote."
+msgstr ""
+"The requested branch \"%s\" is not available. Neither locally, nor remotely "
+"in the origin remote."
 
-#: ../jhbuild/versioncontrol/git.py:279
+#: jhbuild/versioncontrol/git.py:282
 msgid "Refusing to switch a dirty tree."
 msgstr "Refusing to switch a dirty tree."
 
-#: ../jhbuild/versioncontrol/git.py:357
+#: jhbuild/versioncontrol/git.py:360
 #, python-format
 msgid "Command %s returned no output"
 msgstr "Command %s returned no output"
 
-#: ../jhbuild/versioncontrol/git.py:362
+#: jhbuild/versioncontrol/git.py:365
 #, python-format
 msgid "Command %s did not include commit line: %r"
 msgstr "Command %s did not include commit line: %r"
 
-#: ../jhbuild/versioncontrol/git.py:429
-msgid "Failed to update module as it switched to git (you should check for changes then remove the 
directory)."
-msgstr "Failed to update module as it switched to git (you should check for changes then remove the 
directory)."
+#: jhbuild/versioncontrol/git.py:452
+msgid ""
+"Failed to update module as it switched to git (you should check for changes "
+"then remove the directory)."
+msgstr ""
+"Failed to update module as it switched to git (you should check for changes "
+"then remove the directory)."
 
-#: ../jhbuild/versioncontrol/git.py:430
-msgid "Failed to update module (missing .git) (you should check for changes then remove the directory)."
-msgstr "Failed to update module (missing .git) (you should check for changes then remove the directory)."
+#: jhbuild/versioncontrol/git.py:453
+msgid ""
+"Failed to update module (missing .git) (you should check for changes then "
+"remove the directory)."
+msgstr ""
+"Failed to update module (missing .git) (you should check for changes then "
+"remove the directory)."
 
-#: ../jhbuild/versioncontrol/git.py:534
+#: jhbuild/versioncontrol/git.py:557
 msgid ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
@@ -1624,143 +1841,237 @@ msgstr ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
 
-#: ../jhbuild/versioncontrol/git.py:579
+#: jhbuild/versioncontrol/git.py:604
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr "Cannot get last revision from %s. Check the module location."
 
-#: ../jhbuild/versioncontrol/__init__.py:196
+#: jhbuild/versioncontrol/__init__.py:197
 #, python-format
 msgid "unknown repository type %s"
 msgstr "unknown repository type %s"
 
-#: ../jhbuild/versioncontrol/mtn.py:93
+#: jhbuild/versioncontrol/mtn.py:93
 #, python-format
 msgid "Initializing %s"
 msgstr "Initializing %s"
 
-#: ../jhbuild/versioncontrol/mtn.py:101
+#: jhbuild/versioncontrol/mtn.py:101
 #, python-format
 msgid "Pulling branch %(branch)s from %(server)s"
 msgstr "Pulling branch %(branch)s from %(server)s"
 
-#: ../jhbuild/versioncontrol/mtn.py:119
+#: jhbuild/versioncontrol/mtn.py:119
 #, python-format
 msgid "branch %(branch)s has %(num)d heads"
 msgstr "branch %(branch)s has %(num)d heads"
 
-#: ../jhbuild/versioncontrol/mtn.py:125
+#: jhbuild/versioncontrol/mtn.py:125
 #, python-format
 msgid "Checking out branch '%(branch)s' to directory '%(dir)s'"
 msgstr "Checking out branch '%(branch)s' to directory '%(dir)s'"
 
-#: ../jhbuild/versioncontrol/mtn.py:134
+#: jhbuild/versioncontrol/mtn.py:134
 #, python-format
 msgid "Updating working copy %s"
 msgstr "Updating working copy %s"
 
-#: ../jhbuild/versioncontrol/svn.py:74
+#: jhbuild/versioncontrol/svn.py:75
 msgid "Getting SVN subdirs: this operation might be long..."
 msgstr "Getting SVN subdirs: this operation might be long..."
 
-#: ../jhbuild/versioncontrol/svn.py:97
+#: jhbuild/versioncontrol/svn.py:100
 #, python-format
 msgid "could not get Subversion URI for %s"
 msgstr "could not get Subversion URI for %s"
 
-#: ../jhbuild/versioncontrol/svn.py:100
+#: jhbuild/versioncontrol/svn.py:103
 #, python-format
 msgid "could not parse \"svn info\" output for %s"
 msgstr "could not parse \"svn info\" output for %s"
 
-#: ../jhbuild/versioncontrol/svn.py:309
+#: jhbuild/versioncontrol/svn.py:318
 msgid "Error checking for conflicts"
 msgstr "Error checking for conflicts"
 
-#: ../jhbuild/versioncontrol/tarball.py:90
+#: jhbuild/versioncontrol/tarball.py:90
 #, python-format
 msgid "branch for %s is not correct, check the moduleset file."
 msgstr "branch for %s is not correct, check the moduleset file."
 
-#: ../jhbuild/versioncontrol/tarball.py:126
+#: jhbuild/versioncontrol/tarball.py:132
 #, python-format
 msgid "URL has no filename component: %s"
 msgstr "URL has no filename component: %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:169
+#: jhbuild/versioncontrol/tarball.py:174
 msgid "file not downloaded"
 msgstr "file not downloaded"
 
-#: ../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 "downloaded file size is incorrect (expected %(size1)d, got %(size2)d)"
 
-#: ../jhbuild/versioncontrol/tarball.py:180
+#: jhbuild/versioncontrol/tarball.py:185
 #, python-format
 msgid "invalid hash attribute on module %s"
 msgstr "invalid hash attribute on module %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:193
+#: jhbuild/versioncontrol/tarball.py:198
 #, python-format
 msgid "file hash is incorrect (expected %(sum1)s, got %(sum2)s)"
 msgstr "file hash is incorrect (expected %(sum1)s, got %(sum2)s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:196
+#: jhbuild/versioncontrol/tarball.py:201
 #, python-format
 msgid "skipped hash check (missing support for %s)"
 msgstr "skipped hash check (missing support for %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:210
+#: jhbuild/versioncontrol/tarball.py:205
+#, python-format
+msgid "tarball dir (%s) must be writable"
+msgstr "tarball dir (%s) must be writable"
+
+#: jhbuild/versioncontrol/tarball.py:217
 msgid "unable to find wget or curl"
 msgstr "unable to find wget or curl"
 
-#: ../jhbuild/versioncontrol/tarball.py:226
+#: jhbuild/versioncontrol/tarball.py:233
 #, python-format
 msgid "tarball dir (%s) can not be created"
 msgstr "tarball dir (%s) can not be created"
 
-#: ../jhbuild/versioncontrol/tarball.py:228
-#, python-format
-msgid "tarball dir (%s) must be writable"
-msgstr "tarball dir (%s) must be writable"
-
-#: ../jhbuild/versioncontrol/tarball.py:240
+#: jhbuild/versioncontrol/tarball.py:245
 #, python-format
 msgid "failed to unpack %s"
 msgstr "failed to unpack %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:243
+#: jhbuild/versioncontrol/tarball.py:248
 #, python-format
 msgid "could not unpack tarball (expected %s dir)"
 msgstr "could not unpack tarball (expected %s dir)"
 
-#: ../jhbuild/versioncontrol/tarball.py:258
+#: jhbuild/versioncontrol/tarball.py:265
 #, python-format
 msgid "could not download patch (error: %s)"
 msgstr "could not download patch (error: %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:260
+#: jhbuild/versioncontrol/tarball.py:267
 msgid "could not download patch"
 msgstr "could not download patch"
 
-#: ../jhbuild/versioncontrol/tarball.py:292
+#: jhbuild/versioncontrol/tarball.py:299
 #, python-format
 msgid "Failed to find patch: %s"
 msgstr "Failed to find patch: %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:294
+#: jhbuild/versioncontrol/tarball.py:309
 msgid "Applying patch"
 msgstr "Applying patch"
 
-#: ../jhbuild/versioncontrol/tarball.py:302
+#: jhbuild/versioncontrol/tarball.py:317
 msgid "unable to find quilt"
 msgstr "unable to find quilt"
 
-#: ../jhbuild/versioncontrol/tarball.py:313
+#: jhbuild/versioncontrol/tarball.py:328
 msgid "could not checkout quilt patch set"
 msgstr "could not checkout quilt patch set"
 
+#~ msgid "gnome-autogen.sh not available"
+#~ msgstr "gnome-autogen.sh not available"
+
+#~ msgid "yelp-tools not available"
+#~ msgstr "yelp-tools not available"
+
+#~ msgid "buildbot and twisted not found, run jhbuild bot --setup"
+#~ msgstr "buildbot and twisted not found, run jhbuild bot --setup"
+
+#~ msgid "No description for slave %s."
+#~ msgstr "No description for slave %s."
+
+#~ msgid "Failed to parse slave config for %s."
+#~ msgstr "Failed to parse slave config for %s."
+
+#~ msgid "failed to get buildbot PID"
+#~ msgstr "failed to get buildbot PID"
+
+#~ msgid "Could not find XML catalog"
+#~ msgstr "Could not find XML catalog"
+
+#~ msgid "Could not find the Perl module %s"
+#~ msgstr "Could not find the Perl module %s"
+
+#~ 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 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)"
+
+#~ msgid ""
+#~ "Obsolete JHBuild start script, make sure it is removed then do run 'make "
+#~ "install'"
+#~ msgstr ""
+#~ "Obsolete JHBuild start script, make sure it is removed then do run 'make "
+#~ "install'"
+
+#~ msgid "Can't create %s directory"
+#~ msgstr "Can't create %s directory"
+
+#~ msgid ""
+#~ "Unable to determine python version using the PYTHON environment variable "
+#~ "(%s). Using default \"%s\""
+#~ msgstr ""
+#~ "Unable to determine python version using the PYTHON environment variable "
+#~ "(%s). Using default \"%s\""
+
+#~ msgid ""
+#~ "Unable to determine python site-packages directory using the PYTHON "
+#~ "environment variable (%s). Using default \"%s\""
+#~ msgstr ""
+#~ "Unable to determine python site-packages directory using the PYTHON "
+#~ "environment variable (%s). Using default \"%s\""
+
+#~ msgid "Could not create GConf config (%s)"
+#~ msgstr "Could not create GConf config (%s)"
+
+#~ msgid "Python XML packages are required but could not be found"
+#~ msgstr "Python XML packages are required but could not be found"
+
+#~ msgid "Invalid placeholder in string: line %d, col %d"
+#~ msgstr "Invalid placeholder in string: line %d, col %d"
+
+#~ msgid "Too many positional arguments"
+#~ msgstr "Too many positional arguments"
+
+#~ msgid "Unrecognized named group in pattern"
+#~ msgstr "Unrecognized named group in pattern"
+
+#~ msgid ""
+#~ "Removing stale lock left by no longer extant pid %(pid)d, uid %(uid)d"
+#~ msgstr ""
+#~ "Removing stale lock left by no longer extant 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 ""
+#~ "Lock %(path)r taken by pid %(pid)d; waiting for it to exit.  Press "
+#~ "Control-C to interrupt."
+
+#~ msgid "Package DB modified externally, rereading"
+#~ msgstr "Package DB modified externally, rereading"
+
+#~ msgid ""
+#~ "Installing:\n"
+#~ "  %(pkgs)s"
+#~ msgstr ""
+#~ "Installing:\n"
+#~ "  %(pkgs)s"
+
 #~ msgid "Failed to rename %(src)r to %(dest)r: %(msg)s"
 #~ msgstr "Failed to rename %(src)r to %(dest)r: %(msg)s"