[jhbuild] Updated Ukrainian translation

[Maxim V. Dziumanenko <mdziumanenko src gnome org>]

commit 086ea4faff9e5df954980091a5a53b0310c105ca
Author: Maxim V. Dziumanenko <dziumanenko gmail com>
Date:   Wed Oct 13 15:58:35 2010 +0300

    Updated Ukrainian translation

 po/uk.po |  398 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 232 insertions(+), 166 deletions(-)
---
diff --git a/po/uk.po b/po/uk.po
index a5a2618..ef793e3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jhbuild\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-02 12:52+0300\n"
+"POT-Creation-Date: 2010-10-13 15:53+0300\n"
 "PO-Revision-Date: 2010-04-02 09:53-0000\n"
 "Last-Translator: Maxim V. Dziumanenko <dziumanenko gmail com>\n"
 "Language-Team: Ukrainian <uk li org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,24 +29,24 @@ msgid "Build modules non-interactively and upload results to JhAutobuild"
 msgstr ""
 "Ð?биÑ?аÑ?и модÑ?лÑ? не-Ñ?нÑ?еÑ?акÑ?ивно Ñ?а виванÑ?ажÑ?ваÑ?и Ñ?езÑ?лÑ?Ñ?аÑ?и до JhAutobuild"
 
-#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/base.py:215
-#: ../jhbuild/commands/base.py:309 ../jhbuild/commands/tinderbox.py:37
+#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/base.py:213
+#: ../jhbuild/commands/base.py:307 ../jhbuild/commands/tinderbox.py:37
 msgid "always run autogen.sh"
 msgstr "завжди запÑ?Ñ?каÑ?и autogen.sh"
 
-#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:218
-#: ../jhbuild/commands/base.py:312 ../jhbuild/commands/tinderbox.py:40
+#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:216
+#: ../jhbuild/commands/base.py:310 ../jhbuild/commands/tinderbox.py:40
 msgid "run make clean before make"
 msgstr "запÑ?Ñ?каÑ?и make clean пеÑ?ед make"
 
 #: ../jhbuild/commands/autobuild.py:41 ../jhbuild/commands/base.py:46
-#: ../jhbuild/commands/base.py:239 ../jhbuild/commands/base.py:467
+#: ../jhbuild/commands/base.py:237 ../jhbuild/commands/base.py:475
 #: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:49
 msgid "treat the given modules as up to date"
 msgstr "вважаÑ?и вказанÑ? модÑ?лÑ? оновленими"
 
 #: ../jhbuild/commands/autobuild.py:44 ../jhbuild/commands/base.py:49
-#: ../jhbuild/commands/base.py:242 ../jhbuild/commands/clean.py:41
+#: ../jhbuild/commands/base.py:240 ../jhbuild/commands/clean.py:41
 #: ../jhbuild/commands/tinderbox.py:52
 msgid "start building at the given module"
 msgstr "запÑ?Ñ?Ñ?иÑ?и збиÑ?аннÑ? певного модÑ?лÑ?"
@@ -58,12 +59,12 @@ msgstr "URL звÑ?Ñ?Ñ? jhautobuild"
 msgid "verbose mode"
 msgstr "докладний вивÑ?д"
 
-#: ../jhbuild/commands/autobuild.py:70
+#: ../jhbuild/commands/autobuild.py:67
 msgid "report url for autobuild not specified"
 msgstr "не вказано url звÑ?Ñ?Ñ? длÑ? авÑ?омаÑ?иÑ?ного збиÑ?аннÑ?"
 
-#: ../jhbuild/commands/autobuild.py:81 ../jhbuild/commands/base.py:72
-#: ../jhbuild/commands/base.py:286 ../jhbuild/commands/base.py:501
+#: ../jhbuild/commands/autobuild.py:78 ../jhbuild/commands/base.py:72
+#: ../jhbuild/commands/base.py:284 ../jhbuild/commands/base.py:514
 #: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:86
 #, python-format
 msgid "%s not in module list"
@@ -74,25 +75,25 @@ msgid "Update all modules from version control"
 msgstr "Ð?новиÑ?и Ñ?Ñ?Ñ? модÑ?лÑ? з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й"
 
 #: ../jhbuild/commands/base.py:40 ../jhbuild/commands/base.py:88
-#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:209
-#: ../jhbuild/commands/base.py:303 ../jhbuild/commands/base.py:458
+#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:207
+#: ../jhbuild/commands/base.py:301 ../jhbuild/commands/base.py:466
 #: ../jhbuild/commands/tinderbox.py:31
 msgid "[ options ... ] [ modules ... ]"
 msgstr "[ паÑ?амеÑ?Ñ?и ... ] [ модÑ?лÑ? ... ]"
 
-#: ../jhbuild/commands/base.py:52 ../jhbuild/commands/base.py:245
-#: ../jhbuild/commands/base.py:473
+#: ../jhbuild/commands/base.py:52 ../jhbuild/commands/base.py:243
+#: ../jhbuild/commands/base.py:481
 msgid "build only modules with the given tags"
 msgstr "зÑ?бÑ?аÑ?и лиÑ?е модÑ?лÑ? з певними Ñ?егами"
 
 #: ../jhbuild/commands/base.py:55 ../jhbuild/commands/base.py:94
-#: ../jhbuild/commands/base.py:248 ../jhbuild/commands/base.py:330
+#: ../jhbuild/commands/base.py:246 ../jhbuild/commands/base.py:328
 #: ../jhbuild/commands/tinderbox.py:55
 msgid "set a sticky date when checking out modules"
 msgstr "вÑ?Ñ?ановиÑ?и sticky-даÑ?Ñ? пÑ?и оÑ?Ñ?иманнÑ? модÑ?лÑ? з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й"
 
-#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:230
-#: ../jhbuild/commands/base.py:476
+#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:228
+#: ../jhbuild/commands/base.py:484
 msgid "ignore all soft-dependencies"
 msgstr "Ñ?гноÑ?Ñ?ваÑ?и Ñ?Ñ?Ñ? м'Ñ?кÑ? залежноÑ?Ñ?Ñ?"
 
@@ -101,14 +102,14 @@ msgid "Update one or more modules from version control"
 msgstr "Ð?новиÑ?и один або бÑ?лÑ?Ñ?е модÑ?лÑ?в з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й"
 
 #: ../jhbuild/commands/base.py:103 ../jhbuild/commands/base.py:138
-#: ../jhbuild/commands/base.py:352 ../jhbuild/commands/base.py:399
-#: ../jhbuild/commands/base.py:416 ../jhbuild/commands/rdepends.py:52
+#: ../jhbuild/commands/base.py:407 ../jhbuild/commands/base.py:424
+#: ../jhbuild/commands/rdepends.py:52
 #, python-format
 msgid "A module called '%s' could not be found."
 msgstr "Ð?одÑ?лÑ? з назвоÑ? '%s' не знайдено."
 
 #: ../jhbuild/commands/base.py:106 ../jhbuild/commands/base.py:141
-#: ../jhbuild/commands/base.py:355 ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/base.py:363 ../jhbuild/commands/rdepends.py:47
 #: ../jhbuild/commands/uninstall.py:41
 msgid "This command requires a module parameter."
 msgstr "Ð?оманда маÑ? обов'Ñ?зковий паÑ?амеÑ?Ñ?. "
@@ -125,7 +126,7 @@ msgstr "звеÑ?Ñ?аÑ?иÑ?Ñ? до паÑ?амеÑ?Ñ?Ñ? makeclean Ñ? конÑ?Ñ?гÑ?
 msgid "clean command called while makeclean is set to False, skipped."
 msgstr "виклик команди clean коли makeclean маÑ? знаÑ?еннÑ? False, пÑ?опÑ?Ñ?ено."
 
-#: ../jhbuild/commands/base.py:194
+#: ../jhbuild/commands/base.py:192
 msgid ""
 "bootstrap moduleset has been updated since the last time you used it, "
 "perhaps you should run jhbuild bootstrap."
@@ -133,141 +134,153 @@ msgstr ""
 "bootstrap набоÑ?Ñ? модÑ?лÑ?в бÑ?ло оновлено з моменÑ?Ñ? оÑ?Ñ?аннÑ?ого викоÑ?иÑ?Ñ?аннÑ?, "
 "можливо, Ñ?лÑ?д запÑ?Ñ?Ñ?иÑ?и jhbuild bootstrap."
 
-#: ../jhbuild/commands/base.py:200
+#: ../jhbuild/commands/base.py:198
 #, python-format
 msgid ""
 "some bootstrap modules have been updated, perhaps you should update them: %s."
 msgstr "деÑ?кÑ? bootstrap-модÑ?лÑ? бÑ?ло оновлено, можливо, Ñ?лÑ?д оновиÑ?и Ñ?Ñ?: %s."
 
-#: ../jhbuild/commands/base.py:206
+#: ../jhbuild/commands/base.py:204
 msgid "Update and compile all modules (the default)"
 msgstr "Ð?новиÑ?и Ñ?а Ñ?компÑ?лÑ?ваÑ?и Ñ?Ñ?Ñ? модÑ?лÑ? (Ñ?ипово)"
 
-#: ../jhbuild/commands/base.py:221 ../jhbuild/commands/base.py:315
+#: ../jhbuild/commands/base.py:219 ../jhbuild/commands/base.py:313
 msgid "run make check after building"
 msgstr "пÑ?Ñ?лÑ? збиÑ?аннÑ? запÑ?Ñ?Ñ?иÑ?и make check"
 
-#: ../jhbuild/commands/base.py:224 ../jhbuild/commands/base.py:318
+#: ../jhbuild/commands/base.py:222 ../jhbuild/commands/base.py:316
 msgid "run make dist after building"
 msgstr "пÑ?Ñ?лÑ? збиÑ?аннÑ? запÑ?Ñ?Ñ?иÑ?и make dist"
 
-#: ../jhbuild/commands/base.py:227 ../jhbuild/commands/base.py:321
+#: ../jhbuild/commands/base.py:225 ../jhbuild/commands/base.py:319
 msgid "run make distcheck after building"
 msgstr "пÑ?Ñ?лÑ? збиÑ?аннÑ? запÑ?Ñ?Ñ?иÑ?и make distcheck"
 
-#: ../jhbuild/commands/base.py:233 ../jhbuild/commands/base.py:324
+#: ../jhbuild/commands/base.py:231 ../jhbuild/commands/base.py:322
 #: ../jhbuild/commands/tinderbox.py:43
 msgid "skip version control update"
 msgstr "пÑ?опÑ?Ñ?Ñ?иÑ?и оновленнÑ? з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й"
 
-#: ../jhbuild/commands/base.py:236 ../jhbuild/commands/base.py:327
+#: ../jhbuild/commands/base.py:234 ../jhbuild/commands/base.py:325
 msgid "quiet (no output)"
 msgstr "не виводиÑ?и повÑ?домленнÑ?"
 
-#: ../jhbuild/commands/base.py:251 ../jhbuild/commands/base.py:333
+#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/base.py:331
 msgid "run tests in real X and not in Xvfb"
 msgstr "запÑ?Ñ?каÑ?и Ñ?еÑ?Ñ?и Ñ? Ñ?иÑ?Ñ?емÑ? X, а не Ñ? Xvfb"
 
-#: ../jhbuild/commands/base.py:254 ../jhbuild/commands/tinderbox.py:58
+#: ../jhbuild/commands/base.py:252 ../jhbuild/commands/tinderbox.py:58
 msgid "try to force checkout and autogen on failure"
 msgstr ""
 "Ñ? Ñ?азÑ? помилки, виконаÑ?и пÑ?имÑ?Ñ?ове оÑ?Ñ?иманнÑ? кодÑ? з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й "
 "Ñ?а запÑ?Ñ?Ñ?иÑ?и autogen"
 
-#: ../jhbuild/commands/base.py:257 ../jhbuild/commands/tinderbox.py:61
+#: ../jhbuild/commands/base.py:255 ../jhbuild/commands/tinderbox.py:61
 msgid "don't poison modules on failure"
 msgstr "не виконÑ?ваÑ?и poison модÑ?лÑ?в Ñ? Ñ?азÑ? помилки"
 
-#: ../jhbuild/commands/base.py:260 ../jhbuild/commands/base.py:336
+#: ../jhbuild/commands/base.py:258 ../jhbuild/commands/base.py:334
 #: ../jhbuild/commands/tinderbox.py:64
 msgid "build even if policy says not to"
 msgstr "збиÑ?аÑ?и навÑ?Ñ?Ñ?, Ñ?кÑ?о Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?казано не Ñ?ак"
 
-#: ../jhbuild/commands/base.py:263
+#: ../jhbuild/commands/base.py:261
 msgid "also build soft-dependencies that could be skipped"
 msgstr "Ñ?акож збиÑ?аÑ?и м'Ñ?кÑ? залежноÑ?Ñ?Ñ?, Ñ?кÑ? б бÑ?ли пÑ?опÑ?Ñ?енÑ?"
 
-#: ../jhbuild/commands/base.py:266 ../jhbuild/commands/base.py:339
+#: ../jhbuild/commands/base.py:264 ../jhbuild/commands/base.py:337
 msgid "skip modules installed less than the given time ago"
 msgstr "пÑ?опÑ?Ñ?каÑ?и модÑ?лÑ?, вÑ?Ñ?ановленÑ? менÑ?е нÑ?ж вказаний Ñ?аÑ? Ñ?омÑ?"
 
-#: ../jhbuild/commands/base.py:290
+#: ../jhbuild/commands/base.py:288
 msgid "requested module is in the ignore list, nothing to do."
 msgstr "запиÑ?аний модÑ?лÑ? Ñ? Ñ?пиÑ?кÑ?, немаÑ? Ñ?о Ñ?обиÑ?и."
 
-#: ../jhbuild/commands/base.py:300
+#: ../jhbuild/commands/base.py:298
 msgid "Update and compile one or more modules"
 msgstr "Ð?новиÑ?и Ñ?а Ñ?компÑ?лÑ?ваÑ?и один або бÑ?лÑ?Ñ?е модÑ?лÑ?в"
 
-#: ../jhbuild/commands/base.py:364
+#: ../jhbuild/commands/base.py:358
+#, python-format
+msgid ""
+"module \"%s\" does not exist, created automatically using repository \"%s\""
+msgstr ""
+"модÑ?лÑ? \"%s\" не Ñ?Ñ?нÑ?Ñ?, Ñ?Ñ?воÑ?ено авÑ?омаÑ?иÑ?но з викоÑ?иÑ?Ñ?аннÑ?м Ñ?епозиÑ?оÑ?Ñ?Ñ? \"%s\""
+
+#: ../jhbuild/commands/base.py:372
 msgid "Run a command under the JHBuild environment"
 msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и командÑ? Ñ? оÑ?оÑ?еннÑ? JHBuild"
 
-#: ../jhbuild/commands/base.py:367
+#: ../jhbuild/commands/base.py:375
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr "[ паÑ?амеÑ?Ñ?и ... ] пÑ?огÑ?ама [ аÑ?гÑ?менÑ?и ... ]"
 
-#: ../jhbuild/commands/base.py:373
+#: ../jhbuild/commands/base.py:381
 msgid "run command in build dir of the given module"
 msgstr "виконаÑ?и командÑ? Ñ? каÑ?алозÑ? збиÑ?аннÑ? одного з вказаниÑ? модÑ?лÑ?в"
 
-#: ../jhbuild/commands/base.py:376
+#: ../jhbuild/commands/base.py:384
 msgid "run command in checkout dir of the given module"
 msgstr "виконаÑ?и командÑ? Ñ? каÑ?алозÑ? checkout одного з вказаниÑ? модÑ?лÑ?в"
 
-#: ../jhbuild/commands/base.py:389 ../jhbuild/commands/base.py:433
+#: ../jhbuild/commands/base.py:397 ../jhbuild/commands/base.py:441
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? виконаÑ?и командÑ? '%(command)s': %(err)s"
 
-#: ../jhbuild/commands/base.py:407 ../jhbuild/commands/base.py:424
+#: ../jhbuild/commands/base.py:415 ../jhbuild/commands/base.py:432
 #, python-format
 msgid "Unable to execute the command '%s'"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? виконаÑ?и командÑ? '%s'"
 
-#: ../jhbuild/commands/base.py:431 ../jhbuild/frontends/gtkui.py:443
+#: ../jhbuild/commands/base.py:439 ../jhbuild/frontends/gtkui.py:443
 #: ../jhbuild/frontends/terminal.py:144
 msgid "No command given"
 msgstr "Ð?е вказано жодноÑ? команди"
 
-#: ../jhbuild/commands/base.py:440
+#: ../jhbuild/commands/base.py:448
 msgid "Start a shell under the JHBuild environment"
 msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и оболонкÑ? Ñ? оÑ?оÑ?еннÑ? JHBuild"
 
-#: ../jhbuild/commands/base.py:455
+#: ../jhbuild/commands/base.py:463
 msgid "List the modules that would be built"
 msgstr "Ð?еÑ?елÑ?Ñ?иÑ?и модÑ?лÑ?, Ñ?кÑ? бÑ?ли б побÑ?дованÑ?"
 
-#: ../jhbuild/commands/base.py:464
+#: ../jhbuild/commands/base.py:472
 msgid "show which revision will be built"
 msgstr "показаÑ?и Ñ?ка веÑ?Ñ?Ñ?Ñ? бÑ?де побÑ?дована"
 
-#: ../jhbuild/commands/base.py:470
+#: ../jhbuild/commands/base.py:478
 msgid "start list at the given module"
 msgstr "запÑ?Ñ?Ñ?иÑ?и Ñ?пиÑ?ок з вказаноÑ? команди"
 
-#: ../jhbuild/commands/base.py:479
+#: ../jhbuild/commands/base.py:487
 msgid "also list soft-dependencies that could be skipped"
 msgstr "Ñ?акож пеÑ?елÑ?Ñ?иÑ?и м'Ñ?кÑ? залежноÑ?Ñ?Ñ?, Ñ?кÑ? бÑ?ли б пÑ?опÑ?Ñ?енÑ?"
 
-#: ../jhbuild/commands/base.py:482
+#: ../jhbuild/commands/base.py:490
 msgid "list all modules, not only those that would be built"
 msgstr "пеÑ?елÑ?Ñ?иÑ?и Ñ?Ñ?Ñ? модÑ?лÑ?, але лиÑ?е Ñ?Ñ?, Ñ?кÑ? бÑ?ли б зÑ?бÑ?анÑ?"
 
-#: ../jhbuild/commands/base.py:517
+#: ../jhbuild/commands/base.py:497
+#, python-format
+msgid "Conflicting options specified ('%s' and '%s')"
+msgstr "Ð?казано конÑ?лÑ?кÑ?нÑ? паÑ?амеÑ?Ñ?и ('%s' Ñ?а '%s')"
+
+#: ../jhbuild/commands/base.py:530
 msgid "Output a Graphviz dependency graph for one or more modules"
 msgstr "Ð?ивÑ?д гÑ?аÑ? залежноÑ?Ñ?ей Ñ? Graphviz длÑ? одного або кÑ?лÑ?коÑ? модÑ?лÑ?в"
 
-#: ../jhbuild/commands/base.py:520 ../jhbuild/commands/info.py:40
+#: ../jhbuild/commands/base.py:533 ../jhbuild/commands/info.py:40
 #: ../jhbuild/commands/uninstall.py:32
 msgid "[ modules ... ]"
 msgstr "[ модÑ?лÑ? ... ]"
 
-#: ../jhbuild/commands/base.py:526
+#: ../jhbuild/commands/base.py:539
 msgid "add dotted lines to soft dependencies"
 msgstr "додаÑ?и Ñ?Ñ?дки з кÑ?апками до м'Ñ?киÑ? залежноÑ?Ñ?ей"
 
-#: ../jhbuild/commands/base.py:529
+#: ../jhbuild/commands/base.py:542
 msgid "group modules from metamodule together"
 msgstr "згÑ?Ñ?пÑ?ваÑ?и Ñ?азом модÑ?лÑ? з меÑ?амодÑ?лÑ?"
 
@@ -354,18 +367,18 @@ msgstr "виконаÑ?и кÑ?ок buildbot (лиÑ?е внÑ?Ñ?Ñ?Ñ?Ñ?нÑ? вико
 msgid "buildbot and twisted not found, run jhbuild bot --setup"
 msgstr "buildbot Ñ?а twisted не знайдено, запÑ?Ñ?Ñ?Ñ?Ñ?Ñ? jhbuild bot --setup"
 
-#: ../jhbuild/commands/bot.py:293
+#: ../jhbuild/commands/bot.py:294
 #, python-format
 msgid "No description for slave %s."
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ?й опиÑ? длÑ? slave %s."
 
 #. parse error
-#: ../jhbuild/commands/bot.py:298
+#: ../jhbuild/commands/bot.py:299
 #, python-format
 msgid "Failed to parse slave config for %s."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?озÑ?бÑ?аÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? slave %s."
 
-#: ../jhbuild/commands/bot.py:727 ../jhbuild/commands/bot.py:735
+#: ../jhbuild/commands/bot.py:805 ../jhbuild/commands/bot.py:813
 msgid "failed to get buildbot PID"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и buildbot PID"
 
@@ -458,35 +471,47 @@ msgstr "Darcs-Archive:"
 msgid "Git-Module:"
 msgstr "Git-Module:"
 
-#: ../jhbuild/commands/info.py:87
+#: ../jhbuild/commands/info.py:89
+msgid "Git-Branch:"
+msgstr "Ð?Ñ?лка Git:"
+
+#: ../jhbuild/commands/info.py:91
+msgid "Git-Tag:"
+msgstr "Тег Git:"
+
+#: ../jhbuild/commands/info.py:93
 msgid "URL:"
 msgstr "URL:"
 
-#: ../jhbuild/commands/info.py:88
+#: ../jhbuild/commands/info.py:94
 msgid "Version:"
 msgstr "Ð?еÑ?Ñ?Ñ?Ñ?:"
 
-#: ../jhbuild/commands/info.py:91
+#: ../jhbuild/commands/info.py:97
 msgid "Tree-ID:"
 msgstr "Tree-ID:"
 
-#: ../jhbuild/commands/info.py:97
+#: ../jhbuild/commands/info.py:102
+msgid "Sourcedir:"
+msgstr "Ð?аÑ?алог джеÑ?ела:"
+
+#: ../jhbuild/commands/info.py:108
 msgid "Requires:"
 msgstr "Ð?имагаÑ?:"
 
-#: ../jhbuild/commands/info.py:101
+#: ../jhbuild/commands/info.py:112
 msgid "Required-by:"
 msgstr "Ð?оÑ?Ñ?Ñ?бен длÑ?:"
 
-#: ../jhbuild/commands/info.py:103
+#: ../jhbuild/commands/info.py:114
 msgid "Suggests:"
 msgstr "Ð?Ñ?опонÑ?Ñ?:"
 
-#: ../jhbuild/commands/info.py:105
+#: ../jhbuild/commands/info.py:116
 msgid "After:"
 msgstr "Ð?Ñ?Ñ?лÑ?:"
 
-#: ../jhbuild/commands/info.py:109
+#: ../jhbuild/commands/info.py:120
 msgid "Before:"
 msgstr "Ð?еÑ?ед:"
 
@@ -548,10 +573,10 @@ msgstr "Ñ?лÑ?Ñ? з пÑ?еÑ?Ñ?кÑ?ом вÑ?Ñ?ановленнÑ? (%s) недоÑ?
 #: ../jhbuild/commands/sanitycheck.py:133
 #: ../jhbuild/commands/sanitycheck.py:141
 #: ../jhbuild/commands/sanitycheck.py:150
-#: ../jhbuild/versioncontrol/arch.py:155 ../jhbuild/versioncontrol/bzr.py:148
+#: ../jhbuild/versioncontrol/arch.py:155 ../jhbuild/versioncontrol/bzr.py:202
 #: ../jhbuild/versioncontrol/cvs.py:297 ../jhbuild/versioncontrol/darcs.py:108
 #: ../jhbuild/versioncontrol/fossil.py:105
-#: ../jhbuild/versioncontrol/git.py:344 ../jhbuild/versioncontrol/hg.py:101
+#: ../jhbuild/versioncontrol/git.py:430 ../jhbuild/versioncontrol/hg.py:101
 #: ../jhbuild/versioncontrol/mtn.py:140 ../jhbuild/versioncontrol/svn.py:311
 #, python-format
 msgid "%s not found"
@@ -829,26 +854,26 @@ msgstr "Ð?еÑ?езаванÑ?ажиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?"
 msgid "choice: "
 msgstr "вибÑ?Ñ?: "
 
-#: ../jhbuild/frontends/terminal.py:311
+#: ../jhbuild/frontends/terminal.py:312
 msgid "exit shell to continue with build"
 msgstr "вийÑ?и з оболонки Ñ?а пÑ?одовжиÑ?и збиÑ?аÑ?и"
 
-#: ../jhbuild/frontends/terminal.py:321
+#: ../jhbuild/frontends/terminal.py:322
 msgid "invalid choice"
 msgstr "непÑ?авилÑ?ний вибÑ?Ñ?"
 
-#: ../jhbuild/frontends/terminal.py:329
+#: ../jhbuild/frontends/terminal.py:330
 msgid "Type \"yes\" to confirm the action: "
 msgstr "Ð?ведÑ?Ñ?Ñ? \"yes\" длÑ? пÑ?дÑ?веÑ?дженнÑ? дÑ?Ñ?: "
 
-#: ../jhbuild/frontends/terminal.py:331
+#: ../jhbuild/frontends/terminal.py:333
 msgid "yes"
 msgstr "yes"
 
-#: ../jhbuild/modtypes/ant.py:63 ../jhbuild/modtypes/autotools.py:214
-#: ../jhbuild/modtypes/cmake.py:75 ../jhbuild/modtypes/distutils.py:62
+#: ../jhbuild/modtypes/ant.py:63 ../jhbuild/modtypes/autotools.py:213
+#: ../jhbuild/modtypes/cmake.py:115 ../jhbuild/modtypes/distutils.py:62
 #: ../jhbuild/modtypes/linux.py:164 ../jhbuild/modtypes/perl.py:58
-#: ../jhbuild/modtypes/waf.py:99
+#: ../jhbuild/modtypes/waf.py:97
 msgid "Building"
 msgstr "Ð?биÑ?аннÑ?"
 
@@ -860,36 +885,36 @@ msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ? Ñ?нÑ?Ñ?Ñ?Ñ?менÑ?и длÑ? збиÑ?аннÑ?"
 #. "It's not clear to me how to install a typical
 #. ant-based project, so I left that out."
 #. -- http://bugzilla.gnome.org/show_bug.cgi?id=537037
-#: ../jhbuild/modtypes/ant.py:81 ../jhbuild/modtypes/autotools.py:268
-#: ../jhbuild/modtypes/cmake.py:91 ../jhbuild/modtypes/distutils.py:74
-#: ../jhbuild/modtypes/perl.py:72 ../jhbuild/modtypes/waf.py:134
+#: ../jhbuild/modtypes/ant.py:81 ../jhbuild/modtypes/autotools.py:267
+#: ../jhbuild/modtypes/cmake.py:133 ../jhbuild/modtypes/distutils.py:74
+#: ../jhbuild/modtypes/perl.py:72 ../jhbuild/modtypes/waf.py:132
 msgid "Installing"
 msgstr "Ð?Ñ?Ñ?ановленнÑ?"
 
-#: ../jhbuild/modtypes/autotools.py:110 ../jhbuild/modtypes/cmake.py:63
+#: ../jhbuild/modtypes/autotools.py:110 ../jhbuild/modtypes/cmake.py:87
 #: ../jhbuild/modtypes/linux.py:119 ../jhbuild/modtypes/waf.py:79
 msgid "Configuring"
 msgstr "Ð?алаÑ?Ñ?овÑ?ваннÑ?"
 
-#: ../jhbuild/modtypes/autotools.py:204 ../jhbuild/modtypes/linux.py:151
-#: ../jhbuild/modtypes/waf.py:92
+#: ../jhbuild/modtypes/autotools.py:203 ../jhbuild/modtypes/cmake.py:106
+#: ../jhbuild/modtypes/linux.py:151 ../jhbuild/modtypes/waf.py:90
 msgid "Cleaning"
 msgstr "Ð?Ñ?иÑ?еннÑ?"
 
-#: ../jhbuild/modtypes/autotools.py:234 ../jhbuild/modtypes/waf.py:113
+#: ../jhbuild/modtypes/autotools.py:233 ../jhbuild/modtypes/waf.py:111
 msgid "Checking"
 msgstr "Ð?еÑ?евÑ?Ñ?ка"
 
-#: ../jhbuild/modtypes/autotools.py:248 ../jhbuild/modtypes/autotools.py:258
-#: ../jhbuild/modtypes/cmake.py:83 ../jhbuild/modtypes/waf.py:124
+#: ../jhbuild/modtypes/autotools.py:247 ../jhbuild/modtypes/autotools.py:257
+#: ../jhbuild/modtypes/cmake.py:124 ../jhbuild/modtypes/waf.py:122
 msgid "Creating tarball for"
 msgstr "СÑ?воÑ?еннÑ? tar-аÑ?зÑ?вÑ? длÑ?"
 
-#: ../jhbuild/modtypes/autotools.py:280
+#: ../jhbuild/modtypes/autotools.py:279
 msgid "Distcleaning"
 msgstr "Distclean"
 
-#: ../jhbuild/modtypes/autotools.py:297 ../jhbuild/modtypes/waf.py:141
+#: ../jhbuild/modtypes/autotools.py:296 ../jhbuild/modtypes/waf.py:139
 msgid "Uninstalling"
 msgstr "Ð?еÑ?нÑ?Ñ?алÑ?Ñ?Ñ?Ñ?"
 
@@ -916,32 +941,32 @@ msgstr "Repository=%s не знайдено длÑ? модÑ?лÑ? id=%s. Ð?ожл
 #: ../jhbuild/modtypes/__init__.py:107
 #, python-format
 msgid ""
-"Default Repository=%s not found for module id=%s. Possible repositories are %"
-"s"
+"Default Repository=%s not found for module id=%s. Possible repositories are "
+"%s"
 msgstr ""
 "Типовий Ñ?епозиÑ?оÑ?Ñ?й=%s не знайдено длÑ? модÑ?лÑ? id=%s. Ð?ожливÑ? Ñ?епозиÑ?оÑ?Ñ?Ñ? %s"
 
-#: ../jhbuild/modtypes/__init__.py:183
+#: ../jhbuild/modtypes/__init__.py:189
 #, python-format
 msgid "Skipping %s (not updated)"
 msgstr "Ð?Ñ?опÑ?Ñ?к %s (не оновлено)"
 
-#: ../jhbuild/modtypes/__init__.py:195
+#: ../jhbuild/modtypes/__init__.py:201
 #, python-format
 msgid "Skipping %s (package and dependencies not updated)"
 msgstr "Ð?Ñ?опÑ?Ñ?к %s (пакеÑ? Ñ?а залежноÑ?Ñ?Ñ? не оновлено)"
 
-#: ../jhbuild/modtypes/__init__.py:247 ../jhbuild/modtypes/__init__.py:265
+#: ../jhbuild/modtypes/__init__.py:253 ../jhbuild/modtypes/__init__.py:271
 #: ../jhbuild/modtypes/linux.py:88 ../jhbuild/modtypes/linux.py:95
 msgid "Checking out"
 msgstr "ТÑ?иваÑ? checkout"
 
-#: ../jhbuild/modtypes/__init__.py:251
+#: ../jhbuild/modtypes/__init__.py:257
 #, python-format
 msgid "source directory %s was not created"
 msgstr "пеÑ?винний каÑ?алог %s не Ñ?Ñ?воÑ?ено"
 
-#: ../jhbuild/modtypes/__init__.py:268
+#: ../jhbuild/modtypes/__init__.py:274
 msgid "wipe directory and start over"
 msgstr "Ñ?Ñ?еÑ?Ñ?и каÑ?алог Ñ?а запÑ?Ñ?Ñ?иÑ?и"
 
@@ -988,10 +1013,6 @@ msgstr ""
 msgid "module '%(module)s' has invalid size attribute ('%(size)s')"
 msgstr "модÑ?лÑ? '%(module)s' маÑ? непÑ?авилÑ?нй аÑ?Ñ?ибÑ?Ñ? Ñ?озмÑ?Ñ?Ñ? ('%(size)s')"
 
-#: ../jhbuild/modtypes/waf.py:81
-msgid "Missing waf, try jhbuild -m bootstrap buildone waf"
-msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ?й waf, Ñ?пÑ?обÑ?йÑ?е jhbuild -m bootstrap buildone waf"
-
 #: ../jhbuild/utils/cmds.py:40
 msgid "Call to undefined command"
 msgstr "Ð?иклик до невизнаÑ?еноÑ? команди"
@@ -1006,16 +1027,21 @@ msgid "file not in cache, but not allowed to check network"
 msgstr ""
 "Ñ?айл вÑ?дÑ?Ñ?Ñ?нÑ?й Ñ? кеÑ?Ñ?, але недозволено пеÑ?евÑ?Ñ?Ñ?Ñ?и наÑ?внÑ?Ñ?Ñ?Ñ? Ñ?айлÑ? Ñ? меÑ?ежÑ?"
 
-#: ../jhbuild/utils/unpack.py:132
+#: ../jhbuild/utils/unpack.py:144
 #, python-format
 msgid "Failed to unpack %s (unknown archive type)"
 msgstr "Ð?омилка пÑ?и Ñ?озпаковÑ?ваннÑ? %s (невÑ?домий Ñ?ип аÑ?Ñ?Ñ?вÑ?)"
 
-#: ../jhbuild/utils/unpack.py:134
+#: ../jhbuild/utils/unpack.py:146
 #, python-format
 msgid "Failed to unpack %s"
 msgstr "Ð?омилка пÑ?и Ñ?озпаковÑ?ваннÑ? %s"
 
+#: ../jhbuild/utils/unpack.py:152
+#, python-format
+msgid "Failed to unpack %s (empty file?)"
+msgstr "Ð?омилка пÑ?и Ñ?озпаковÑ?ваннÑ? %s (поÑ?ожнÑ?й Ñ?айл?)"
+
 #: ../jhbuild/versioncontrol/arch.py:40 ../jhbuild/versioncontrol/arch.py:83
 #, python-format
 msgid "could not register archive %s"
@@ -1026,7 +1052,7 @@ msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заÑ?еÑ?Ñ?Ñ?Ñ?Ñ?ваÑ?и аÑ?Ñ?Ñ?в %s"
 msgid "archive %s not registered"
 msgstr "аÑ?Ñ?Ñ?в %s не заÑ?еÑ?Ñ?Ñ?Ñ?овано"
 
-#: ../jhbuild/versioncontrol/arch.py:92 ../jhbuild/versioncontrol/bzr.py:72
+#: ../jhbuild/versioncontrol/arch.py:92 ../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
@@ -1035,15 +1061,29 @@ msgid "branch for %s has wrong override, check your .jhbuildrc"
 msgstr "гÑ?лка длÑ? %s маÑ? непÑ?авилÑ?не пеÑ?евизнаÑ?еннÑ?, пеÑ?евÑ?Ñ?Ñ?е Ñ?айл .jhbuildrc"
 
 #: ../jhbuild/versioncontrol/arch.py:128 ../jhbuild/versioncontrol/arch.py:141
-#: ../jhbuild/versioncontrol/bzr.py:131 ../jhbuild/versioncontrol/bzr.py:137
 #: ../jhbuild/versioncontrol/darcs.py:84 ../jhbuild/versioncontrol/darcs.py:90
 #: ../jhbuild/versioncontrol/fossil.py:82
-#: ../jhbuild/versioncontrol/fossil.py:95 ../jhbuild/versioncontrol/git.py:443
-#: ../jhbuild/versioncontrol/git.py:483 ../jhbuild/versioncontrol/git.py:559
+#: ../jhbuild/versioncontrol/fossil.py:95 ../jhbuild/versioncontrol/git.py:536
+#: ../jhbuild/versioncontrol/git.py:576 ../jhbuild/versioncontrol/git.py:652
 #: ../jhbuild/versioncontrol/hg.py:85 ../jhbuild/versioncontrol/hg.py:91
 msgid "date based checkout not yet supported\n"
 msgstr "checkout оÑ?нований на даÑ?Ñ? Ñ?е не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?\n"
 
+#: ../jhbuild/versioncontrol/bzr.py:117
+msgid "attribute is deprecated. Use revspec instead."
+msgstr "аÑ?Ñ?ибÑ?Ñ? заÑ?Ñ?аÑ?Ñ?в. Ð?аÑ?омÑ?Ñ?Ñ?Ñ? викоÑ?иÑ?Ñ?овÑ?йÑ?е revspec."
+
+#: ../jhbuild/versioncontrol/bzr.py:171
+#, python-format
+msgid ""
+"\n"
+"Path %s does not seem to be a checkout from dvcs_mirror_dir.\n"
+"Remove it or change your dvcs_mirror_dir settings."
+msgstr ""
+"\n"
+"ШлÑ?Ñ? %s не Ñ? checkout з dvcs_mirror_dir.\n"
+"Ð?идалÑ?Ñ?Ñ? його або змÑ?нÑ?Ñ?Ñ? паÑ?амеÑ?Ñ?и dvcs_mirror_dir."
+
 #: ../jhbuild/versioncontrol/cvs.py:104
 #, python-format
 msgid "could not log into %s\n"
@@ -1062,8 +1102,8 @@ msgstr "\"%s\" не Ñ?Ñ?ожий на Ñ?обоÑ?Ñ? копÑ?Ñ? CVS"
 #: ../jhbuild/versioncontrol/cvs.py:277
 #, python-format
 msgid ""
-"working copy points at the wrong repository (expected %(root1)s but got %"
-"(root2)s). "
+"working copy points at the wrong repository (expected %(root1)s but got "
+"%(root2)s). "
 msgstr ""
 "Ñ?оÑ?ки Ñ?обоÑ?иÑ? копÑ?й Ñ? непÑ?авилÑ?номÑ? Ñ?епозиÑ?оÑ?Ñ?Ñ? (оÑ?Ñ?кÑ?валоÑ?Ñ? %(root1)s але "
 "оÑ?Ñ?имано %(root2)s). "
@@ -1072,21 +1112,41 @@ msgstr ""
 msgid "Consider using the changecvsroot.py script to fix this."
 msgstr "Ð?лÑ? випÑ?авленнÑ? Ñ?коÑ?иÑ?Ñ?айÑ?еÑ?Ñ? Ñ?Ñ?енаÑ?Ñ?Ñ?м changecvsroot.py."
 
-#: ../jhbuild/versioncontrol/git.py:94
+#: ../jhbuild/versioncontrol/git.py:102
 msgid "ignored bad branch redefinition for module:"
 msgstr "Ñ?гноÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? непÑ?авилÑ?не пеÑ?евизнаÑ?еннÑ? гÑ?лки длÑ? модÑ?лÑ?:"
 
-#: ../jhbuild/versioncontrol/git.py:188
+#: ../jhbuild/versioncontrol/git.py:187
+msgid "Need at least git-1.5.6 from June/08 to operate"
+msgstr "Ð?лÑ? Ñ?обоÑ?и поÑ?Ñ?Ñ?бен пÑ?инаймнÑ? git-1.5.6 вÑ?д Ñ?еÑ?внÑ? 2008 Ñ?окÑ?"
+
+#: ../jhbuild/versioncontrol/git.py:201
+msgid "Unexpected: Checkoutdir is not a git repository:"
+msgstr "Ð?еоÑ?Ñ?кÑ?вано: Checkoutdir не Ñ? git-Ñ?епозиÑ?оÑ?Ñ?Ñ?м:"
+
+#: ../jhbuild/versioncontrol/git.py:257
+#, python-format
+msgid ""
+"The requested branch \"%s\" is not available. Neither locally, nor remotely "
+"in the origin remote."
+msgstr ""
+"Ð?апиÑ?ана гÑ?лка \"%s\" недоÑ?Ñ?Ñ?пна. Ð?нÑ? локалÑ?но, анÑ? вÑ?ддалено Ñ? вÑ?ддаленомÑ? origin."
+
+#: ../jhbuild/versioncontrol/git.py:265
+msgid "Refusing to switch a dirty tree."
+msgstr "Ð?Ñ?дмова пеÑ?емикнÑ?Ñ?и на dirty деÑ?ево."
+
+#: ../jhbuild/versioncontrol/git.py:341
 #, python-format
 msgid "Command %s returned no output"
 msgstr "Ð?оманда %s не повеÑ?нÑ?ла виводÑ?"
 
-#: ../jhbuild/versioncontrol/git.py:193
+#: ../jhbuild/versioncontrol/git.py:346
 #, python-format
 msgid "Command %s did not include commit line: %r"
 msgstr "Ð?оманда %s не мÑ?Ñ?Ñ?иÑ?Ñ? commit-Ñ?Ñ?док: %r"
 
-#: ../jhbuild/versioncontrol/git.py:255
+#: ../jhbuild/versioncontrol/git.py:408
 msgid ""
 "Failed to update module as it switched to git (you should check for changes "
 "then remove the directory)."
@@ -1094,7 +1154,7 @@ msgstr ""
 "Ð?омилка пÑ?и оновленнÑ? модÑ?лÑ?, оÑ?кÑ?лÑ?ки вÑ?н пеÑ?ейÑ?ов на git (Ñ?лÑ?д пеÑ?евÑ?Ñ?иÑ?и "
 "змÑ?ни, Ñ? поÑ?Ñ?м видалиÑ?и каÑ?алог)."
 
-#: ../jhbuild/versioncontrol/git.py:256
+#: ../jhbuild/versioncontrol/git.py:409
 msgid ""
 "Failed to update module (missing .git) (you should check for changes then "
 "remove the directory)."
@@ -1102,11 +1162,7 @@ msgstr ""
 "Ð?омилка пÑ?и оновленнÑ? модÑ?лÑ? (вÑ?дÑ?Ñ?Ñ?нÑ?й .git) (Ñ?лÑ?д пеÑ?евÑ?Ñ?иÑ?и змÑ?ни, поÑ?Ñ?м "
 "видалиÑ?и каÑ?алог)."
 
-#: ../jhbuild/versioncontrol/git.py:289
-msgid "Failed to update module (corrupt .git?)"
-msgstr "Ð?омилка пÑ?и оновленнÑ? модÑ?лÑ? (поÑ?коджений .git?)"
-
-#: ../jhbuild/versioncontrol/git.py:410
+#: ../jhbuild/versioncontrol/git.py:503
 msgid ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
@@ -1114,7 +1170,7 @@ msgstr ""
 "Ð?омилка Ñ? зовнÑ?Ñ?нÑ?й обÑ?обÑ?Ñ?\n"
 " ЯкÑ?о Ñ? Ð?аÑ? git веÑ?Ñ?Ñ?Ñ? < 1.5.6 Ñ?екомендÑ?Ñ?Ñ?Ñ?Ñ?Ñ? оновиÑ?и Ñ?Ñ?.\n"
 
-#: ../jhbuild/versioncontrol/git.py:455
+#: ../jhbuild/versioncontrol/git.py:548
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr ""
@@ -1178,88 +1234,88 @@ msgstr "гÑ?лка %s не Ñ? коÑ?екÑ?ноÑ?, пеÑ?евÑ?Ñ?Ñ?е Ñ?айл mo
 msgid "URL has no filename component: %s"
 msgstr "URL не мÑ?Ñ?Ñ?иÑ?Ñ? компоненÑ?Ñ? Ñ?менÑ? Ñ?айлÑ?: %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:162
+#: ../jhbuild/versioncontrol/tarball.py:164
 msgid "file not downloaded"
 msgstr "Ñ?айл не заванÑ?ажено"
 
-#: ../jhbuild/versioncontrol/tarball.py:167
+#: ../jhbuild/versioncontrol/tarball.py:169
 #, python-format
 msgid "downloaded file size is incorrect (expected %(size1)d, got %(size2)d)"
 msgstr ""
-"Ñ?озмÑ?Ñ? заванÑ?аженого Ñ?айлÑ? Ñ? некоÑ?екÑ?ним (оÑ?Ñ?кÑ?вавÑ?Ñ? %(size1)d, оÑ?Ñ?имано %"
-"(size2)d)"
+"Ñ?озмÑ?Ñ? заванÑ?аженого Ñ?айлÑ? Ñ? некоÑ?екÑ?ним (оÑ?Ñ?кÑ?вавÑ?Ñ? %(size1)d, оÑ?Ñ?имано "
+"%(size2)d)"
 
-#: ../jhbuild/versioncontrol/tarball.py:173
+#: ../jhbuild/versioncontrol/tarball.py:175
 #, python-format
 msgid "invalid hash attribute on module %s"
 msgstr "непÑ?авилÑ?ний аÑ?Ñ?ибÑ?Ñ? hash Ñ? модÑ?лÑ? %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:186
+#: ../jhbuild/versioncontrol/tarball.py:188
 #, python-format
 msgid "file hash is incorrect (expected %(sum1)s, got %(sum2)s)"
 msgstr "Ñ?еÑ? Ñ?айлÑ? Ñ? некоÑ?екÑ?ним (оÑ?Ñ?кÑ?валоÑ?Ñ? %(sum1)s, оÑ?Ñ?имано %(sum2)s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:189
+#: ../jhbuild/versioncontrol/tarball.py:191
 #, python-format
 msgid "skipped hash check (missing support for %s)"
 msgstr "пÑ?опÑ?Ñ?ено пеÑ?евÑ?Ñ?кÑ? Ñ?еÑ?Ñ? (вÑ?дÑ?Ñ?Ñ?нÑ? пÑ?дÑ?Ñ?имка %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:198
+#: ../jhbuild/versioncontrol/tarball.py:200
 #, python-format
 msgid "tarball dir (%s) can not be created"
 msgstr "неможливо Ñ?Ñ?воÑ?иÑ?и пÑ?еÑ?Ñ?кÑ? вÑ?Ñ?ановленнÑ? (%s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:200
+#: ../jhbuild/versioncontrol/tarball.py:202
 #, python-format
 msgid "tarball dir (%s) must be writable"
 msgstr "пÑ?еÑ?Ñ?кÑ? вÑ?Ñ?ановленнÑ? (%s) повинен бÑ?Ñ?и доÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
 
-#: ../jhbuild/versioncontrol/tarball.py:212
+#: ../jhbuild/versioncontrol/tarball.py:220
 msgid "unable to find wget or curl"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и wget або curl"
 
-#: ../jhbuild/versioncontrol/tarball.py:220
+#: ../jhbuild/versioncontrol/tarball.py:228
 #, python-format
 msgid "failed to unpack %s"
 msgstr "помилка пÑ?и Ñ?озпаковÑ?ваннÑ? %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:223
+#: ../jhbuild/versioncontrol/tarball.py:231
 #, python-format
 msgid "could not unpack tarball (expected %s dir)"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?озпакÑ?ваÑ?и tar-аÑ?Ñ?Ñ?в (оÑ?Ñ?кÑ?вавÑ?Ñ? каÑ?алог %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:238
+#: ../jhbuild/versioncontrol/tarball.py:246
 #, python-format
 msgid "could not download patch (error: %s)"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и лаÑ?кÑ? (помилка: %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:240
+#: ../jhbuild/versioncontrol/tarball.py:248
 msgid "could not download patch"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? завеÑ?Ñ?иÑ?и лаÑ?кÑ?"
 
-#: ../jhbuild/versioncontrol/tarball.py:272
+#: ../jhbuild/versioncontrol/tarball.py:280
 #, python-format
 msgid "Failed to find patch: %s"
 msgstr "Ð?омилка пÑ?и поÑ?Ñ?кÑ? Ñ?лÑ?Ñ?Ñ?: %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:274
+#: ../jhbuild/versioncontrol/tarball.py:282
 msgid "Applying patch"
 msgstr "Ð?аÑ?Ñ?оÑ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? лаÑ?ка"
 
-#: ../jhbuild/versioncontrol/tarball.py:281
+#: ../jhbuild/versioncontrol/tarball.py:289
 msgid "unable to find quilt"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и quilt"
 
-#: ../jhbuild/versioncontrol/tarball.py:292
+#: ../jhbuild/versioncontrol/tarball.py:300
 msgid "could not checkout quilt patch set"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? виконаÑ?и checkout quilt набоÑ?Ñ? лаÑ?ок"
 
-#: ../jhbuild/config.py:137
+#: ../jhbuild/config.py:138
 #, python-format
 msgid "unable to parse '%s' as relative time."
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?оаналÑ?зÑ?ваÑ?и '%s' Ñ?к вÑ?дноÑ?ний Ñ?аÑ?."
 
-#: ../jhbuild/config.py:164
+#: ../jhbuild/config.py:165
 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 ~/."
@@ -1269,7 +1325,7 @@ msgstr ""
 "Ñ?Ñ?аÑ?Ñ? веÑ?Ñ?Ñ?Ñ?, Ñ?ка Ñ?Ñ?нÑ?Ñ? Ñ? ~/bin/ (або зÑ?обиÑ?и Ñ?имволÑ?Ñ?не поÑ?иланнÑ? на ~/."
 "local/bin/jhbuild)"
 
-#: ../jhbuild/config.py:176
+#: ../jhbuild/config.py:177
 msgid ""
 "Obsolete JHBuild start script, make sure it is removed then do run 'make "
 "install'"
@@ -1277,30 +1333,30 @@ msgstr ""
 "Ð?аÑ?Ñ?аÑ?Ñ?лий Ñ?Ñ?енаÑ?Ñ?й JHBuild, пеÑ?евÑ?Ñ?Ñ?е, Ñ?о вÑ?н видÑ?лений поÑ?Ñ?м запÑ?Ñ?Ñ?Ñ?Ñ?Ñ? "
 "'make install'"
 
-#: ../jhbuild/config.py:184
+#: ../jhbuild/config.py:185
 msgid "could not load config defaults"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и подÑ?обиÑ?Ñ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?"
 
-#: ../jhbuild/config.py:188
+#: ../jhbuild/config.py:189
 #, python-format
 msgid "could not load config file, %s is missing"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний Ñ?айл, вÑ?дÑ?Ñ?Ñ?нÑ?й %s"
 
-#: ../jhbuild/config.py:204
+#: ../jhbuild/config.py:205
 #, python-format
 msgid "Could not include config file (%s)"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний Ñ?айл (%s)"
 
-#: ../jhbuild/config.py:217
+#: ../jhbuild/config.py:218
 msgid "could not load config file"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний Ñ?айл"
 
-#: ../jhbuild/config.py:231
+#: ../jhbuild/config.py:232
 #, python-format
 msgid "unknown keys defined in configuration file: %s"
 msgstr "Ñ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йномÑ? Ñ?айлÑ? визнаÑ?ено невÑ?домÑ? клÑ?Ñ?Ñ?: %s"
 
-#: ../jhbuild/config.py:238
+#: ../jhbuild/config.py:239
 #, python-format
 msgid ""
 "the \"%s\" configuration variable is deprecated, you should use \"repos"
@@ -1309,59 +1365,63 @@ msgstr ""
 "змÑ?нна конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? \"%s\" заÑ?Ñ?аÑ?Ñ?ла, Ñ?лÑ?д викоÑ?иÑ?Ñ?овÑ?ваÑ?и \"repos['gnome."
 "org']\"."
 
-#: ../jhbuild/config.py:243 ../jhbuild/config.py:248
+#: ../jhbuild/config.py:244 ../jhbuild/config.py:249
 #, python-format
 msgid ""
 "the \"%s\" configuration variable is deprecated, you should use \"repos\"."
 msgstr "змÑ?нна конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? \"%s\"заÑ?Ñ?аÑ?Ñ?ла, Ñ?лÑ?д викоÑ?иÑ?Ñ?овÑ?ваÑ?и \"repos\"."
 
-#: ../jhbuild/config.py:269
+#: ../jhbuild/config.py:270
 msgid "invalid checkout mode"
 msgstr "непÑ?авилÑ?ний Ñ?ежим checkout"
 
-#: ../jhbuild/config.py:273
+#: ../jhbuild/config.py:274
 #, python-format
 msgid "invalid checkout mode (module: %s)"
 msgstr "непÑ?авилÑ?ний Ñ?ежим checkout (модÑ?лÑ?: %s)"
 
-#: ../jhbuild/config.py:275
+#: ../jhbuild/config.py:276
 msgid "copy mode requires copy_dir to be set"
 msgstr "Ñ?ежим копÑ?Ñ?ваннÑ? вимагаÑ? вÑ?Ñ?ановленнÑ? copy_dir"
 
-#: ../jhbuild/config.py:280
+#: ../jhbuild/config.py:281
 #, python-format
 msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
 msgstr "каÑ?алог модÑ?лÑ?в (%s) не знайдено, вимикаÑ?Ñ?Ñ?Ñ?Ñ? use_local_modulesets"
 
-#: ../jhbuild/config.py:292
+#: ../jhbuild/config.py:293
 #, python-format
 msgid "install prefix (%s) can not be created"
 msgstr "неможливо Ñ?Ñ?воÑ?иÑ?и пÑ?еÑ?Ñ?кÑ? вÑ?Ñ?ановленнÑ? (%s)"
 
-#: ../jhbuild/config.py:363
+#: ../jhbuild/config.py:376
 #, python-format
 msgid "Can't create %s directory"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и каÑ?алог %s"
 
-#: ../jhbuild/config.py:442
+#: ../jhbuild/config.py:460
 #, python-format
 msgid "Could not create GConf config (%s)"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и каÑ?алог GConf (%s)"
 
-#: ../jhbuild/config.py:529
+#: ../jhbuild/config.py:547
 msgid "Failed to parse relative time"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?озÑ?бÑ?аÑ?и вÑ?дноÑ?ний Ñ?аÑ?"
 
-#: ../jhbuild/config.py:539
+#: ../jhbuild/config.py:557
 msgid ""
 "quiet mode has been disabled because the Python curses module is missing."
 msgstr "Ñ?иÑ?ий Ñ?ежим вимкнено оÑ?кÑ?лÑ?ки вÑ?дÑ?Ñ?Ñ?нÑ?й модÑ?лÑ? curses длÑ?  Python."
 
-#: ../jhbuild/main.py:95
+#: ../jhbuild/main.py:98
+msgid "You should not run jhbuild as root.\n"
+msgstr "Ð?е Ñ?лÑ?д запÑ?Ñ?каÑ?и jhbuild вÑ?д Ñ?менÑ? root.\n"
+
+#: ../jhbuild/main.py:106
 msgid "%prog [ -f config ] command [ options ... ]"
 msgstr "%prog [ -f config ] команда [ паÑ?амеÑ?Ñ?и ... ]"
 
-#: ../jhbuild/main.py:97
+#: ../jhbuild/main.py:108
 msgid ""
 "Build a set of modules from diverse repositories in correct dependency order "
 "(such as GNOME)."
@@ -1369,60 +1429,64 @@ msgstr ""
 "Ð?Ñ?бÑ?аÑ?и набÑ?Ñ? модÑ?лÑ?в з Ñ?Ñ?зниÑ? Ñ?епозиÑ?оÑ?Ñ?Ñ?в з Ñ?Ñ?аÑ?Ñ?ваннÑ?м поÑ?Ñ?дкÑ? "
 "залежноÑ?Ñ?ей (напÑ?иклад, GNOME)."
 
-#: ../jhbuild/main.py:101
+#: ../jhbuild/main.py:112
 msgid "Display this help and exit"
 msgstr "Ð?ивеÑ?Ñ?и Ñ?Ñ? довÑ?дкÑ? Ñ?а завеÑ?Ñ?иÑ?иÑ?Ñ?."
 
-#: ../jhbuild/main.py:108
+#: ../jhbuild/main.py:119
 msgid "use a non default configuration file"
 msgstr "викоÑ?иÑ?Ñ?овÑ?ваÑ?и неÑ?иповий конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний Ñ?айл"
 
-#: ../jhbuild/main.py:111
+#: ../jhbuild/main.py:122
 msgid "use a non default module set"
 msgstr "викоÑ?иÑ?Ñ?овÑ?ваÑ?и неÑ?иповий набÑ?Ñ? модÑ?лÑ?в"
 
-#: ../jhbuild/main.py:114
+#: ../jhbuild/main.py:125
 msgid "do not prompt for input"
 msgstr "не пÑ?опонÑ?ваÑ?и ввÑ?д"
 
-#: ../jhbuild/main.py:145
+#: ../jhbuild/main.py:156
 msgid "Interrupted"
 msgstr "Ð?еÑ?еÑ?вано"
 
-#: ../jhbuild/main.py:148
+#: ../jhbuild/main.py:159
 msgid "EOF"
 msgstr "EOF"
 
-#: ../jhbuild/moduleset.py:56
+#: ../jhbuild/moduleset.py:61
 #, python-format
 msgid "fixed case of module '%(orig)s' to '%(new)s'"
 msgstr "випÑ?авлено Ñ?егÑ?Ñ?Ñ?Ñ? модÑ?лÑ? '%(orig)s' на '%(new)s'"
 
-#: ../jhbuild/moduleset.py:72
+#: ../jhbuild/moduleset.py:76
 #, python-format
 msgid "module \"%s\" not found"
 msgstr "не знайдено модÑ?лÑ? \"%s\""
 
-#: ../jhbuild/moduleset.py:86
+#: ../jhbuild/moduleset.py:90
 #, python-format
 msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
 msgstr "%(module)s маÑ? залежнÑ?Ñ?Ñ?Ñ? вÑ?д невÑ?домого модÑ?лÑ? \"%(invalid)s\""
 
-#: ../jhbuild/moduleset.py:231
+#: ../jhbuild/moduleset.py:235
 msgid "Unknown module:"
 msgstr "Ð?евÑ?домий модÑ?лÑ?:"
 
-#: ../jhbuild/moduleset.py:294 ../jhbuild/moduleset.py:324
+#: ../jhbuild/moduleset.py:298 ../jhbuild/moduleset.py:328
 #, python-format
 msgid "failed to parse %s: %s"
 msgstr "помилка Ñ?озбоÑ?Ñ? %s: %s"
 
-#: ../jhbuild/moduleset.py:319
+#: ../jhbuild/moduleset.py:323
 #, python-format
 msgid "could not download %s: %s"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и %s: %s"
 
-#: ../jhbuild/moduleset.py:444
+#: ../jhbuild/moduleset.py:353
+msgid "Duplicate repository:"
+msgstr "Ð?Ñ?блÑ?каÑ? Ñ?епозиÑ?оÑ?Ñ?Ñ?:"
+
+#: ../jhbuild/moduleset.py:455
 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 ."
@@ -1444,3 +1508,5 @@ msgstr "Ð?Ñ?же багаÑ?о позиÑ?Ñ?йниÑ? аÑ?гÑ?менÑ?Ñ?в"
 #: ../jhbuild/monkeypatch.py:127 ../jhbuild/monkeypatch.py:160
 msgid "Unrecognized named group in pattern"
 msgstr "Ð?евÑ?дома Ñ?менована гÑ?Ñ?па Ñ? Ñ?аблонÑ?"
+
+