[jhbuild] Update British English translation
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Update British English translation
- Date: Tue, 20 Sep 2016 14:11:57 +0000 (UTC)
commit 4c16244052eff909e458992e38387561187306db
Author: David King <amigadave amigadave com>
Date: Tue Sep 20 16:07:15 2016 +0200
Update British English translation
po/en_GB.po | 1361 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 735 insertions(+), 626 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index c381cf0..486651d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,1147 +2,1179 @@
# Copyright (C) 2009 jhbuild's COPYRIGHT HOLDER
# This file is distributed under the same license as the jhbuild package.
# Philip Withnall <philip tecnocode co uk>, 2009, 2010.
-# Chris Leonard <cjlhomeaddress gmail com>, 2012.
+#
msgid ""
msgstr ""
"Project-Id-Version: jhbuild master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=jhbuil";
-"d&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-12 12:57+0000\n"
-"PO-Revision-Date: 2012-09-30 10:43-0400\n"
-"Last-Translator: Chris Leonard <cjlhomeaddress gmail com>\n"
-"Language-Team: Sugar Labs\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=jhbuild&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-09-16 21:46+0000\n"
+"PO-Revision-Date: 2016-09-20 15:58+0200\n"
+"Last-Translator: David King <amigadave amigadave com>\n"
+"Language-Team: British English <en_GB li org>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
-"X-Project-Style: gnome\n"
-#: ../autogen.sh:103
+#: autogen.sh:103
#, sh-format
msgid "Configuring $PKG_NAME without autotools"
msgstr "Configuring $PKG_NAME without autotools"
-#: ../autogen.sh:115 ../autogen.sh:120
+#: autogen.sh:120 autogen.sh:125
#, sh-format
msgid "Unable to create file $srcdir/Makefile.inc"
msgstr "Unable to create file $srcdir/Makefile.inc"
-#: ../autogen.sh:140
+#: autogen.sh:143
#, sh-format
-msgid "Unable to copy $srcdir/Makefile.plain to $srcdir/Makefile"
-msgstr "Unable to copy $srcdir/Makefile.plain to $srcdir/Makefile"
+msgid "Unable to read file $makefile"
+msgstr "Unable to read file $makefile"
-#: ../autogen.sh:145
+#: autogen.sh:148
+#, sh-format
+msgid "Unable to copy $makefile to $srcdir/Makefile"
+msgstr "Unable to copy $makefile to $srcdir/Makefile"
+
+#: autogen.sh:153
#, sh-format
msgid "Now type `make' to compile $PKG_NAME"
msgstr "Now type `make' to compile $PKG_NAME"
-#: ../autogen.sh:181
-#, 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"
+#: autogen.sh:268
+msgid "WARNING: aclocal not available (usually part of package 'autoconf')"
+msgstr "WARNING: aclocal not available (usually part of package 'autoconf')"
+
+#: autogen.sh:271
+msgid "WARNING: automake not available (usually part of package 'automake')"
+msgstr "WARNING: automake not available (usually part of package 'automake')"
-#: ../autogen.sh:205
-msgid "gnome-autogen.sh not available"
-msgstr "gnome-autogen.sh not available"
+#: autogen.sh:274
+msgid "WARNING: autopoint not available (usually part of package 'gettext')"
+msgstr "WARNING: autopoint not available (usually part of package 'gettext')"
-#: ../autogen.sh:208
-msgid "yelp-tools not available"
-msgstr "yelp-tools not available"
+#: autogen.sh:277
+msgid "WARNING: pkg-config not available (usually part of package 'pkgconfig')"
+msgstr "WARNING: pkg-config not available (usually part of package 'pkgconfig')"
-#: ../jhbuild/commands/autobuild.py:28
+#: autogen.sh:280
+msgid ""
+"WARNING: yelp-tools not available (usually part of package 'yelp-tools')"
+msgstr ""
+"WARNING: yelp-tools not available (usually part of package 'yelp-tools')"
+
+#: jhbuild/commands/autobuild.py:28
msgid "Build modules non-interactively and upload results to JhAutobuild"
msgstr "Build modules non-interactively and upload results to JhAutobuild"
-#: ../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:36 jhbuild/commands/base.py:172
+#: jhbuild/commands/base.py:283 jhbuild/commands/make.py:42
+#: jhbuild/commands/tinderbox.py:38
+msgid "always run autogen.sh"
+msgstr "always run 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
msgid "run make clean before make"
msgstr "run make clean before make"
-#: ../jhbuild/commands/autobuild.py:42 ../jhbuild/commands/base.py:187
-#: ../jhbuild/commands/base.py:298
+#: jhbuild/commands/autobuild.py:42 jhbuild/commands/base.py:187
+#: jhbuild/commands/base.py:298
msgid "run make distcheck after building"
msgstr "run make distcheck after building"
-#: ../jhbuild/commands/autobuild.py:45 ../jhbuild/commands/base.py:47
-#: ../jhbuild/commands/base.py:199 ../jhbuild/commands/base.py:450
-#: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:53
+#: 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
msgid "treat the given modules as up to date"
msgstr "treat the given modules as up-to-date"
-#: ../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:202
+#: jhbuild/commands/clean.py:41 jhbuild/commands/tinderbox.py:56
msgid "start building at the given module"
msgstr "start building at the given module"
-#: ../jhbuild/commands/autobuild.py:51
+#: jhbuild/commands/autobuild.py:51
msgid "jhautobuild report URL"
msgstr "jhautobuild report URL"
-#: ../jhbuild/commands/autobuild.py:54
+#: jhbuild/commands/autobuild.py:54
msgid "verbose mode"
msgstr "verbose mode"
-#: ../jhbuild/commands/autobuild.py:71
-msgid "report url for autobuild not specified"
+#: 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:488
-#: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:94
+#: 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
#, python-format
msgid "%s not in module list"
msgstr "%s not in module list"
-#: ../jhbuild/commands/base.py:38
+#: jhbuild/commands/base.py:38
msgid "Update all modules from version control"
msgstr "Update all modules from version control"
-#: ../jhbuild/commands/base.py:41 ../jhbuild/commands/base.py:89
-#: ../jhbuild/commands/base.py:123 ../jhbuild/commands/base.py:166
-#: ../jhbuild/commands/base.py:277 ../jhbuild/commands/base.py:441
-#: ../jhbuild/commands/tinderbox.py:32
+#: 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
msgid "[ options ... ] [ modules ... ]"
msgstr "[ options … ] [ modules … ]"
-#: ../jhbuild/commands/base.py:50
-#| msgid "start building at the given module"
+#: jhbuild/commands/base.py:50
msgid "start updating at the given module"
msgstr "start updating at the given module"
-#: ../jhbuild/commands/base.py:53
-#| msgid "build only modules with the given tags"
+#: jhbuild/commands/base.py:53
msgid "update only modules with the given tags"
msgstr "update only modules with the given tags"
-#: ../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:56 jhbuild/commands/base.py:95
+#: jhbuild/commands/base.py:208 jhbuild/commands/base.py:307
+#: jhbuild/commands/tinderbox.py:59
msgid "set a sticky date when checking out modules"
msgstr "set a sticky date when checking out modules"
-#: ../jhbuild/commands/base.py:59 ../jhbuild/commands/base.py:190
-#: ../jhbuild/commands/base.py:459
+#: jhbuild/commands/base.py:59 jhbuild/commands/base.py:190
+#: jhbuild/commands/base.py:446
msgid "ignore all soft-dependencies"
msgstr "ignore all soft-dependencies"
-#: ../jhbuild/commands/base.py:86
+#: jhbuild/commands/base.py:86
msgid "Update one or more modules from version control"
msgstr "Update one or more modules from version control"
-#: ../jhbuild/commands/base.py:104 ../jhbuild/commands/base.py:142
-#: ../jhbuild/commands/base.py:382 ../jhbuild/commands/base.py:399
-#: ../jhbuild/commands/rdepends.py:52 ../jhbuild/moduleset.py:164
+#: jhbuild/commands/base.py:104 jhbuild/commands/base.py:142
+#: jhbuild/commands/base.py:383 jhbuild/commands/rdepends.py:52
+#: jhbuild/moduleset.py:180
#, 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:339 ../jhbuild/commands/rdepends.py:47
-#: ../jhbuild/commands/uninstall.py:46
+#: 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
msgid "This command requires a module parameter."
msgstr "This command requires a module parameter."
-#: ../jhbuild/commands/base.py:120
+#: jhbuild/commands/base.py:120
msgid "Clean one or more modules"
msgstr "Clean one or more modules"
-#: ../jhbuild/commands/base.py:129
+#: jhbuild/commands/base.py:129
msgid "honour the makeclean setting in config file"
msgstr "honour the makeclean setting in config file"
-#: ../jhbuild/commands/base.py:132 ../jhbuild/commands/base.py:175
-#: ../jhbuild/commands/base.py:289 ../jhbuild/commands/tinderbox.py:41
+#: jhbuild/commands/base.py:132 jhbuild/commands/base.py:175
+#: jhbuild/commands/base.py:289 jhbuild/commands/tinderbox.py:41
msgid "completely clean source tree"
msgstr "completely clean source tree"
-#: ../jhbuild/commands/base.py:149
+#: jhbuild/commands/base.py:149
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:163
msgid "Update and compile all modules (the default)"
msgstr "Update and compile all modules (the default)"
-#: ../jhbuild/commands/base.py:181 ../jhbuild/commands/base.py:292
-#: ../jhbuild/commands/make.py:48
+#: jhbuild/commands/base.py:181 jhbuild/commands/base.py:292
+#: jhbuild/commands/make.py:48
msgid "run make check after building"
msgstr "run make check after building"
-#: ../jhbuild/commands/base.py:184 ../jhbuild/commands/base.py:295
+#: jhbuild/commands/base.py:184 jhbuild/commands/base.py:295
msgid "run make dist after building"
msgstr "run make dist after building"
-#: ../jhbuild/commands/base.py:193 ../jhbuild/commands/base.py:301
-#: ../jhbuild/commands/tinderbox.py:47
+#: jhbuild/commands/base.py:193 jhbuild/commands/base.py:301
+#: jhbuild/commands/tinderbox.py:47
msgid "skip version control update"
msgstr "skip version control update"
-#: ../jhbuild/commands/base.py:196 ../jhbuild/commands/base.py:304
-#: ../jhbuild/commands/make.py:51
+#: jhbuild/commands/base.py:196 jhbuild/commands/base.py:304
+#: jhbuild/commands/make.py:51
msgid "quiet (no output)"
msgstr "quiet (no output)"
-#: ../jhbuild/commands/base.py:205 ../jhbuild/commands/base.py:456
+#: jhbuild/commands/base.py:205 jhbuild/commands/base.py:443
msgid "build only modules with the given tags"
msgstr "build only modules with the given tags"
-#: ../jhbuild/commands/base.py:211 ../jhbuild/commands/base.py:310
+#: jhbuild/commands/base.py:211 jhbuild/commands/base.py:310
msgid "run tests in real X and not in Xvfb"
msgstr "run tests in real X and not in Xvfb"
-#: ../jhbuild/commands/base.py:214 ../jhbuild/commands/tinderbox.py:62
+#: jhbuild/commands/base.py:214 jhbuild/commands/tinderbox.py:62
msgid "try to force checkout and autogen on failure"
msgstr "try to force checkout and autogen on failure"
-#: ../jhbuild/commands/base.py:217 ../jhbuild/commands/tinderbox.py:65
+#: jhbuild/commands/base.py:217 jhbuild/commands/tinderbox.py:65
msgid "don't poison modules on failure"
msgstr "don't poison modules on failure"
-#: ../jhbuild/commands/base.py:220 ../jhbuild/commands/base.py:313
-#: ../jhbuild/commands/tinderbox.py:68
+#: jhbuild/commands/base.py:220 jhbuild/commands/base.py:313
+#: jhbuild/commands/tinderbox.py:68
msgid "build even if policy says not to"
msgstr "build even if policy says not to"
-#: ../jhbuild/commands/base.py:223
+#: jhbuild/commands/base.py:223
msgid "also build soft-dependencies that could be skipped"
msgstr "also build soft dependencies that could be skipped"
-#: ../jhbuild/commands/base.py:226 ../jhbuild/commands/base.py:316
+#: jhbuild/commands/base.py:226 jhbuild/commands/base.py:316
msgid "skip modules installed less than the given time ago"
msgstr "skip modules installed less than the given time ago"
-#: ../jhbuild/commands/base.py:229 ../jhbuild/commands/tinderbox.py:71
-#| msgid "ignore all soft-dependencies"
+#: jhbuild/commands/base.py:229 jhbuild/commands/tinderbox.py:71
msgid "ignore missing system dependencies"
msgstr "ignore missing system dependencies"
-#: ../jhbuild/commands/base.py:253
+#: jhbuild/commands/base.py:253
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:260 jhbuild/commands/tinderbox.py:100
#, python-format
msgid ""
"Required system dependencies not installed. Install using the command "
"%(cmd)s or to ignore system dependencies use command-line option %(opt)s"
msgstr ""
-"Required system dependencies not installed. Install using the command %"
-"(cmd)s or to ignore system dependencies use command-line option %(opt)s"
+"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:274
msgid "Update and compile one or more modules"
msgstr "Update and compile one or more modules"
-#: ../jhbuild/commands/base.py:334 ../jhbuild/commands/make.py:95
+#: jhbuild/commands/base.py:335 jhbuild/commands/make.py:95
+#: jhbuild/commands/uninstall.py:50
#, python-format
msgid ""
"module \"%(modname)s\" does not exist, created automatically using "
"repository \"%(reponame)s\""
msgstr ""
-"module \"%(modname)s\" does not exist, created automatically using repository "
-"\"%(reponame)s\""
+"module \"%(modname)s\" does not exist, created automatically using "
+"repository \"%(reponame)s\""
-#: ../jhbuild/commands/base.py:347
+#: jhbuild/commands/base.py:348
msgid "Run a command under the JHBuild environment"
msgstr "Run a command under the JHBuild environment"
-#: ../jhbuild/commands/base.py:350
+#: jhbuild/commands/base.py:351
msgid "[ options ... ] program [ arguments ... ]"
msgstr "[ options … ] program [ arguments … ]"
-#: ../jhbuild/commands/base.py:356
+#: jhbuild/commands/base.py:357
msgid "run command in build dir of the given module"
msgstr "run command in build dir of the given module"
-#: ../jhbuild/commands/base.py:359
+#: jhbuild/commands/base.py:360
msgid "run command in checkout dir of the given module"
msgstr "run command in checkout dir of the given module"
-#: ../jhbuild/commands/base.py:372 ../jhbuild/commands/base.py:416
+#: jhbuild/commands/base.py:373 jhbuild/commands/base.py:403
#, python-format
msgid "Unable to execute the command '%(command)s': %(err)s"
msgstr "Unable to execute the command '%(command)s': %(err)s"
-#: ../jhbuild/commands/base.py:390 ../jhbuild/commands/base.py:407
+#: jhbuild/commands/base.py:394
#, python-format
msgid "Unable to execute the command '%s'"
msgstr "Unable to execute the command '%s'"
-#: ../jhbuild/commands/base.py:414 ../jhbuild/frontends/gtkui.py:447
-#: ../jhbuild/frontends/terminal.py:145
+#: jhbuild/commands/base.py:401 jhbuild/frontends/gtkui.py:447
+#: jhbuild/frontends/terminal.py:146
msgid "No command given"
msgstr "No command given"
-#: ../jhbuild/commands/base.py:423
+#: jhbuild/commands/base.py:410
msgid "Start a shell under the JHBuild environment"
msgstr "Start a shell under the JHBuild environment"
-#: ../jhbuild/commands/base.py:438
+#: jhbuild/commands/base.py:425
msgid "List the modules that would be built"
msgstr "List the modules that would be built"
-#: ../jhbuild/commands/base.py:447
+#: jhbuild/commands/base.py:434
msgid "show which revision will be built"
msgstr "show which revision will be built"
-#: ../jhbuild/commands/base.py:453
+#: jhbuild/commands/base.py:440
msgid "start list at the given module"
msgstr "start list at the given module"
-#: ../jhbuild/commands/base.py:462
+#: jhbuild/commands/base.py:449
msgid "also list soft-dependencies that could be skipped"
msgstr "also list soft dependencies that could be skipped"
-#: ../jhbuild/commands/base.py:465
+#: jhbuild/commands/base.py:452
msgid "list all modules, not only those that would be built"
msgstr "list all modules, not only those that would be built"
-#: ../jhbuild/commands/base.py:472
+#: jhbuild/commands/base.py:459
msgid "Conflicting options specified ('--start-at' and '--all-modules')"
msgstr "Conflicting options specified ('--start-at' and '--all-modules')"
-#: ../jhbuild/commands/base.py:504
+#: jhbuild/commands/base.py:491
msgid "Output a Graphviz dependency graph for one or more modules"
msgstr "Output a Graphviz dependency graph for one or more modules"
-#: ../jhbuild/commands/base.py:507 ../jhbuild/commands/info.py:39
-#: ../jhbuild/commands/uninstall.py:33
+#: jhbuild/commands/base.py:494 jhbuild/commands/base.py:527
+#: jhbuild/commands/info.py:41 jhbuild/commands/uninstall.py:34
msgid "[ modules ... ]"
msgstr "[ modules … ]"
-#: ../jhbuild/commands/base.py:513
+#: jhbuild/commands/base.py:500
msgid "add dotted lines to soft dependencies"
msgstr "add dotted lines to soft dependencies"
-#: ../jhbuild/commands/base.py:516
+#: jhbuild/commands/base.py:503
msgid "group modules from metamodule together"
msgstr "group modules from metamodule together"
-#: ../jhbuild/commands/bootstrap.py:24
-#| msgid "Build required support tools"
+#: jhbuild/commands/base.py:524
+msgid "Run post-install triggers for named modules (or all)"
+msgstr "Run post-install triggers for named modules (or all)"
+
+#: jhbuild/commands/bootstrap.py:24
msgid "Build support tools"
msgstr "Build support tools"
-#: ../jhbuild/commands/bot.py:54
+#: jhbuild/commands/bot.py:54
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:57 jhbuild/commands/__init__.py:45
+#: jhbuild/commands/make.py:36
msgid "[ options ... ]"
msgstr "[ options … ]"
-#: ../jhbuild/commands/bot.py:63
+#: jhbuild/commands/bot.py:63
msgid "setup a buildbot environment"
msgstr "setup a buildbot environment"
-#: ../jhbuild/commands/bot.py:66
+#: jhbuild/commands/bot.py:66
msgid "start a buildbot slave server"
msgstr "start a buildbot slave server"
-#: ../jhbuild/commands/bot.py:69
+#: jhbuild/commands/bot.py:69
msgid "stop a buildbot slave server"
msgstr "stop a buildbot slave server"
-#: ../jhbuild/commands/bot.py:72
+#: jhbuild/commands/bot.py:72
msgid "start a buildbot master server"
msgstr "start a buildbot master server"
-#: ../jhbuild/commands/bot.py:75
+#: jhbuild/commands/bot.py:75
msgid "reload a buildbot master server configuration"
msgstr "reload a buildbot master server configuration"
-#: ../jhbuild/commands/bot.py:78
+#: jhbuild/commands/bot.py:78
msgid "stop a buildbot master server"
msgstr "stop a buildbot master server"
-#: ../jhbuild/commands/bot.py:81
+#: jhbuild/commands/bot.py:81
msgid "start as daemon"
msgstr "start as daemon"
-#: ../jhbuild/commands/bot.py:84
-msgid "pid file location"
+#: jhbuild/commands/bot.py:84
+msgid "PID file location"
msgstr "PID file location"
-#: ../jhbuild/commands/bot.py:87
+#: jhbuild/commands/bot.py:87
msgid "log file location"
msgstr "log file location"
-#: ../jhbuild/commands/bot.py:90
+#: jhbuild/commands/bot.py:90
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:93
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:96
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:99
msgid "exec a buildbot step (internal use only)"
msgstr "exec a buildbot step (internal use only)"
-#: ../jhbuild/commands/bot.py:118
+#: jhbuild/commands/bot.py:115
msgid "buildbot and twisted not found, run jhbuild bot --setup"
msgstr "buildbot and twisted not found, run jhbuild bot --setup"
-#: ../jhbuild/commands/bot.py:294
+#: jhbuild/commands/bot.py:292
#, python-format
msgid "No description for slave %s."
msgstr "No description for slave %s."
#. parse error
-#: ../jhbuild/commands/bot.py:299
+#: jhbuild/commands/bot.py:297
#, python-format
msgid "Failed to parse slave config for %s."
msgstr "Failed to parse slave config for %s."
-#: ../jhbuild/commands/bot.py:806 ../jhbuild/commands/bot.py:814
+#: jhbuild/commands/bot.py:804 jhbuild/commands/bot.py:812
msgid "failed to get buildbot PID"
msgstr "failed to get buildbot PID"
-#: ../jhbuild/commands/checkbranches.py:28
+#: jhbuild/commands/checkbranches.py:28
msgid ""
"Check modules in GNOME Git repository have the correct branch definition"
msgstr ""
"Check modules in GNOME Git repository have the correct branch definition"
-#: ../jhbuild/commands/checkbranches.py:65
+#: jhbuild/commands/checkbranches.py:65
#, 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
-msgid "Check if modules in jhbuild have the correct definition"
+#: jhbuild/commands/checkmodulesets.py:30
+msgid "Check if modules in JHBuild have the correct definition"
msgstr "Check if modules in JHBuild have the correct definition"
-#: ../jhbuild/commands/checkmodulesets.py:43
+#: jhbuild/commands/checkmodulesets.py:43
#, 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:46
#, 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:29
msgid "Clean all modules"
msgstr "Clean all modules"
-#: ../jhbuild/commands/goalreport.py:328
+#: jhbuild/commands/extdeps.py:70
+msgid "Report details on GNOME external dependencies"
+msgstr "Report details on GNOME external dependencies"
+
+#: jhbuild/commands/extdeps.py:98
+msgid "External deps for GNOME"
+msgstr "External deps for GNOME"
+
+#: jhbuild/commands/extdeps.py:104
+#, python-format
+msgid "External deps for GNOME %s"
+msgstr "External deps for GNOME %s"
+
+#: jhbuild/commands/extdeps.py:138
+msgid "patched"
+msgstr "patched"
+
+#: jhbuild/commands/extdeps.py:142
+#, python-format
+msgid "and %d others."
+msgstr "and %d others."
+
+#: jhbuild/commands/goalreport.py:328
msgid "Report GNOME modules status wrt various goals"
msgstr "Report GNOME modules status wrt various goals"
-#: ../jhbuild/commands/goalreport.py:351
-#| msgid "Could not check git program"
+#: jhbuild/commands/goalreport.py:351
msgid "check to perform"
msgstr "check to perform"
-#: ../jhbuild/commands/gui.py:30
+#: jhbuild/commands/gui.py:30
msgid "Build targets from a GUI app"
msgstr "Build targets from a GUI app"
-#: ../jhbuild/commands/info.py:36
+#: jhbuild/commands/info.py:38
msgid "Display information about one or more modules"
msgstr "Display information about one or more modules"
-#: ../jhbuild/commands/info.py:51 ../jhbuild/commands/uninstall.py:43
+#: jhbuild/commands/info.py:47
+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 ""
+"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."
+
+#: jhbuild/commands/info.py:64
#, python-format
msgid "unknown module %s"
msgstr "unknown module %s"
-#: ../jhbuild/commands/info.py:60
+#: jhbuild/commands/info.py:86
msgid "Name:"
msgstr "Name:"
-#: ../jhbuild/commands/info.py:61
+#: jhbuild/commands/info.py:87
msgid "Module Set:"
msgstr "Module Set:"
-#: ../jhbuild/commands/info.py:62
+#: jhbuild/commands/info.py:88
msgid "Type:"
msgstr "Type:"
-#: ../jhbuild/commands/info.py:65 ../jhbuild/commands/info.py:69
-#| msgid "Installing"
+#: jhbuild/commands/info.py:91 jhbuild/commands/info.py:95
msgid "Install version:"
msgstr "Install version:"
-#: ../jhbuild/commands/info.py:66 ../jhbuild/commands/info.py:70
+#: jhbuild/commands/info.py:92 jhbuild/commands/info.py:96
msgid "Install date:"
msgstr "Install date:"
-#: ../jhbuild/commands/info.py:69 ../jhbuild/commands/info.py:70
+#: jhbuild/commands/info.py:95 jhbuild/commands/info.py:96
msgid "not installed"
msgstr "not installed"
-#: ../jhbuild/commands/info.py:75
-#| msgid "CVS-Root:"
+#: jhbuild/commands/info.py:101
msgid "CVS Root:"
msgstr "CVS Root:"
-#: ../jhbuild/commands/info.py:76
-#| msgid "CVS-Module:"
+#: jhbuild/commands/info.py:102
msgid "CVS Module:"
msgstr "CVS Module:"
-#: ../jhbuild/commands/info.py:78
-#| msgid "CVS-Revision:"
+#: jhbuild/commands/info.py:104
msgid "CVS Revision:"
msgstr "CVS Revision:"
-#: ../jhbuild/commands/info.py:80
-#| msgid "Subversion-Module:"
+#: jhbuild/commands/info.py:106
msgid "Subversion Module:"
msgstr "Subversion Module:"
-#: ../jhbuild/commands/info.py:82
-#| msgid "Darcs-Archive:"
+#: jhbuild/commands/info.py:108
msgid "Darcs Archive:"
msgstr "Darcs Archive:"
-#: ../jhbuild/commands/info.py:84
-#| msgid "Git-Module:"
+#: jhbuild/commands/info.py:110
msgid "Git Module:"
msgstr "Git Module:"
-#: ../jhbuild/commands/info.py:86
-#| msgid "Git-Module:"
+#: jhbuild/commands/info.py:112
msgid "Git Origin Module:"
msgstr "Git Origin Module:"
-#: ../jhbuild/commands/info.py:90
+#: jhbuild/commands/info.py:116
msgid "Git Branch:"
msgstr "Git Branch:"
-#: ../jhbuild/commands/info.py:92
+#: jhbuild/commands/info.py:118
msgid "Git Tag:"
msgstr "Git Tag:"
-#: ../jhbuild/commands/info.py:94
+#: jhbuild/commands/info.py:120
msgid "URL:"
msgstr "URL:"
-#: ../jhbuild/commands/info.py:95
+#: jhbuild/commands/info.py:121
msgid "Version:"
msgstr "Version:"
-#: ../jhbuild/commands/info.py:98
+#: jhbuild/commands/info.py:124
msgid "Tree-ID:"
msgstr "Tree-ID:"
-#: ../jhbuild/commands/info.py:103
+#: jhbuild/commands/info.py:129
msgid "Sourcedir:"
msgstr "Sourcedir:"
-#: ../jhbuild/commands/info.py:109
+#: jhbuild/commands/info.py:135
msgid "Requires:"
msgstr "Requires:"
-#: ../jhbuild/commands/info.py:113
-#| msgid "Required-by:"
+#: jhbuild/commands/info.py:139
msgid "Required by:"
msgstr "Required by:"
-#: ../jhbuild/commands/info.py:115
+#: jhbuild/commands/info.py:141
msgid "Suggests:"
msgstr "Suggests:"
-#: ../jhbuild/commands/info.py:117
+#: jhbuild/commands/info.py:143
msgid "After:"
msgstr "After:"
-#: ../jhbuild/commands/info.py:121
+#: jhbuild/commands/info.py:147
msgid "Before:"
msgstr "Before:"
-#: ../jhbuild/commands/__init__.py:84 ../jhbuild/commands/sysdeps.py:48
+#: jhbuild/commands/__init__.py:84 jhbuild/commands/sysdeps.py:58
#, python-format
-#| msgid "Requires:"
msgid "required=%s"
msgstr "required=%s"
-#: ../jhbuild/commands/__init__.py:86 ../jhbuild/commands/sysdeps.py:50
+#: jhbuild/commands/__init__.py:86 jhbuild/commands/sysdeps.py:60
#, python-format
-#| msgid "not installed"
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:52
+#: jhbuild/commands/__init__.py:88 jhbuild/commands/sysdeps.py:62
msgid ", "
msgstr ", "
-#: ../jhbuild/commands/__init__.py:90 ../jhbuild/commands/sysdeps.py:54
+#: jhbuild/commands/__init__.py:90 jhbuild/commands/sysdeps.py:64
#, python-format
msgid "(%s)"
msgstr "(%s)"
-#: ../jhbuild/commands/__init__.py:94 ../jhbuild/commands/sysdeps.py:79
-#| msgid "Requires:"
+#: jhbuild/commands/__init__.py:94 jhbuild/commands/sysdeps.py:140
msgid "Required packages:"
msgstr "Required packages:"
-#: ../jhbuild/commands/__init__.py:95 ../jhbuild/commands/sysdeps.py:80
-#: ../jhbuild/commands/sysdeps.py:108
+#: jhbuild/commands/__init__.py:95 jhbuild/commands/sysdeps.py:141
+#: jhbuild/commands/sysdeps.py:172
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:89 ../jhbuild/commands/sysdeps.py:102
-#: ../jhbuild/commands/sysdeps.py:117
+#: jhbuild/commands/__init__.py:105 jhbuild/commands/__init__.py:117
+#: jhbuild/commands/sysdeps.py:150 jhbuild/commands/sysdeps.py:166
+#: jhbuild/commands/sysdeps.py:181 jhbuild/commands/sysdeps.py:194
msgid " (none)"
msgstr " (none)"
-#: ../jhbuild/commands/__init__.py:107 ../jhbuild/commands/sysdeps.py:91
-#: ../jhbuild/commands/sysdeps.py:119
+#: jhbuild/commands/__init__.py:107 jhbuild/commands/sysdeps.py:152
+#: jhbuild/commands/sysdeps.py:183
msgid " No matching system package installed:"
msgstr " No matching system package installed:"
-#: ../jhbuild/commands/__init__.py:134
+#: jhbuild/commands/__init__.py:134
msgid "JHBuild commands are:"
msgstr "JHBuild commands are:"
-#: ../jhbuild/commands/__init__.py:140
+#: jhbuild/commands/__init__.py:140
msgid "For more information run \"jhbuild <command> --help\""
msgstr "For more information run \"jhbuild <command> --help\""
-#: ../jhbuild/commands/__init__.py:149
-msgid "Information about available jhbuild commands"
+#: jhbuild/commands/__init__.py:149
+msgid "Information about available JHBuild commands"
msgstr "Information about available JHBuild commands"
-#: ../jhbuild/commands/__init__.py:176
+#: jhbuild/commands/__init__.py:176
#, 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:178
#, 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:33
msgid "Compile and install the module for the current directory"
msgstr "Compile and install the module for the current directory"
-#: ../jhbuild/commands/make.py:42
-msgid "always run autogen.sh"
-msgstr "always run autogen.sh"
-
-#: ../jhbuild/commands/make.py:78
+#: jhbuild/commands/make.py:78
#, 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:90
#, 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:28
msgid "Display reverse-dependencies of a module"
msgstr "Display reverse-dependencies of a module"
-#: ../jhbuild/commands/rdepends.py:31
+#: jhbuild/commands/rdepends.py:31
msgid "[ module ]"
msgstr "[ module ]"
-#: ../jhbuild/commands/rdepends.py:37
+#: jhbuild/commands/rdepends.py:37
msgid "display dependency path next to modules"
msgstr "display dependency path next to modules"
-#: ../jhbuild/commands/rdepends.py:40
+#: jhbuild/commands/rdepends.py:40
msgid "limit display to modules directly depending on given module"
msgstr "limit display to modules directly depending on given module"
-#: ../jhbuild/commands/sanitycheck.py:46
+#: jhbuild/commands/sanitycheck.py:46
msgid "Check that required support tools are available"
msgstr "Check that required support tools are available"
-#: ../jhbuild/commands/sanitycheck.py:53
+#: jhbuild/commands/sanitycheck.py:53
msgid "no extra arguments expected"
msgstr "no extra arguments expected"
-#: ../jhbuild/commands/sanitycheck.py:58
+#: jhbuild/commands/sanitycheck.py:65
#, 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:68
#, 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:206 ../jhbuild/versioncontrol/cvs.py:297
-#: ../jhbuild/versioncontrol/darcs.py:110
-#: ../jhbuild/versioncontrol/fossil.py:107
-#: ../jhbuild/versioncontrol/git.py:448 ../jhbuild/versioncontrol/hg.py:103
-#: ../jhbuild/versioncontrol/mtn.py:142 ../jhbuild/versioncontrol/svn.py:313
+#: jhbuild/commands/sanitycheck.py:75 jhbuild/commands/sanitycheck.py:78
+#: jhbuild/commands/sanitycheck.py:81 jhbuild/commands/sanitycheck.py:85
+#: jhbuild/commands/sanitycheck.py:88 jhbuild/commands/sanitycheck.py:120
+#: jhbuild/commands/sanitycheck.py:132 jhbuild/commands/sanitycheck.py:141
+#: jhbuild/commands/sanitycheck.py:147 jhbuild/commands/sanitycheck.py:149
+#: jhbuild/commands/sanitycheck.py:151 jhbuild/modtypes/cmake.py:85
+#: jhbuild/modtypes/meson.py:85 jhbuild/versioncontrol/bzr.py:218
+#: jhbuild/versioncontrol/cvs.py:304 jhbuild/versioncontrol/darcs.py:110
+#: jhbuild/versioncontrol/fossil.py:107 jhbuild/versioncontrol/git.py:461
+#: jhbuild/versioncontrol/hg.py:106 jhbuild/versioncontrol/mtn.py:142
+#: jhbuild/versioncontrol/svn.py:316
#, python-format
msgid "%s not found"
msgstr "%s not found"
-#: ../jhbuild/commands/sanitycheck.py:87
-#, python-format
-#| msgid "aclocal-%s can't see %s macros"
-msgid "aclocal can't see %s macros"
-msgstr "aclocal can't see %s macros"
+#: jhbuild/commands/sanitycheck.py:99
+msgid ""
+"Could not find XML catalog (usually part of the package 'libxml2-utils')"
+msgstr ""
+"Could not find XML catalogue (usually part of the package 'libxml2-utils')"
-#: ../jhbuild/commands/sanitycheck.py:92
+#: jhbuild/commands/sanitycheck.py:109
#, python-format
-#| msgid ""
-#| "Please copy the lacking macros (%s) in one of the following paths: %s"
msgid ""
-"Please copy the lacking macros (%(macros)s) in one of the following paths: "
-"%(path)s"
+"Could not find %s in XML catalog (usually part of package 'docbook-xsl')"
msgstr ""
-"Please copy the lacking macros (%(macros)s) in one of the following paths: %"
-"(path)s"
+"Could not find %s in XML catalog (usually part of package 'docbook-xsl')"
-#: ../jhbuild/commands/sanitycheck.py:100
-msgid "Could not find XML catalog"
-msgstr "Could not find XML catalogue"
-
-#: ../jhbuild/commands/sanitycheck.py:109
+#: jhbuild/commands/sanitycheck.py:116
#, python-format
-msgid "Could not find %s in XML catalog"
-msgstr "Could not find %s in XML catalogue"
+msgid ""
+"Could not find the Perl module %s (usually part of package 'libxml-parser-"
+"perl' or 'perl-XML-Parser')"
+msgstr ""
+"Could not find the Perl module %s (usually part of package 'libxml-parser-"
+"perl' or 'perl-XML-Parser')"
-#: ../jhbuild/commands/sanitycheck.py:116
+#: jhbuild/commands/sanitycheck.py:124
#, python-format
-msgid "Could not find the perl module %s"
-msgstr "Could not find the PERL module %s"
+msgid "%s not found (usually part of the package 'subversion')"
+msgstr "%s not found (usually part of the package 'subversion')"
-#: ../jhbuild/commands/sanitycheck.py:128
-#| msgid "%s or %s not found"
+#: jhbuild/commands/sanitycheck.py:128
msgid "curl or wget not found"
msgstr "curl or wget not found"
-#: ../jhbuild/commands/sanitycheck.py:137
+#: jhbuild/commands/sanitycheck.py:137
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:143
msgid "Could not check git program"
msgstr "Could not check git program"
-#: ../jhbuild/commands/snapshot.py:34
+#: jhbuild/commands/sanitycheck.py:161
+#, python-format
+msgid "aclocal can't see %s macros"
+msgstr "aclocal can't see %s macros"
+
+#: jhbuild/commands/sanitycheck.py:166
+#, 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:34
msgid "Print out a moduleset for the exact versions that are checked out"
msgstr "Print out a module set for the exact versions that are checked out"
-#: ../jhbuild/commands/sysdeps.py:31
+#: jhbuild/commands/sysdeps.py:35
msgid "Check and install tarball dependencies using system packages"
msgstr "Check and install tarball dependencies using system packages"
-#: ../jhbuild/commands/sysdeps.py:39
-#| msgid "Installing modules"
+#: jhbuild/commands/sysdeps.py:43
+msgid "Machine readable list of missing sysdeps"
+msgstr "Machine readable list of missing sysdeps"
+
+#: jhbuild/commands/sysdeps.py:46
+msgid "Machine readable list of all sysdeps"
+msgstr "Machine readable list of all sysdeps"
+
+#: jhbuild/commands/sysdeps.py:49
msgid "Install pkg-config modules via system"
msgstr "Install pkg-config modules via system"
-#: ../jhbuild/commands/sysdeps.py:68
+#: jhbuild/commands/sysdeps.py:129
msgid "System installed packages which are new enough:"
msgstr "System installed packages which are new enough:"
-#: ../jhbuild/commands/sysdeps.py:77 ../jhbuild/commands/sysdeps.py:129
+#: jhbuild/commands/sysdeps.py:138
msgid " (none)"
msgstr " (none)"
-#: ../jhbuild/commands/sysdeps.py:107
+#: jhbuild/commands/sysdeps.py:171
msgid "Optional packages: (JHBuild will build the missing packages)"
msgstr "Optional packages: (JHBuild will build the missing packages)"
-#: ../jhbuild/commands/sysdeps.py:137
+#: jhbuild/commands/sysdeps.py:202
#, 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."
+"%(cmd)s is required to install packages on this system. Please install "
+"%(cmd)s."
-#: ../jhbuild/commands/sysdeps.py:142
+#: jhbuild/commands/sysdeps.py:207
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:145
+#: jhbuild/commands/sysdeps.py:210
#, 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:147
+#: jhbuild/commands/sysdeps.py:212
#, 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 "Build modules non-interactively and store build logs"
-#: ../jhbuild/commands/tinderbox.py:50
+#: jhbuild/commands/tinderbox.py:50
msgid "directory to store build logs in"
msgstr "directory to store build logs in"
-#: ../jhbuild/commands/tinderbox.py:82
+#: jhbuild/commands/tinderbox.py:82
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:161
msgid "Report GNOME modules status wrt 3.0 goals"
msgstr "Report GNOME modules status wrt 3.0 goals"
-#: ../jhbuild/commands/uninstall.py:30
+#: jhbuild/commands/uninstall.py:31
msgid "Uninstall all modules"
msgstr "Uninstall all modules"
-#: ../jhbuild/commands/uninstall.py:52
+#: jhbuild/commands/uninstall.py:48
+#, python-format
+msgid "unknown module %s and no default repository to try an automatic module"
+msgstr "unknown module %s and no default repository to try an automatic module"
+
+#: jhbuild/commands/uninstall.py:64
#, python-format
msgid "Module %(mod)r is not installed"
msgstr "Module %(mod)r is not installed"
-#: ../jhbuild/config.py:172
-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:184
-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:93
+#, python-format
+msgid "Invalid condition set modifier: '%s'. Must start with '+' or '-'."
+msgstr "Invalid condition set modifier: '%s'. Must start with '+' or '-'."
-#: ../jhbuild/config.py:192
+#: jhbuild/config.py:116
msgid "could not load config defaults"
msgstr "could not load config defaults"
-#: ../jhbuild/config.py:203
+#: jhbuild/config.py:127
#, python-format
msgid "could not load config file, %s is missing"
msgstr "could not load config file, %s is missing"
-#: ../jhbuild/config.py:209
+#: jhbuild/config.py:133
#, 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."
+"The default location of the configuration file has changed. Please move "
+"%(old_path)s to %(new_path)s."
-#: ../jhbuild/config.py:239
+#: jhbuild/config.py:192
#, python-format
msgid "Could not include config file (%s)"
msgstr "Could not include config file (%s)"
-#: ../jhbuild/config.py:253
+#: jhbuild/config.py:206
msgid "could not load config file"
msgstr "could not load config file"
-#: ../jhbuild/config.py:267
+#: jhbuild/config.py:220
#, python-format
msgid "unknown keys defined in configuration file: %s"
msgstr "unknown keys defined in configuration file: %s"
-#: ../jhbuild/config.py:274
+#: jhbuild/config.py:227
#, python-format
msgid ""
-"the \"%s\" configuration variable is deprecated, you should use \"repos"
-"['gnome.org']\"."
+"the \"%s\" configuration variable is deprecated, you should use "
+"\"repos['gnome.org']\"."
msgstr ""
-"the \"%s\" configuration variable is deprecated: you should use \"repos"
-"['gnome.org']\"."
+"the \"%s\" configuration variable is deprecated: you should use "
+"\"repos['gnome.org']\"."
-#: ../jhbuild/config.py:279 ../jhbuild/config.py:284
+#: jhbuild/config.py:232 jhbuild/config.py:237
#, python-format
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:318
+#: jhbuild/config.py:271
msgid "invalid checkout mode"
msgstr "invalid checkout mode"
-#: ../jhbuild/config.py:322
+#: jhbuild/config.py:275
#, python-format
msgid "invalid checkout mode (module: %s)"
msgstr "invalid checkout mode (module: %s)"
-#: ../jhbuild/config.py:324
+#: jhbuild/config.py:277
msgid "copy mode requires copy_dir to be set"
msgstr "copy mode requires copy_dir to be set"
-#: ../jhbuild/config.py:329
+#: jhbuild/config.py:282
#, 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:335 ../jhbuild/config.py:337 ../jhbuild/config.py:339
-#: ../jhbuild/config.py:341 ../jhbuild/config.py:344
+#: jhbuild/config.py:288 jhbuild/config.py:290 jhbuild/config.py:292
+#: jhbuild/config.py:294 jhbuild/config.py:297
#, python-format
msgid "%s must be an absolute path"
msgstr "%s must be an absolute path"
-#: ../jhbuild/config.py:357
+#: jhbuild/config.py:308
#, python-format
msgid "install prefix (%s) can not be created"
msgstr "install prefix (%s) can not be created"
-#: ../jhbuild/config.py:364
+#: jhbuild/config.py:315
#, python-format
-#| msgid "tarball dir (%s) can not be created"
msgid "working directory (%s) can not be created"
msgstr "working directory (%s) can not be created"
-#: ../jhbuild/config.py:479
-#, python-format
-msgid "Can't create %s directory"
-msgstr "Can't create %s directory"
-
-#: ../jhbuild/config.py:510
-#, python-format
+#: jhbuild/config.py:318
msgid ""
-"Unable to determine python version using the PYTHON environment variable "
-"(%s). Using default \"%s\""
+"Your install prefix contains a 'lib64' directory, which is no longer "
+"supported by jhbuild. This is likely the result of a previous build with an "
+"older version of jhbuild or of a broken package. Please consider removing "
+"your install and checkout directories and starting fresh."
msgstr ""
-"Unable to determine python version using the PYTHON environment variable (%"
-"s). Using default \"%s\""
+"Your install prefix contains a 'lib64' directory, which is no longer "
+"supported by jhbuild. This is likely the result of a previous build with an "
+"older version of jhbuild or of a broken package. Please consider removing "
+"your install and checkout directories and starting fresh."
-#: ../jhbuild/config.py:525
-#, 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:572
-#, python-format
-msgid "Could not create GConf config (%s)"
-msgstr "Could not create GConf config (%s)"
-
-#: ../jhbuild/config.py:662
-#| msgid "Failed to parse relative time"
+#: jhbuild/config.py:396
msgid "Failed to parse 'min_age' relative time"
msgstr "Failed to parse 'min_age' relative time"
-#: ../jhbuild/config.py:676
+#: jhbuild/config.py:410
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
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: jhbuild.desktop.in.in:9
+msgid "applications-development"
+msgstr "applications-development"
+
+#: jhbuild/frontends/autobuild.py:72
#, 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:76
msgid "Server Error, aborting"
msgstr "Server Error: aborting"
-#: ../jhbuild/frontends/autobuild.py:180
+#: jhbuild/frontends/autobuild.py:180
#, python-format
msgid "Error: %s"
msgstr "Error: %s"
-#: ../jhbuild/frontends/autobuild.py:185 ../jhbuild/utils/cmds.py:66
+#: jhbuild/frontends/autobuild.py:185 jhbuild/utils/cmds.py:66
#, python-format
msgid "Error running %s"
msgstr "Error running %s"
-#: ../jhbuild/frontends/autobuild.py:212
+#: jhbuild/frontends/autobuild.py:212
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:218
#, python-format
msgid "Starting Build #%s"
msgstr "Starting Build #%s"
-#: ../jhbuild/frontends/autobuild.py:232
+#: jhbuild/frontends/autobuild.py:232
#, python-format
msgid "**** Starting module %s ****"
msgstr "**** Starting module %s ****"
-#: ../jhbuild/frontends/buildscript.py:42
+#: jhbuild/frontends/buildscript.py:43
#, 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:50
#, 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:52
#, 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:59
#, 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:61
#, 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:111
#, python-format
msgid "Skipping %s (installed recently)"
msgstr "Skipping %s (installed recently)"
-#: ../jhbuild/frontends/buildscript.py:119
+#: jhbuild/frontends/buildscript.py:120
#, 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:123
#, 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:242
+#, python-format
+msgid "Ignoring uninstalled package: %s"
+msgstr "Ignoring uninstalled package: %s"
+
+#: jhbuild/frontends/buildscript.py:261
#, 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:269 jhbuild/frontends/gtkui.py:596
#, 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 "Others…"
-#: ../jhbuild/frontends/gtkui.py:140
+#: jhbuild/frontends/gtkui.py:140
msgid "Choose Module:"
msgstr "Choose Module:"
-#: ../jhbuild/frontends/gtkui.py:160
+#: jhbuild/frontends/gtkui.py:160
msgid "Build Progress"
msgstr "Build Progress"
-#: ../jhbuild/frontends/gtkui.py:163
+#: jhbuild/frontends/gtkui.py:163
msgid "Terminal"
msgstr "Terminal"
#. Translators: This is a button label (to start build)
-#: ../jhbuild/frontends/gtkui.py:203
+#: jhbuild/frontends/gtkui.py:203
msgid "Start"
msgstr "Start"
-#: ../jhbuild/frontends/gtkui.py:348
+#: jhbuild/frontends/gtkui.py:348
msgid "Build Completed"
msgstr "Build Completed"
-#: ../jhbuild/frontends/gtkui.py:377 ../jhbuild/frontends/terminal.py:283
+#: jhbuild/frontends/gtkui.py:377 jhbuild/frontends/terminal.py:287
#, python-format
msgid "Error during phase %(phase)s of %(module)s"
msgstr "Error during phase %(phase)s of %(module)s"
-#: ../jhbuild/frontends/gtkui.py:394
+#: jhbuild/frontends/gtkui.py:394
msgid "Pick an Action"
msgstr "Pick an Action"
-#: ../jhbuild/frontends/gtkui.py:397 ../jhbuild/frontends/terminal.py:310
+#: jhbuild/frontends/gtkui.py:397 jhbuild/frontends/terminal.py:314
#, python-format
msgid "Rerun phase %s"
msgstr "Rerun phase %s"
-#: ../jhbuild/frontends/gtkui.py:400 ../jhbuild/frontends/terminal.py:312
+#: jhbuild/frontends/gtkui.py:400 jhbuild/frontends/terminal.py:316
#, python-format
msgid "Ignore error and continue to %s"
msgstr "Ignore error and continue to %s"
-#: ../jhbuild/frontends/gtkui.py:403 ../jhbuild/frontends/terminal.py:314
+#: jhbuild/frontends/gtkui.py:403 jhbuild/frontends/terminal.py:318
msgid "Ignore error and continue to next module"
msgstr "Ignore error and continue to next module"
-#: ../jhbuild/frontends/gtkui.py:405 ../jhbuild/frontends/terminal.py:315
+#: jhbuild/frontends/gtkui.py:405 jhbuild/frontends/terminal.py:319
msgid "Give up on module"
msgstr "Give up on module"
-#: ../jhbuild/frontends/gtkui.py:412 ../jhbuild/frontends/terminal.py:324
+#: jhbuild/frontends/gtkui.py:412 jhbuild/frontends/terminal.py:328
#, python-format
msgid "Go to phase \"%s\""
msgstr "Go to phase \"%s\""
-#: ../jhbuild/frontends/gtkui.py:415
+#: jhbuild/frontends/gtkui.py:415
msgid "Open Terminal"
msgstr "Open Terminal"
-#: ../jhbuild/frontends/gtkui.py:591
+#: jhbuild/frontends/gtkui.py:591
#, 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:646
msgid "Module"
msgstr "Module"
-#: ../jhbuild/frontends/gtkui.py:665
+#: jhbuild/frontends/gtkui.py:665
msgid "Start At"
msgstr "Start At"
-#: ../jhbuild/frontends/gtkui.py:708
+#: jhbuild/frontends/gtkui.py:708
msgid "Preferences"
msgstr "Preferences"
-#: ../jhbuild/frontends/gtkui.py:720
+#: jhbuild/frontends/gtkui.py:720
msgid "Disable network access"
msgstr "Disable network access"
-#: ../jhbuild/frontends/gtkui.py:721
+#: jhbuild/frontends/gtkui.py:721
+msgid "Always run autogen.sh"
+msgstr "Always run autogen.sh"
+
+#: jhbuild/frontends/gtkui.py:722
msgid "Don't poison modules on failure"
msgstr "Don't poison modules on failure"
-#: ../jhbuild/frontends/terminal.py:180 ../jhbuild/frontends/tinderbox.py:249
+#: jhbuild/frontends/terminal.py:181 jhbuild/frontends/tinderbox.py:219
+#: jhbuild/frontends/tinderbox.py:348 jhbuild/frontends/tinderbox.py:403
#, 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:237
msgid ""
"\n"
"Conflicts during checkout:\n"
@@ -1151,64 +1183,64 @@ 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:260 jhbuild/frontends/terminal.py:264
#, python-format
msgid "########## Error running %s"
msgstr "########## Error running %s"
-#: ../jhbuild/frontends/terminal.py:274
+#: jhbuild/frontends/terminal.py:278
msgid "success"
msgstr "success"
-#: ../jhbuild/frontends/terminal.py:276
+#: jhbuild/frontends/terminal.py:280
msgid "the following modules were not built"
msgstr "the following modules were not built"
-#: ../jhbuild/frontends/terminal.py:298 ../jhbuild/frontends/tinderbox.py:400
+#: jhbuild/frontends/terminal.py:302 jhbuild/frontends/tinderbox.py:379
msgid "automatically retrying configure"
msgstr "automatically retrying configure"
-#: ../jhbuild/frontends/terminal.py:302 ../jhbuild/frontends/tinderbox.py:405
+#: jhbuild/frontends/terminal.py:306 jhbuild/frontends/tinderbox.py:384
msgid "automatically forcing a fresh checkout"
msgstr "automatically forcing a fresh checkout"
-#: ../jhbuild/frontends/terminal.py:316
+#: jhbuild/frontends/terminal.py:320
msgid "Start shell"
msgstr "Start shell"
-#: ../jhbuild/frontends/terminal.py:317
+#: jhbuild/frontends/terminal.py:321
msgid "Reload configuration"
msgstr "Reload configuration"
-#: ../jhbuild/frontends/terminal.py:326
+#: jhbuild/frontends/terminal.py:330
msgid "choice: "
msgstr "choice: "
-#: ../jhbuild/frontends/terminal.py:341
+#: jhbuild/frontends/terminal.py:345
msgid "exit shell to continue with build"
msgstr "exit shell to continue with build"
-#: ../jhbuild/frontends/terminal.py:351
+#: jhbuild/frontends/terminal.py:355
msgid "invalid choice"
msgstr "invalid choice"
-#: ../jhbuild/frontends/terminal.py:359
+#: jhbuild/frontends/terminal.py:363
msgid "Type \"yes\" to confirm the action: "
msgstr "Type \"yes\" to confirm the action: "
-#: ../jhbuild/frontends/terminal.py:362
+#: jhbuild/frontends/terminal.py:368
msgid "yes"
msgstr "yes"
-#: ../jhbuild/main.py:98
+#: jhbuild/main.py:98
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:106
msgid "%prog [ -f config ] command [ options ... ]"
msgstr "%prog [ -f config ] command [ options … ]"
-#: ../jhbuild/main.py:108
+#: jhbuild/main.py:108
msgid ""
"Build a set of modules from diverse repositories in correct dependency order "
"(such as GNOME)."
@@ -1216,95 +1248,111 @@ msgstr ""
"Build a set of modules from diverse repositories in correct dependency order "
"(such as GNOME)."
-#: ../jhbuild/main.py:113
+#: jhbuild/main.py:113
msgid "Display this help and exit"
msgstr "Display this help and exit"
-#: ../jhbuild/main.py:120
+#: jhbuild/main.py:120
msgid "use a non default configuration file"
msgstr "use a non-default configuration file"
-#: ../jhbuild/main.py:123
+#: jhbuild/main.py:123
msgid "use a non default module set"
msgstr "use a non-default module set"
-#: ../jhbuild/main.py:126
+#: jhbuild/main.py:126
msgid "do not prompt for input"
msgstr "do not prompt for input"
-#: ../jhbuild/main.py:157
+#: jhbuild/main.py:129
+msgid "exit immediately when the build fails"
+msgstr "exit immediately when the build fails"
+
+#: jhbuild/main.py:132
+msgid "modify the condition set"
+msgstr "modify the condition set"
+
+#: jhbuild/main.py:164
msgid "Interrupted"
msgstr "Interrupted"
-#: ../jhbuild/main.py:160
+#: jhbuild/main.py:167
msgid "EOF"
msgstr "EOF"
-#: ../jhbuild/modtypes/autotools.py:206 ../jhbuild/modtypes/cmake.py:75
-#: ../jhbuild/modtypes/linux.py:109 ../jhbuild/modtypes/waf.py:71
+#: jhbuild/modtypes/autotools.py:215 jhbuild/modtypes/cmake.py:78
+#: jhbuild/modtypes/linux.py:109 jhbuild/modtypes/meson.py:78
+#: jhbuild/modtypes/waf.py:76
msgid "Configuring"
msgstr "Configuring"
-#: ../jhbuild/modtypes/autotools.py:251 ../jhbuild/modtypes/cmake.py:102
-#: ../jhbuild/modtypes/linux.py:141 ../jhbuild/modtypes/waf.py:82
+#: jhbuild/modtypes/autotools.py:246 jhbuild/modtypes/cmake.py:104
+#: jhbuild/modtypes/linux.py:141 jhbuild/modtypes/meson.py:114
+#: jhbuild/modtypes/waf.py:85
msgid "Cleaning"
msgstr "Cleaning"
-#: ../jhbuild/modtypes/autotools.py:260 ../jhbuild/modtypes/cmake.py:111
-#: ../jhbuild/modtypes/distutils.py:57 ../jhbuild/modtypes/linux.py:154
-#: ../jhbuild/modtypes/perl.py:52 ../jhbuild/modtypes/waf.py:89
+#: jhbuild/modtypes/autotools.py:252 jhbuild/modtypes/cmake.py:111
+#: jhbuild/modtypes/distutils.py:57 jhbuild/modtypes/linux.py:154
+#: jhbuild/modtypes/meson.py:121 jhbuild/modtypes/perl.py:52
+#: jhbuild/modtypes/waf.py:93
msgid "Building"
msgstr "Building"
-#: ../jhbuild/modtypes/autotools.py:294 ../jhbuild/modtypes/waf.py:106
+#: jhbuild/modtypes/autotools.py:283 jhbuild/modtypes/waf.py:111
msgid "Checking"
msgstr "Checking"
-#: ../jhbuild/modtypes/autotools.py:307 ../jhbuild/modtypes/cmake.py:120
-#: ../jhbuild/modtypes/waf.py:117
+#: jhbuild/modtypes/autotools.py:293 jhbuild/modtypes/cmake.py:118
+#: jhbuild/modtypes/waf.py:123
msgid "Creating tarball for"
msgstr "Creating tarball for"
-#: ../jhbuild/modtypes/autotools.py:316
-#| msgid "Distcleaning"
+#: jhbuild/modtypes/autotools.py:299
msgid "Dist checking"
msgstr "Dist checking"
-#: ../jhbuild/modtypes/autotools.py:325 ../jhbuild/modtypes/cmake.py:129
-#: ../jhbuild/modtypes/distutils.py:69 ../jhbuild/modtypes/perl.py:66
-#: ../jhbuild/modtypes/waf.py:127
+#: jhbuild/modtypes/autotools.py:308
+msgid "Uninstalling old installed version"
+msgstr "Uninstalling old installed version"
+
+#: jhbuild/modtypes/autotools.py:311 jhbuild/modtypes/cmake.py:127
+#: jhbuild/modtypes/distutils.py:69 jhbuild/modtypes/meson.py:131
+#: jhbuild/modtypes/perl.py:66 jhbuild/modtypes/waf.py:134
msgid "Installing"
msgstr "Installing"
-#: ../jhbuild/modtypes/autotools.py:350
+#: jhbuild/modtypes/autotools.py:332
msgid "Distcleaning"
msgstr "Distcleaning"
-#: ../jhbuild/modtypes/__init__.py:60
+#: jhbuild/modtypes/autotools.py:364
+#, python-format
+msgid "<%s/> tag must contain value=''"
+msgstr "<%s/> tag must contain value=''"
+
+#: 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 "dep node for module %s is missing package attribute"
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:142
#, python-format
msgid "no <branch> element found for %s"
msgstr "no <branch> element found for %s"
-#: ../jhbuild/modtypes/__init__.py:147
+#: jhbuild/modtypes/__init__.py:151
#, python-format
-#| msgid ""
-#| "Repository=%s not found for module id=%s. Possible repositories are %s"
msgid ""
"Repository=%(missing)s not found for module id=%(module)s. Possible "
"repositories are %(possible)s"
@@ -1312,39 +1360,31 @@ msgstr ""
"Repository=%(missing)s not found for module id=%(module)s. Possible "
"repositories are %(possible)s"
-#: ../jhbuild/modtypes/__init__.py:154
+#: jhbuild/modtypes/__init__.py:158
#, python-format
-#| msgid ""
-#| "Default Repository=%s not found for module id=%s. Possible repositories "
-#| "are %s"
msgid ""
-"Default repository=%(missing)s not found for module id=%(module)s. Possible "
-"repositories are %(possible)s"
+"No repository for module id=%(module)s. Either set branch/repo or default "
+"repository."
msgstr ""
-"Default repository=%(missing)s not found for module id=%(module)s. Possible "
-"repositories are %(possible)s"
+"No repository for module id=%(module)s. Either set branch/repo or default "
+"repository."
-#: ../jhbuild/modtypes/__init__.py:226
+#: jhbuild/modtypes/__init__.py:227
#, python-format
msgid "Deleting .la file: %r"
msgstr "Deleting .la file: %r"
-#: ../jhbuild/modtypes/__init__.py:277
+#: jhbuild/modtypes/__init__.py:249
#, python-format
-msgid "Failed to rename %(src)r to %(dest)r: %(msg)s"
-msgstr "Failed to rename %(src)r to %(dest)r: %(msg)s"
+msgid "Deleting dir file: %r"
+msgstr "Deleting dir file: %r"
-#: ../jhbuild/modtypes/__init__.py:307
+#: 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:309
-#, python-format
-msgid "Install complete: %d files copied"
-msgstr "Install complete: %d files copied"
-
-#: ../jhbuild/modtypes/__init__.py:328
+#: jhbuild/modtypes/__init__.py:342
#, python-format
msgid ""
"Files remaining in buildroot %(dest)r; module may have installed files "
@@ -1353,76 +1393,89 @@ msgstr ""
"Files remaining in buildroot %(dest)r; module may have installed files "
"outside of prefix."
-#: ../jhbuild/modtypes/__init__.py:346
+#: 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:356
+#: 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:359 ../jhbuild/utils/packagedb.py:282
+#: jhbuild/modtypes/__init__.py:379 jhbuild/utils/packagedb.py:226
#, python-format
msgid "Deleted: %(file)r"
msgstr "Deleted: %(file)r"
-#: ../jhbuild/modtypes/__init__.py:364
+#: 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:416
+#: jhbuild/modtypes/__init__.py:392
+#, python-format
+msgid ""
+"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"
+" %(err)s"
+
+#: jhbuild/modtypes/__init__.py:399
+#, python-format
+msgid "Install complete: %d files copied"
+msgstr "Install complete: %d files copied"
+
+#: jhbuild/modtypes/__init__.py:447
#, python-format
msgid "Skipping %s (not updated)"
msgstr "Skipping %s (not updated)"
-#: ../jhbuild/modtypes/__init__.py:428
+#: 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:517 ../jhbuild/modtypes/__init__.py:535
-#: ../jhbuild/modtypes/linux.py:81 ../jhbuild/modtypes/linux.py:88
+#: jhbuild/modtypes/__init__.py:568 jhbuild/modtypes/__init__.py:586
+#: jhbuild/modtypes/linux.py:81 jhbuild/modtypes/linux.py:88
msgid "Checking out"
msgstr "Checking out"
-#: ../jhbuild/modtypes/__init__.py:521
+#: jhbuild/modtypes/__init__.py:572
#, python-format
msgid "source directory %s was not created"
msgstr "source directory %s was not created"
-#: ../jhbuild/modtypes/__init__.py:538
+#: jhbuild/modtypes/__init__.py:589
msgid "wipe directory and start over"
msgstr "wipe directory and start over"
-#: ../jhbuild/modtypes/linux.py:45
+#: jhbuild/modtypes/linux.py:45
#, 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:93
msgid "make mrproper"
msgstr "make mrproper"
-#: ../jhbuild/modtypes/linux.py:167
+#: jhbuild/modtypes/linux.py:167
msgid "Installing kernel"
msgstr "Installing kernel"
-#: ../jhbuild/modtypes/linux.py:185
+#: jhbuild/modtypes/linux.py:185
msgid "Installing modules"
msgstr "Installing modules"
-#: ../jhbuild/modtypes/linux.py:200
+#: jhbuild/modtypes/linux.py:200
msgid "Installing kernel headers"
msgstr "Installing kernel headers"
-#: ../jhbuild/modtypes/linux.py:240
+#: jhbuild/modtypes/linux.py:240
#, python-format
-#| msgid ""
-#| "Repository=%s not found for kconfig in linux id=%s. Possible repositories "
-#| "are %s"
msgid ""
"Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. "
"Possible repositories are %(possible)s"
@@ -1430,118 +1483,84 @@ 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:246
#, python-format
-#| msgid ""
-#| "Default Repository=%s not found for kconfig in module id=%s. Possible "
-#| "repositories are %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"
+"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:68
#, 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"
+#: 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:78
+#: jhbuild/moduleset.py:94
#, 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:117
+#: jhbuild/moduleset.py:133
#, 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:130
+#: jhbuild/moduleset.py:146
#, python-format
msgid "Circular dependencies detected: %s"
msgstr "Circular dependencies detected: %s"
-#: ../jhbuild/moduleset.py:276
+#: jhbuild/moduleset.py:297
msgid "Unknown module:"
msgstr "Unknown module:"
-#: ../jhbuild/moduleset.py:374
+#: jhbuild/moduleset.py:436
+msgid "<if> must have exactly one of condition-set='' or condition-unset=''"
+msgstr "<if> must have exactly one of condition-set='' or condition-unset=''"
+
+#: jhbuild/moduleset.py:455
#, python-format
msgid "could not download %s: %s"
msgstr "could not download %s: %s"
-#: ../jhbuild/moduleset.py:379 ../jhbuild/moduleset.py:381
+#: jhbuild/moduleset.py:460 jhbuild/moduleset.py:462
#, python-format
msgid "failed to parse %s: %s"
msgstr "failed to parse %s: %s"
-#: ../jhbuild/moduleset.py:408
+#: jhbuild/moduleset.py:497
msgid "Duplicate repository:"
msgstr "Duplicate repository:"
-#: ../jhbuild/moduleset.py:511
+#: jhbuild/moduleset.py:600
#, python-format
-#| msgid ""
-#| "Modulesets were edited locally but JHBuild is configured to get them from "
-#| "the network, perhaps you need to add use_local_modulesets = True to your ."
-#| "jhbuildrc."
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
-#, python-format
-msgid "Invalid placeholder in string: line %d, col %d"
-msgstr "Invalid placeholder in string: line %d, col %d"
+"Module sets 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: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 "Unrecognised named group in pattern"
-
-#: ../jhbuild/utils/cmds.py:40
+#: jhbuild/utils/cmds.py:40
msgid "Call to undefined command"
msgstr "Call to undefined command"
-#: ../jhbuild/utils/httpcache.py:185
+#: jhbuild/utils/httpcache.py:185
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:73
#, 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:213
#, python-format
msgid ""
"no manifest for '%s', can't uninstall. Try building again, then "
@@ -1550,93 +1569,142 @@ msgstr ""
"no manifest for '%s', can't uninstall. Try building again, then "
"uninstalling."
-#: ../jhbuild/utils/packagedb.py:286
+#: jhbuild/utils/packagedb.py:230
#, python-format
msgid "Failed to delete %(file)r: %(msg)s"
msgstr "Failed to delete %(file)r: %(msg)s"
-#: ../jhbuild/utils/systeminstall.py:131
+#: jhbuild/utils/systeminstall.py:200
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:150 ../jhbuild/utils/systeminstall.py:153
+#: jhbuild/utils/systeminstall.py:230 jhbuild/utils/systeminstall.py:233
#, python-format
msgid "PackageKit: %s"
msgstr "PackageKit: %s"
-#: ../jhbuild/utils/systeminstall.py:182
+#: jhbuild/utils/systeminstall.py:312
msgid "Nothing available to install"
msgstr "Nothing available to install"
-#: ../jhbuild/utils/systeminstall.py:185
+#: jhbuild/utils/systeminstall.py:315
#, python-format
-#| msgid "Installing"
-msgid "Installing: %s"
-msgstr "Installing: %s"
+msgid ""
+"Installing:\n"
+" %s"
+msgstr ""
+"Installing:\n"
+" %s"
-#: ../jhbuild/utils/systeminstall.py:197
-#| msgid "Build Completed"
+#: jhbuild/utils/systeminstall.py:331
msgid "Complete!"
msgstr "Complete!"
-#: ../jhbuild/utils/systeminstall.py:208
-msgid "Using yum to install packages. Please wait."
-msgstr "Using yum to install packages. Please wait."
+#: jhbuild/utils/systeminstall.py:344
+msgid "pkgfile not found, automatically installing"
+msgstr "pkgfile not found, automatically installing"
-#: ../jhbuild/utils/systeminstall.py:215 ../jhbuild/utils/systeminstall.py:263
-#, python-format
-#| msgid "Installing"
-msgid "Installing: %(pkgs)s"
-msgstr "Installing: %(pkgs)s"
+#: jhbuild/utils/systeminstall.py:346
+msgid "Failed to install pkgfile"
+msgstr "Failed to install pkgfile"
+
+#: jhbuild/utils/systeminstall.py:352
+msgid "pkgfile cache is old or doesn't exist, automatically updating"
+msgstr "pkgfile cache is old or doesn't exist, automatically updating"
+
+#: jhbuild/utils/systeminstall.py:355
+msgid "Failed to create pkgfile cache"
+msgstr "Failed to create pkgfile cache"
+
+#: jhbuild/utils/systeminstall.py:358
+msgid "Failed to update pkgfile cache"
+msgstr "Failed to update pkgfile cache"
+
+#: jhbuild/utils/systeminstall.py:360
+msgid "Successfully updated pkgfile cache"
+msgstr "Successfully updated pkgfile cache"
+
+#: jhbuild/utils/systeminstall.py:364
+msgid "Using pacman to install packages. Please wait."
+msgstr "Using pacman to install packages. Please wait."
-#: ../jhbuild/utils/systeminstall.py:220 ../jhbuild/utils/systeminstall.py:268
-#| msgid "not installed"
+#: jhbuild/utils/systeminstall.py:368 jhbuild/utils/systeminstall.py:386
+#: jhbuild/utils/systeminstall.py:420 jhbuild/utils/systeminstall.py:474
msgid "Nothing to install"
msgstr "Nothing to install"
-#: ../jhbuild/utils/systeminstall.py:253
+#: jhbuild/utils/systeminstall.py:383
+#, python-format
+msgid "Provider for \"%s\" was not found, ignoring"
+msgstr "Provider for \"%s\" was not found, ignoring"
+
+#: jhbuild/utils/systeminstall.py:391
+msgid "Install failed"
+msgstr "Install failed"
+
+#: jhbuild/utils/systeminstall.py:393
+msgid "Completed!"
+msgstr "Completed!"
+
+#: jhbuild/utils/systeminstall.py:407
+msgid "Using yum to install packages. Please wait."
+msgstr "Using yum to install packages. Please wait."
+
+#: jhbuild/utils/systeminstall.py:410
+#, python-format
+msgid ""
+"Installing:\n"
+" %(pkgs)s"
+msgstr ""
+"Installing:\n"
+" %(pkgs)s"
+
+#: jhbuild/utils/systeminstall.py:455
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:260
+#: jhbuild/utils/systeminstall.py:464
#, python-format
-msgid "No native package found for %(id)s"
-msgstr "No native package found for %(id)s"
+msgid "No native package found for %(id)s (%(filename)s)"
+msgstr "No native package found for %(id)s (%(filename)s)"
-#: ../jhbuild/utils/trigger.py:57
+#: jhbuild/utils/systeminstall.py:469
+#, python-format
+msgid "Installing: %(pkgs)s"
+msgstr "Installing: %(pkgs)s"
+
+#: jhbuild/utils/trigger.py:57
#, 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"
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: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
#, python-format
-#| msgid "branch for %s has wrong override, check your .jhbuildrc"
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:122
msgid "attribute is deprecated. Use revspec instead."
msgstr "attribute is deprecated. Use revspec instead."
-#: ../jhbuild/versioncontrol/bzr.py:175
+#: jhbuild/versioncontrol/bzr.py:178
#, python-format
msgid ""
"\n"
@@ -1647,22 +1715,22 @@ 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
+#: jhbuild/versioncontrol/cvs.py:108
#, python-format
msgid "could not log into %s\n"
msgstr "could not log into %s\n"
-#: ../jhbuild/versioncontrol/cvs.py:122
+#: jhbuild/versioncontrol/cvs.py:126
#, 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:281
#, 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:284
#, python-format
msgid ""
"working copy points at the wrong repository (expected %(root1)s but got "
@@ -1671,54 +1739,54 @@ msgstr ""
"working copy points at the wrong repository (expected %(root1)s but got "
"%(root2)s). "
-#: ../jhbuild/versioncontrol/cvs.py:279
+#: jhbuild/versioncontrol/cvs.py:286
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:558
-#: ../jhbuild/versioncontrol/git.py:598 ../jhbuild/versioncontrol/git.py:674
-#: ../jhbuild/versioncontrol/hg.py:87 ../jhbuild/versioncontrol/hg.py:93
+#: jhbuild/versioncontrol/darcs.py:86 jhbuild/versioncontrol/darcs.py:92
+#: jhbuild/versioncontrol/fossil.py:84 jhbuild/versioncontrol/fossil.py:97
+#: jhbuild/versioncontrol/git.py:571 jhbuild/versioncontrol/git.py:611
+#: jhbuild/versioncontrol/git.py:687 jhbuild/versioncontrol/hg.py:90
+#: jhbuild/versioncontrol/hg.py:96
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:111
msgid "ignored bad branch redefinition for module:"
msgstr "ignored bad branch redefinition for module:"
-#: ../jhbuild/versioncontrol/git.py:199
+#: jhbuild/versioncontrol/git.py:204
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:213
+#: jhbuild/versioncontrol/git.py:218
msgid "Unexpected: Checkoutdir is not a git repository:"
msgstr "Unexpected: Checkoutdir is not a git repository:"
-#: ../jhbuild/versioncontrol/git.py:269
+#: jhbuild/versioncontrol/git.py:275
#, 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."
+"The requested branch \"%s\" is not available. Neither locally, nor remotely "
+"in the origin remote."
-#: ../jhbuild/versioncontrol/git.py:277
+#: jhbuild/versioncontrol/git.py:283
msgid "Refusing to switch a dirty tree."
msgstr "Refusing to switch a dirty tree."
-#: ../jhbuild/versioncontrol/git.py:353
+#: jhbuild/versioncontrol/git.py:361
#, python-format
msgid "Command %s returned no output"
msgstr "Command %s returned no output"
-#: ../jhbuild/versioncontrol/git.py:358
+#: jhbuild/versioncontrol/git.py:366
#, python-format
msgid "Command %s did not include commit line: %r"
msgstr "Command %s did not include commit line: %r"
-#: ../jhbuild/versioncontrol/git.py:420
+#: jhbuild/versioncontrol/git.py:433
msgid ""
"Failed to update module as it switched to git (you should check for changes "
"then remove the directory)."
@@ -1726,7 +1794,7 @@ msgstr ""
"Failed to update module as it switched to git (you should check for changes "
"then remove the directory)."
-#: ../jhbuild/versioncontrol/git.py:421
+#: jhbuild/versioncontrol/git.py:434
msgid ""
"Failed to update module (missing .git) (you should check for changes then "
"remove the directory)."
@@ -1734,7 +1802,7 @@ msgstr ""
"Failed to update module (missing .git) (you should check for changes then "
"remove the directory)."
-#: ../jhbuild/versioncontrol/git.py:525
+#: jhbuild/versioncontrol/git.py:538
msgid ""
"External handling failed\n"
" If you are running git version < 1.5.6 it is recommended you update.\n"
@@ -1742,140 +1810,140 @@ msgstr ""
"External handling failed\n"
" If you are running git version < 1.5.6 it is recommended you update.\n"
-#: ../jhbuild/versioncontrol/git.py:570
+#: jhbuild/versioncontrol/git.py:583
#, 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:193
+#: jhbuild/versioncontrol/__init__.py:199
#, 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 "Initialising %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:74
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:97
#, 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:100
#, 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:312
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 module set file."
-#: ../jhbuild/versioncontrol/tarball.py:126
+#: jhbuild/versioncontrol/tarball.py:126
#, 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:169
msgid "file not downloaded"
msgstr "file not downloaded"
-#: ../jhbuild/versioncontrol/tarball.py:174
+#: jhbuild/versioncontrol/tarball.py:174
#, 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:180
#, 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:193
#, 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:196
#, 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:200
+#, python-format
+msgid "tarball dir (%s) must be writable"
+msgstr "tarball dir (%s) must be writable"
+
+#: jhbuild/versioncontrol/tarball.py:212
msgid "unable to find wget or curl"
msgstr "unable to find wget or curl"
-#: ../jhbuild/versioncontrol/tarball.py:226
+#: jhbuild/versioncontrol/tarball.py:228
#, 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:240
#, python-format
msgid "failed to unpack %s"
msgstr "failed to unpack %s"
-#: ../jhbuild/versioncontrol/tarball.py:243
+#: jhbuild/versioncontrol/tarball.py:243
#, 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:258
#, 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:260
msgid "could not download patch"
msgstr "could not download patch"
-#: ../jhbuild/versioncontrol/tarball.py:292
+#: jhbuild/versioncontrol/tarball.py:292
#, python-format
msgid "Failed to find patch: %s"
msgstr "Failed to find patch: %s"
-#: ../jhbuild/versioncontrol/tarball.py:294
+#: jhbuild/versioncontrol/tarball.py:294
msgid "Applying patch"
msgstr "Applying patch"
-#: ../jhbuild/versioncontrol/tarball.py:302
+#: jhbuild/versioncontrol/tarball.py:302
msgid "unable to find quilt"
msgstr "unable to find quilt"
-#: ../jhbuild/versioncontrol/tarball.py:313
+#: jhbuild/versioncontrol/tarball.py:313
msgid "could not checkout quilt patch set"
msgstr "could not checkout quilt patch set"
@@ -1911,18 +1979,28 @@ msgstr "could not checkout quilt patch set"
#~ msgid "command not found"
#~ msgstr "command not found"
+#~ msgid "Could not find XML catalog"
+#~ msgstr "Could not find XML catalogue"
+
+#~ msgid "Could not find the perl module %s"
+#~ msgstr "Could not find the Perl module %s"
+
#~ msgid "could not create directory %s"
#~ msgstr "could not create directory %s"
-#~ msgid "Always run autogen.sh"
-#~ msgstr "Always run autogen.sh"
-
#~ msgid "Missing ant build tool"
#~ msgstr "Missing ant build tool"
#~ msgid "Uninstalling"
#~ msgstr "Uninstalling"
+#~ msgid ""
+#~ "Default Repository=%s not found for module id=%s. Possible repositories "
+#~ "are %s"
+#~ msgstr ""
+#~ "Default Repository=%s not found for module id=%s. Possible repositories "
+#~ "are %s"
+
#~ msgid "Missing waf, try jhbuild -m bootstrap buildone waf"
#~ msgstr "Missing waf, try jhbuild -m bootstrap buildone waf"
@@ -1938,5 +2016,36 @@ msgstr "could not checkout quilt patch set"
#~ msgid "unable to parse '%s' as relative time."
#~ msgstr "unable to parse '%s' as relative time."
+#~ 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 "Could not create GConf config (%s)"
+#~ msgstr "Could not create GConf config (%s)"
+
#~ msgid "module \"%s\" not found"
#~ msgstr "module \"%s\" not 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 "Unrecognised named group in pattern"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
