[jhbuild] Update Ukrainian translation

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

commit 527c7352bdb5eea11cf90bf18b55a99d788d7680
Author: Maxim V. Dziumanenko <dziumanenko gmail com>
Date:   Mon Jan 4 15:25:23 2010 +0200

    Update Ukrainian translation

 po/uk.po | 1092 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 594 insertions(+), 498 deletions(-)
---
diff --git a/po/uk.po b/po/uk.po
index 94d7880..f64587d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,37 +7,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jhbuild\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-09 10:25+0200\n"
-"PO-Revision-Date: 2008-11-13 09:53-0000\n"
+"POT-Creation-Date: 2010-01-04 15:02+0200\n"
+"PO-Revision-Date: 2010-01-04 09:53-0000\n"
 "Last-Translator: Maxim V. Dziumanenko <dziumanenko gmail com>\n"
 "Language-Team: Ukrainian <uk li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../jhbuild.desktop.in.in.h:1
+msgid "Build GNOME modules"
+msgstr "Ð?обÑ?дова модÑ?лÑ?в GNOME"
+
+#: ../jhbuild.desktop.in.in.h:2
+msgid "GNOME Build Tool"
+msgstr "Ð?аÑ?Ñ?б збиÑ?аннÑ? GNOME"
+
 #: ../jhbuild/commands/autobuild.py:27
 msgid "Build modules non-interactively and upload results to JhAutobuild"
 msgstr ""
 "Ð?биÑ?аÑ?и модÑ?лÑ? не-Ñ?нÑ?еÑ?акÑ?ивно Ñ?а виванÑ?ажÑ?ваÑ?и Ñ?езÑ?лÑ?Ñ?аÑ?и до JhAutobuild"
 
-#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/base.py:225
-#: ../jhbuild/commands/base.py:348 ../jhbuild/commands/tinderbox.py:37
+#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/base.py:214
+#: ../jhbuild/commands/base.py:308 ../jhbuild/commands/tinderbox.py:37
 msgid "always run autogen.sh"
 msgstr "завжди запÑ?Ñ?каÑ?и autogen.sh"
 
-#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:228
-#: ../jhbuild/commands/base.py:351 ../jhbuild/commands/tinderbox.py:40
+#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:217
+#: ../jhbuild/commands/base.py:311 ../jhbuild/commands/tinderbox.py:40
 msgid "run make clean before make"
 msgstr "запÑ?Ñ?каÑ?и make clean пеÑ?ед make"
 
-#: ../jhbuild/commands/autobuild.py:41 ../jhbuild/commands/base.py:52
-#: ../jhbuild/commands/base.py:246 ../jhbuild/commands/base.py:502
-#: ../jhbuild/commands/tinderbox.py:49
+#: ../jhbuild/commands/autobuild.py:41 ../jhbuild/commands/base.py:46
+#: ../jhbuild/commands/base.py:238 ../jhbuild/commands/base.py:466
+#: ../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:55
-#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/tinderbox.py:52
+#: ../jhbuild/commands/autobuild.py:44 ../jhbuild/commands/base.py:49
+#: ../jhbuild/commands/base.py:241 ../jhbuild/commands/clean.py:41
+#: ../jhbuild/commands/tinderbox.py:52
 msgid "start building at the given module"
 msgstr "запÑ?Ñ?Ñ?иÑ?и збиÑ?аннÑ? певного модÑ?лÑ?"
 
@@ -53,222 +62,241 @@ msgstr "докладний вивÑ?д"
 msgid "report url for autobuild not specified"
 msgstr "не вказано url звÑ?Ñ?Ñ? длÑ? авÑ?омаÑ?иÑ?ного збиÑ?аннÑ?"
 
-#: ../jhbuild/commands/autobuild.py:81 ../jhbuild/commands/base.py:86
-#: ../jhbuild/commands/base.py:325 ../jhbuild/commands/base.py:541
-#: ../jhbuild/commands/tinderbox.py:101
+#: ../jhbuild/commands/autobuild.py:81 ../jhbuild/commands/base.py:72
+#: ../jhbuild/commands/base.py:285 ../jhbuild/commands/base.py:500
+#: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:86
 #, python-format
 msgid "%s not in module list"
 msgstr "%s немаÑ? Ñ? пиÑ?кÑ? модÑ?лÑ?в"
 
-#: ../jhbuild/commands/base.py:39
-#, python-format
-msgid "unable to parse '%s' as relative time."
-msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?оаналÑ?зÑ?ваÑ?и '%s' Ñ?к вÑ?дноÑ?ний Ñ?аÑ?."
-
-#: ../jhbuild/commands/base.py:43
+#: ../jhbuild/commands/base.py:37
 msgid "Update all modules from version control"
 msgstr "Ð?новиÑ?и Ñ?Ñ?Ñ? модÑ?лÑ? з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й"
 
-#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:252
-#: ../jhbuild/commands/base.py:508
+#: ../jhbuild/commands/base.py:40 ../jhbuild/commands/base.py:88
+#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:208
+#: ../jhbuild/commands/base.py:302 ../jhbuild/commands/base.py:457
+#: ../jhbuild/commands/tinderbox.py:31
+msgid "[ options ... ] [ modules ... ]"
+msgstr "[ паÑ?амеÑ?Ñ?и ... ] [ модÑ?лÑ? ... ]"
+
+#: ../jhbuild/commands/base.py:52 ../jhbuild/commands/base.py:244
+#: ../jhbuild/commands/base.py:472
 msgid "build only modules with the given tags"
 msgstr "зÑ?бÑ?аÑ?и лиÑ?е модÑ?лÑ? з певними Ñ?егами"
 
-#: ../jhbuild/commands/base.py:61 ../jhbuild/commands/base.py:108
-#: ../jhbuild/commands/base.py:255 ../jhbuild/commands/base.py:366
+#: ../jhbuild/commands/base.py:55 ../jhbuild/commands/base.py:94
+#: ../jhbuild/commands/base.py:247 ../jhbuild/commands/base.py:329
 #: ../jhbuild/commands/tinderbox.py:55
 msgid "set a sticky date when checking out modules"
 msgstr "вÑ?Ñ?ановиÑ?и sticky-даÑ?Ñ? пÑ?и оÑ?Ñ?иманнÑ? модÑ?лÑ? з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й"
 
-#: ../jhbuild/commands/base.py:64 ../jhbuild/commands/base.py:237
-#: ../jhbuild/commands/base.py:511
+#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:229
+#: ../jhbuild/commands/base.py:475
 msgid "ignore all soft-dependencies"
 msgstr "Ñ?гноÑ?Ñ?ваÑ?и Ñ?Ñ?Ñ? м'Ñ?кÑ? залежноÑ?Ñ?Ñ?"
 
-#: ../jhbuild/commands/base.py:99
+#: ../jhbuild/commands/base.py:85
 msgid "Update one or more modules from version control"
 msgstr "Ð?новиÑ?и один або бÑ?лÑ?Ñ?е модÑ?лÑ?в з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й"
 
-#: ../jhbuild/commands/base.py:119 ../jhbuild/commands/base.py:154
-#: ../jhbuild/commands/base.py:410 ../jhbuild/commands/base.py:451
-#: ../jhbuild/commands/rdepends.py:52
+#: ../jhbuild/commands/base.py:103 ../jhbuild/commands/base.py:138
+#: ../jhbuild/commands/base.py:351 ../jhbuild/commands/base.py:398
+#: ../jhbuild/commands/base.py:415 ../jhbuild/commands/rdepends.py:52
 #, python-format
 msgid "A module called '%s' could not be found."
 msgstr "Ð?одÑ?лÑ? з назвоÑ? '%s' не знайдено."
 
-#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:157
-#: ../jhbuild/commands/base.py:413 ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/base.py:106 ../jhbuild/commands/base.py:141
+#: ../jhbuild/commands/base.py:354 ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/uninstall.py:41
 msgid "This command requires a module parameter."
 msgstr "Ð?оманда маÑ? обов'Ñ?зковий паÑ?амеÑ?Ñ?. "
 
-#: ../jhbuild/commands/base.py:135
+#: ../jhbuild/commands/base.py:119
 msgid "Clean one or more modules"
 msgstr "Ð?Ñ?иÑ?Ñ?иÑ?и один або бÑ?лÑ?Ñ?е модÑ?лÑ?в"
 
-#: ../jhbuild/commands/base.py:144
+#: ../jhbuild/commands/base.py:128
 msgid "honour the makeclean setting in config file"
 msgstr "звеÑ?Ñ?аÑ?иÑ?Ñ? до паÑ?амеÑ?Ñ?Ñ? makeclean Ñ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йномÑ? Ñ?айлÑ?"
 
-#: ../jhbuild/commands/base.py:161
-msgid "I: clean command called while makeclean is set to False, skipped."
-msgstr "I: виклик команди clean коли makeclean маÑ? знаÑ?еннÑ? False, пÑ?опÑ?Ñ?ено."
+#: ../jhbuild/commands/base.py:145
+msgid "clean command called while makeclean is set to False, skipped."
+msgstr "виклик команди clean коли makeclean маÑ? знаÑ?еннÑ? False, пÑ?опÑ?Ñ?ено."
 
-#: ../jhbuild/commands/base.py:204
+#: ../jhbuild/commands/base.py:193
 msgid ""
-"I: bootstrap moduleset has been updated since the last time you used it, "
+"bootstrap moduleset has been updated since the last time you used it, "
 "perhaps you should run jhbuild bootstrap."
 msgstr ""
-"I: bootstrap набоÑ?Ñ? модÑ?лÑ?в бÑ?ло оновлено з моменÑ?Ñ? оÑ?Ñ?аннÑ?ого викоÑ?иÑ?Ñ?аннÑ?, "
+"bootstrap набоÑ?Ñ? модÑ?лÑ?в бÑ?ло оновлено з моменÑ?Ñ? оÑ?Ñ?аннÑ?ого викоÑ?иÑ?Ñ?аннÑ?, "
 "можливо, Ñ?лÑ?д запÑ?Ñ?Ñ?иÑ?и jhbuild bootstrap."
 
-#: ../jhbuild/commands/base.py:210
+#: ../jhbuild/commands/base.py:199
 #, python-format
 msgid ""
-"I: some bootstrap modules have been updated, perhaps you should update them: "
-"%s."
-msgstr ""
-"I: деÑ?кÑ? bootstrap-модÑ?лÑ? бÑ?ло оновлено, можливо, Ñ?лÑ?д оновиÑ?и Ñ?Ñ?: "
-"%s."
+"some bootstrap modules have been updated, perhaps you should update them: %s."
+msgstr "деÑ?кÑ? bootstrap-модÑ?лÑ? бÑ?ло оновлено, можливо, Ñ?лÑ?д оновиÑ?и Ñ?Ñ?: %s."
 
-#: ../jhbuild/commands/base.py:216
+#: ../jhbuild/commands/base.py:205
 msgid "Update and compile all modules (the default)"
 msgstr "Ð?новиÑ?и Ñ?а Ñ?компÑ?лÑ?ваÑ?и Ñ?Ñ?Ñ? модÑ?лÑ? (Ñ?ипово)"
 
-#: ../jhbuild/commands/base.py:219 ../jhbuild/commands/base.py:342
-#: ../jhbuild/commands/base.py:493 ../jhbuild/commands/tinderbox.py:31
-msgid "[ options ... ] [ modules ... ]"
-msgstr "[ паÑ?амеÑ?Ñ?и ... ] [ модÑ?лÑ? ... ]"
+#: ../jhbuild/commands/base.py:220 ../jhbuild/commands/base.py:314
+msgid "run make check after building"
+msgstr "пÑ?Ñ?лÑ? збиÑ?аннÑ? запÑ?Ñ?Ñ?иÑ?и make check"
 
-#: ../jhbuild/commands/base.py:231 ../jhbuild/commands/base.py:354
+#: ../jhbuild/commands/base.py:223 ../jhbuild/commands/base.py:317
 msgid "run make dist after building"
 msgstr "пÑ?Ñ?лÑ? збиÑ?аннÑ? запÑ?Ñ?Ñ?иÑ?и make dist"
 
-#: ../jhbuild/commands/base.py:234 ../jhbuild/commands/base.py:357
+#: ../jhbuild/commands/base.py:226 ../jhbuild/commands/base.py:320
 msgid "run make distcheck after building"
 msgstr "пÑ?Ñ?лÑ? збиÑ?аннÑ? запÑ?Ñ?Ñ?иÑ?и make distcheck"
 
-#: ../jhbuild/commands/base.py:240 ../jhbuild/commands/base.py:360
+#: ../jhbuild/commands/base.py:232 ../jhbuild/commands/base.py:323
 #: ../jhbuild/commands/tinderbox.py:43
 msgid "skip version control update"
 msgstr "пÑ?опÑ?Ñ?Ñ?иÑ?и оновленнÑ? з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й"
 
-#: ../jhbuild/commands/base.py:243 ../jhbuild/commands/base.py:363
+#: ../jhbuild/commands/base.py:235 ../jhbuild/commands/base.py:326
 msgid "quiet (no output)"
 msgstr "не виводиÑ?и повÑ?домленнÑ?"
 
-#: ../jhbuild/commands/base.py:258 ../jhbuild/commands/base.py:369
+#: ../jhbuild/commands/base.py:250 ../jhbuild/commands/base.py:332
 msgid "run tests in real X and not in Xvfb"
 msgstr "запÑ?Ñ?каÑ?и Ñ?еÑ?Ñ?и Ñ? Ñ?иÑ?Ñ?емÑ? X, а не Ñ? Xvfb"
 
-#: ../jhbuild/commands/base.py:261 ../jhbuild/commands/tinderbox.py:58
+#: ../jhbuild/commands/base.py:253 ../jhbuild/commands/tinderbox.py:58
 msgid "try to force checkout and autogen on failure"
 msgstr ""
 "Ñ? Ñ?азÑ? помилки, виконаÑ?и пÑ?имÑ?Ñ?ове оÑ?Ñ?иманнÑ? кодÑ? з Ñ?иÑ?Ñ?еми конÑ?Ñ?олÑ? веÑ?Ñ?Ñ?й "
 "Ñ?а запÑ?Ñ?Ñ?иÑ?и autogen"
 
-#: ../jhbuild/commands/base.py:264 ../jhbuild/commands/tinderbox.py:61
+#: ../jhbuild/commands/base.py:256 ../jhbuild/commands/tinderbox.py:61
 msgid "don't poison modules on failure"
 msgstr "не виконÑ?ваÑ?и poison модÑ?лÑ?в Ñ? Ñ?азÑ? помилки"
 
-#: ../jhbuild/commands/base.py:267 ../jhbuild/commands/base.py:372
+#: ../jhbuild/commands/base.py:259 ../jhbuild/commands/base.py:335
 #: ../jhbuild/commands/tinderbox.py:64
 msgid "build even if policy says not to"
 msgstr "збиÑ?аÑ?и навÑ?Ñ?Ñ?, Ñ?кÑ?о Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?казано не Ñ?ак"
 
-#: ../jhbuild/commands/base.py:270
+#: ../jhbuild/commands/base.py:262
 msgid "also build soft-dependencies that could be skipped"
 msgstr "Ñ?акож збиÑ?аÑ?и м'Ñ?кÑ? залежноÑ?Ñ?Ñ?, Ñ?кÑ? б бÑ?ли пÑ?опÑ?Ñ?енÑ?"
 
-#: ../jhbuild/commands/base.py:273 ../jhbuild/commands/base.py:375
+#: ../jhbuild/commands/base.py:265 ../jhbuild/commands/base.py:338
 msgid "skip modules installed less than the given time ago"
 msgstr "пÑ?опÑ?Ñ?каÑ?и модÑ?лÑ?, вÑ?Ñ?ановленÑ? менÑ?е нÑ?ж вказаний Ñ?аÑ? Ñ?омÑ?"
 
-#: ../jhbuild/commands/base.py:309 ../jhbuild/commands/base.py:401
-msgid "Failed to parse relative time"
-msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?озÑ?бÑ?аÑ?и вÑ?дноÑ?ний Ñ?аÑ?"
-
-#: ../jhbuild/commands/base.py:329
-msgid "I: requested module is in the ignore list, nothing to do."
-msgstr "I: запиÑ?аний модÑ?лÑ? Ñ? Ñ?пиÑ?кÑ?, немаÑ? Ñ?о Ñ?обиÑ?и."
+#: ../jhbuild/commands/base.py:289
+msgid "requested module is in the ignore list, nothing to do."
+msgstr "запиÑ?аний модÑ?лÑ? Ñ? Ñ?пиÑ?кÑ?, немаÑ? Ñ?о Ñ?обиÑ?и."
 
-#: ../jhbuild/commands/base.py:339
+#: ../jhbuild/commands/base.py:299
 msgid "Update and compile one or more modules"
 msgstr "Ð?новиÑ?и Ñ?а Ñ?компÑ?лÑ?ваÑ?и один або бÑ?лÑ?Ñ?е модÑ?лÑ?в"
 
-#: ../jhbuild/commands/base.py:422
+#: ../jhbuild/commands/base.py:363
 msgid "Run a command under the JHBuild environment"
 msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и командÑ? Ñ? оÑ?оÑ?еннÑ? JHBuild"
 
-#: ../jhbuild/commands/base.py:425
+#: ../jhbuild/commands/base.py:366
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr "[ паÑ?амеÑ?Ñ?и ... ] пÑ?огÑ?ама [ аÑ?гÑ?менÑ?и ... ]"
 
-#: ../jhbuild/commands/base.py:431
+#: ../jhbuild/commands/base.py:372
 msgid "run command in build dir of the given module"
 msgstr "виконаÑ?и командÑ? Ñ? каÑ?алозÑ? збиÑ?аннÑ? одного з вказаниÑ? модÑ?лÑ?в"
 
-#: ../jhbuild/commands/base.py:441 ../jhbuild/commands/base.py:468
+#: ../jhbuild/commands/base.py:375
+msgid "run command in checkout dir of the given module"
+msgstr "виконаÑ?и командÑ? Ñ? каÑ?алозÑ? checkout одного з вказаниÑ? модÑ?лÑ?в"
+
+#: ../jhbuild/commands/base.py:388 ../jhbuild/commands/base.py:432
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? виконаÑ?и командÑ? '%(command)s': %(err)s"
 
-#: ../jhbuild/commands/base.py:459
+#: ../jhbuild/commands/base.py:406 ../jhbuild/commands/base.py:423
 #, python-format
 msgid "Unable to execute the command '%s'"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? виконаÑ?и командÑ? '%s'"
 
-#: ../jhbuild/commands/base.py:466 ../jhbuild/frontends/terminal.py:141
+#: ../jhbuild/commands/base.py:430 ../jhbuild/frontends/gtkui.py:443
+#: ../jhbuild/frontends/terminal.py:144
 msgid "No command given"
 msgstr "Ð?е вказано жодноÑ? команди"
 
-#: ../jhbuild/commands/base.py:475
+#: ../jhbuild/commands/base.py:439
 msgid "Start a shell under the JHBuild environment"
 msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и оболонкÑ? Ñ? оÑ?оÑ?еннÑ? JHBuild"
 
-#: ../jhbuild/commands/base.py:490
+#: ../jhbuild/commands/base.py:454
 msgid "List the modules that would be built"
 msgstr "Ð?еÑ?елÑ?Ñ?иÑ?и модÑ?лÑ?, Ñ?кÑ? бÑ?ли б побÑ?дованÑ?"
 
-#: ../jhbuild/commands/base.py:499
+#: ../jhbuild/commands/base.py:463
 msgid "show which revision will be built"
 msgstr "показаÑ?и Ñ?ка веÑ?Ñ?Ñ?Ñ? бÑ?де побÑ?дована"
 
-#: ../jhbuild/commands/base.py:505
+#: ../jhbuild/commands/base.py:469
 msgid "start list at the given module"
 msgstr "запÑ?Ñ?Ñ?иÑ?и Ñ?пиÑ?ок з вказаноÑ? команди"
 
-#: ../jhbuild/commands/base.py:514
+#: ../jhbuild/commands/base.py:478
 msgid "also list soft-dependencies that could be skipped"
 msgstr "Ñ?акож пеÑ?елÑ?Ñ?иÑ?и м'Ñ?кÑ? залежноÑ?Ñ?Ñ?, Ñ?кÑ? бÑ?ли б пÑ?опÑ?Ñ?енÑ?"
 
-#: ../jhbuild/commands/base.py:517
+#: ../jhbuild/commands/base.py:481
 msgid "list all modules, not only those that would be built"
 msgstr "пеÑ?елÑ?Ñ?иÑ?и Ñ?Ñ?Ñ? модÑ?лÑ?, але лиÑ?е Ñ?Ñ?, Ñ?кÑ? бÑ?ли б зÑ?бÑ?анÑ?"
 
-#: ../jhbuild/commands/base.py:557
+#: ../jhbuild/commands/base.py:516
 msgid "Output a Graphviz dependency graph for one or more modules"
 msgstr "Ð?ивÑ?д гÑ?аÑ? залежноÑ?Ñ?ей Ñ? Graphviz длÑ? одного або кÑ?лÑ?коÑ? модÑ?лÑ?в"
 
-#: ../jhbuild/commands/base.py:560 ../jhbuild/commands/info.py:42
+#: ../jhbuild/commands/base.py:519 ../jhbuild/commands/info.py:40
+#: ../jhbuild/commands/uninstall.py:32
 msgid "[ modules ... ]"
 msgstr "[ модÑ?лÑ? ... ]"
 
-#: ../jhbuild/commands/base.py:566
+#: ../jhbuild/commands/base.py:525
 msgid "add dotted lines to soft dependencies"
 msgstr "додаÑ?и Ñ?Ñ?дки з кÑ?апками до м'Ñ?киÑ? залежноÑ?Ñ?ей"
 
-#: ../jhbuild/commands/base.py:569
+#: ../jhbuild/commands/base.py:528
 msgid "group modules from metamodule together"
 msgstr "згÑ?Ñ?пÑ?ваÑ?и Ñ?азом модÑ?лÑ? з меÑ?амодÑ?лÑ?"
 
-#: ../jhbuild/commands/bootstrap.py:30
+#: ../jhbuild/commands/bootstrap.py:34
 msgid "Build required support tools"
 msgstr "Ð?Ñ?бÑ?аÑ?и поÑ?Ñ?Ñ?бнÑ? допомÑ?жнÑ? Ñ?Ñ?илÑ?Ñ?и"
 
+#: ../jhbuild/commands/bootstrap.py:43
+msgid "do not use system installed modules"
+msgstr "не викоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?иÑ?Ñ?емнÑ? вÑ?Ñ?ановленÑ? модÑ?лÑ?"
+
+#: ../jhbuild/commands/bootstrap.py:85
+#, python-format
+msgid ""
+"some modules (%s) were automatically ignored as a sufficient enough version "
+"was found installed on your system. Use --ignore-system if you want to build "
+"them nevertheless."
+msgstr ""
+"деÑ?кÑ? модÑ?лÑ? (%s) авÑ?омаÑ?иÑ?но Ñ?гноÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?, Ñ?кÑ?о бÑ?дÑ?Ñ?Ñ? знайденÑ? доÑ?Ñ?аÑ?нÑ? веÑ?Ñ?Ñ?Ñ?, "
+"Ñ?о вÑ?Ñ?ановленÑ? Ñ? ваÑ?Ñ?й Ñ?иÑ?Ñ?емÑ?. Ð?икоÑ?иÑ?Ñ?овÑ?йÑ?е --ignore-system, Ñ?кÑ?о Ñ?Ñ?еба збиÑ?аÑ?и Ñ?Ñ? попÑ?и вÑ?е."
+
 #: ../jhbuild/commands/bot.py:53
 msgid "Control buildbot"
 msgstr "Ð?еÑ?Ñ?ваннÑ? buildbot"
 
+#: ../jhbuild/commands/bot.py:56 ../jhbuild/commands/__init__.py:45
+msgid "[ options ... ]"
+msgstr "[ паÑ?амеÑ?Ñ?и ... ]"
+
 #: ../jhbuild/commands/bot.py:62
 msgid "setup a buildbot environment"
 msgstr "вÑ?Ñ?ановиÑ?и оÑ?оÑ?еннÑ? buildbot"
@@ -286,153 +314,173 @@ msgid "start a buildbot master server"
 msgstr "запÑ?Ñ?Ñ?иÑ?и головний Ñ?еÑ?веÑ? buildbot"
 
 #: ../jhbuild/commands/bot.py:74
+msgid "reload a buildbot master server configuration"
+msgstr "пеÑ?езаванÑ?ажиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? головного Ñ?еÑ?веÑ?а buildbot"
+
+#: ../jhbuild/commands/bot.py:77
 msgid "stop a buildbot master server"
 msgstr "зÑ?пиниÑ?и головний Ñ?еÑ?веÑ? buildbot"
 
-#: ../jhbuild/commands/bot.py:77
+#: ../jhbuild/commands/bot.py:80
 msgid "start as daemon"
 msgstr "запÑ?Ñ?Ñ?иÑ?и Ñ?лÑ?жбÑ?"
 
-#: ../jhbuild/commands/bot.py:80
+#: ../jhbuild/commands/bot.py:83
 msgid "pid file location"
 msgstr "Ñ?озÑ?аÑ?Ñ?ваннÑ? pid-Ñ?айлÑ?"
 
-#: ../jhbuild/commands/bot.py:83
+#: ../jhbuild/commands/bot.py:86
 msgid "log file location"
 msgstr "Ñ?озÑ?аÑ?Ñ?ваннÑ? Ñ?айлÑ? жÑ?Ñ?налÑ?"
 
-#: ../jhbuild/commands/bot.py:86
-msgid "directory with slaves files (only with --start-server)"
+#: ../jhbuild/commands/bot.py:89
+msgid "directory with slave files (only with --start-server)"
 msgstr "каÑ?алог з slave-Ñ?айлами (лиÑ?е з --start-server)"
 
-#: ../jhbuild/commands/bot.py:89
+#: ../jhbuild/commands/bot.py:92
+msgid "directory with buildbot work files (only with --start-server)"
+msgstr "каÑ?алог з Ñ?айлами buildbot (лиÑ?е з --start-server)"
+
+#: ../jhbuild/commands/bot.py:95
 msgid "master cfg file location (only with --start-server)"
 msgstr "Ñ?озÑ?аÑ?Ñ?ваннÑ? головного конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йного Ñ?айлÑ? (лиÑ?е з --start-server)"
 
-#: ../jhbuild/commands/bot.py:92
+#: ../jhbuild/commands/bot.py:98
 msgid "exec a buildbot step (internal use only)"
 msgstr "виконаÑ?и кÑ?ок buildbot (лиÑ?е внÑ?Ñ?Ñ?Ñ?Ñ?нÑ? викоÑ?иÑ?Ñ?аннÑ?)"
 
-#: ../jhbuild/commands/bot.py:111
+#: ../jhbuild/commands/bot.py:117
 msgid "buildbot and twisted not found, run jhbuild bot --setup"
 msgstr "buildbot Ñ?а twisted не знайдено, запÑ?Ñ?Ñ?Ñ?Ñ?Ñ? jhbuild bot --setup"
 
-#: ../jhbuild/commands/bot.py:664
+#: ../jhbuild/commands/bot.py:723 ../jhbuild/commands/bot.py:731
 msgid "failed to get buildbot PID"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и buildbot PID"
 
-#: ../jhbuild/commands/checkbranches.py:29
-msgid "Check modules in GNOME subversion have the correct branch definition"
+#: ../jhbuild/commands/checkbranches.py:28
+msgid ""
+"Check modules in GNOME Git repository have the correct branch definition"
 msgstr ""
-"Ð?еÑ?евÑ?Ñ?иÑ?и, Ñ?о модÑ?лÑ? Ñ? GNOME subversion маÑ?Ñ?Ñ? коÑ?екÑ?не визнаÑ?еннÑ? гÑ?лок"
+"Ð?еÑ?евÑ?Ñ?иÑ?и, Ñ?о модÑ?лÑ? Ñ? GNOME Git маÑ?Ñ?Ñ? коÑ?екÑ?не визнаÑ?еннÑ? гÑ?лок"
 
-#: ../jhbuild/commands/checkbranches.py:67
+#: ../jhbuild/commands/checkbranches.py:63
 #, python-format
 msgid "%(module)s is missing branch definition for %(branch)s"
 msgstr "Ñ? %(module)s вÑ?дÑ?Ñ?Ñ?нÑ? визнаÑ?еннÑ? гÑ?лки длÑ? %(branch)s"
 
-#: ../jhbuild/commands/gui.py:27
+#: ../jhbuild/commands/checkmodulesets.py:30
+msgid "Check if modules in jhbuild have the correct definition"
+msgstr ""
+"Ð?еÑ?евÑ?Ñ?иÑ?и, Ñ?о модÑ?лÑ? Ñ? GNOME jhbuild маÑ?Ñ?Ñ? коÑ?екÑ?не визнаÑ?еннÑ? гÑ?лок"
+
+#: ../jhbuild/commands/checkmodulesets.py:42
+#, python-format
+msgid "%(module)s is unreachable (%(href)s)"
+msgstr "%(module)s недоÑ?Ñ?жний (%(href)s)"
+
+#: ../jhbuild/commands/checkmodulesets.py:45
+#, python-format
+msgid "Cannot check %(module)s (%(href)s)"
+msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?евÑ?Ñ?иÑ?и %(module)s (%(href)s)"
+
+#: ../jhbuild/commands/clean.py:29
+msgid "Clean all modules"
+msgstr "Ð?Ñ?иÑ?Ñ?иÑ?и Ñ?Ñ?Ñ? модÑ?лÑ?"
+
+#: ../jhbuild/commands/gui.py:30
 msgid "Build targets from a GUI app"
 msgstr "Ð?Ñ?бÑ?аÑ?и модÑ?лÑ? з гÑ?аÑ?Ñ?Ñ?ноÑ? пÑ?огÑ?ами"
 
-#: ../jhbuild/commands/info.py:39
+#: ../jhbuild/commands/info.py:37
 msgid "Display information about one or more modules"
 msgstr "Ð?оказаÑ?и Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о один або декÑ?лÑ?ка модÑ?лÑ?в"
 
-#: ../jhbuild/commands/info.py:54
+#: ../jhbuild/commands/info.py:52
 #, python-format
 msgid "unknown module %s"
 msgstr "невÑ?домий модÑ?лÑ? %s"
 
-#: ../jhbuild/commands/info.py:63
+#: ../jhbuild/commands/info.py:61
 msgid "Name:"
 msgstr "Ð?азва:"
 
-#: ../jhbuild/commands/info.py:64
+#: ../jhbuild/commands/info.py:62
 msgid "Module Set:"
 msgstr "Ð?абÑ?Ñ? модÑ?лÑ?в:"
 
-#: ../jhbuild/commands/info.py:65
+#: ../jhbuild/commands/info.py:63
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../jhbuild/commands/info.py:68 ../jhbuild/commands/info.py:71
-msgid "Install-date:"
+#: ../jhbuild/commands/info.py:66 ../jhbuild/commands/info.py:69
+msgid "Install date:"
 msgstr "Ð?аÑ?а вÑ?Ñ?ановленнÑ?:"
 
-#: ../jhbuild/commands/info.py:71
+#: ../jhbuild/commands/info.py:69
 msgid "not installed"
 msgstr "не вÑ?Ñ?ановлено"
 
-#: ../jhbuild/commands/info.py:75
-msgid "Moz-Projects:"
-msgstr "Moz-Projects:"
-
-#: ../jhbuild/commands/info.py:80
+#: ../jhbuild/commands/info.py:74
 msgid "CVS-Root:"
 msgstr "CVS-Root:"
 
-#: ../jhbuild/commands/info.py:81
+#: ../jhbuild/commands/info.py:75
 msgid "CVS-Module:"
 msgstr "CVS-Module:"
 
-#: ../jhbuild/commands/info.py:83
+#: ../jhbuild/commands/info.py:77
 msgid "CVS-Revision:"
 msgstr "CVS-Revision:"
 
-#: ../jhbuild/commands/info.py:85
+#: ../jhbuild/commands/info.py:79
 msgid "Subversion-Module:"
 msgstr "Subversion-Module:"
 
-#: ../jhbuild/commands/info.py:87
+#: ../jhbuild/commands/info.py:81
 msgid "Arch-Version:"
 msgstr "Arch-Version:"
 
-#: ../jhbuild/commands/info.py:89
+#: ../jhbuild/commands/info.py:83
 msgid "Darcs-Archive:"
 msgstr "Darcs-Archive:"
 
-#: ../jhbuild/commands/info.py:91
+#: ../jhbuild/commands/info.py:85
 msgid "Git-Module:"
 msgstr "Git-Module:"
 
-#: ../jhbuild/commands/info.py:93
+#: ../jhbuild/commands/info.py:87
 msgid "URL:"
 msgstr "URL:"
 
-#: ../jhbuild/commands/info.py:94
+#: ../jhbuild/commands/info.py:88
 msgid "Version:"
 msgstr "Ð?еÑ?Ñ?Ñ?Ñ?:"
 
-#: ../jhbuild/commands/info.py:97
+#: ../jhbuild/commands/info.py:91
 msgid "Tree-ID:"
 msgstr "Tree-ID:"
 
-#: ../jhbuild/commands/info.py:103
+#: ../jhbuild/commands/info.py:97
 msgid "Requires:"
 msgstr "Ð?имагаÑ?:"
 
-#: ../jhbuild/commands/info.py:107
+#: ../jhbuild/commands/info.py:101
 msgid "Required-by:"
 msgstr "Ð?оÑ?Ñ?Ñ?бен длÑ?:"
 
-#: ../jhbuild/commands/info.py:109
+#: ../jhbuild/commands/info.py:103
 msgid "Suggests:"
 msgstr "Ð?Ñ?опонÑ?Ñ?:"
 
-#: ../jhbuild/commands/info.py:111
+#: ../jhbuild/commands/info.py:105
 msgid "After:"
 msgstr "Ð?Ñ?Ñ?лÑ?:"
 
-#: ../jhbuild/commands/info.py:115
+#: ../jhbuild/commands/info.py:109
 msgid "Before:"
 msgstr "Ð?еÑ?ед:"
 
-#: ../jhbuild/commands/__init__.py:37
-msgid "[ options ... ]"
-msgstr "[ паÑ?амеÑ?Ñ?и ... ]"
-
-#: ../jhbuild/commands/__init__.py:74
+#: ../jhbuild/commands/__init__.py:82
 msgid "command not found"
 msgstr "командÑ? не знайдено"
 
@@ -452,76 +500,82 @@ msgstr "показаÑ?и Ñ?лÑ?Ñ? залежноÑ?Ñ?ей навпÑ?оÑ?и мод
 msgid "limit display to modules directly depending on given module"
 msgstr "обмежиÑ?и показ модÑ?лÑ?в пÑ?Ñ?мо безпоÑ?еÑ?еднÑ?о залежниÑ? вÑ?д Ñ?Ñ?ого модÑ?лÑ?"
 
-#: ../jhbuild/commands/sanitycheck.py:49
+#: ../jhbuild/commands/sanitycheck.py:52
 msgid "Check that required support tools are available"
 msgstr "Ð?еÑ?евÑ?Ñ?иÑ?и, Ñ?о поÑ?Ñ?Ñ?бнÑ? длÑ? збиÑ?аннÑ? Ñ?Ñ?илÑ?Ñ?и Ñ? доÑ?Ñ?Ñ?пними"
 
-#: ../jhbuild/commands/sanitycheck.py:56
+#: ../jhbuild/commands/sanitycheck.py:59
 msgid "no extra arguments expected"
 msgstr "команда не пÑ?иймаÑ? додаÑ?ковиÑ? паÑ?амеÑ?Ñ?Ñ?в"
 
-#: ../jhbuild/commands/sanitycheck.py:61
-msgid "checkout root is not writable"
-msgstr "коÑ?Ñ?нÑ? checkout недоÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
-
 #: ../jhbuild/commands/sanitycheck.py:64
-msgid "install prefix is not writable"
-msgstr "Ñ?лÑ?Ñ? з пÑ?еÑ?Ñ?кÑ?ом вÑ?Ñ?ановленнÑ? недоÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
-
-#: ../jhbuild/commands/sanitycheck.py:69 ../jhbuild/commands/sanitycheck.py:72
-#: ../jhbuild/commands/sanitycheck.py:75 ../jhbuild/commands/sanitycheck.py:78
-#: ../jhbuild/commands/sanitycheck.py:81 ../jhbuild/commands/sanitycheck.py:84
-#: ../jhbuild/commands/sanitycheck.py:87 ../jhbuild/commands/sanitycheck.py:90
-#: ../jhbuild/commands/sanitycheck.py:93
-#: ../jhbuild/commands/sanitycheck.py:130
-#: ../jhbuild/commands/sanitycheck.py:134
+#, python-format
+msgid "checkout root (%s) is not writable"
+msgstr "коÑ?Ñ?нÑ? checkout (%s) недоÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
+
+#: ../jhbuild/commands/sanitycheck.py:67
+#, python-format
+msgid "install prefix (%s) is not writable"
+msgstr "Ñ?лÑ?Ñ? з пÑ?еÑ?Ñ?кÑ?ом вÑ?Ñ?ановленнÑ? (%s) недоÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
+
+#: ../jhbuild/commands/sanitycheck.py:72 ../jhbuild/commands/sanitycheck.py:75
+#: ../jhbuild/commands/sanitycheck.py:78 ../jhbuild/commands/sanitycheck.py:81
+#: ../jhbuild/commands/sanitycheck.py:84 ../jhbuild/commands/sanitycheck.py:87
+#: ../jhbuild/commands/sanitycheck.py:90 ../jhbuild/commands/sanitycheck.py:93
+#: ../jhbuild/commands/sanitycheck.py:96
 #: ../jhbuild/commands/sanitycheck.py:138
-#: ../jhbuild/commands/sanitycheck.py:149
-#: ../jhbuild/versioncontrol/arch.py:155 ../jhbuild/versioncontrol/bzr.py:138
+#: ../jhbuild/commands/sanitycheck.py:142
+#: ../jhbuild/commands/sanitycheck.py:150
+#: ../jhbuild/commands/sanitycheck.py:159
+#: ../jhbuild/versioncontrol/arch.py:155 ../jhbuild/versioncontrol/bzr.py:148
 #: ../jhbuild/versioncontrol/cvs.py:297 ../jhbuild/versioncontrol/darcs.py:108
-#: ../jhbuild/versioncontrol/git.py:234 ../jhbuild/versioncontrol/hg.py:100
-#: ../jhbuild/versioncontrol/mtn.py:139 ../jhbuild/versioncontrol/svn.py:311
+#: ../jhbuild/versioncontrol/git.py:334 ../jhbuild/versioncontrol/hg.py:101
+#: ../jhbuild/versioncontrol/mtn.py:140 ../jhbuild/versioncontrol/svn.py:311
 #, python-format
 msgid "%s not found"
 msgstr "%s не знайдено"
 
-#: ../jhbuild/commands/sanitycheck.py:102
+#: ../jhbuild/commands/sanitycheck.py:108
 #, python-format
-msgid "aclocal-%s can't see libtool macros"
-msgstr "aclocal-%s не баÑ?иÑ?Ñ? макÑ?оÑ? libtool"
+msgid "aclocal-%s can't see %s macros"
+msgstr "aclocal-%s не баÑ?иÑ?Ñ? макÑ?оÑ? %s"
 
-#: ../jhbuild/commands/sanitycheck.py:104
+#: ../jhbuild/commands/sanitycheck.py:113
 #, python-format
-msgid "aclocal-%s can't see gettext macros"
-msgstr "aclocal-%s не баÑ?иÑ?Ñ? макÑ?оÑ? gettext"
+msgid "Please copy the lacking macros (%s) in one of the following paths: %s"
+msgstr "СкопÑ?Ñ?йÑ?е вÑ?дÑ?Ñ?Ñ?нÑ? макÑ?оÑ?и (%s) Ñ? один з наÑ?Ñ?Ñ?пниÑ? Ñ?лÑ?Ñ?Ñ?в: %s"
 
-#: ../jhbuild/commands/sanitycheck.py:106
-#, python-format
-msgid "aclocal-%s can't see pkg-config macros"
-msgstr "aclocal-%s не бÑ?Ñ?иÑ?Ñ? макÑ?оÑ? pkg-config"
-
-#: ../jhbuild/commands/sanitycheck.py:110
+#: ../jhbuild/commands/sanitycheck.py:118
 msgid "Could not find XML catalog"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и каÑ?алог XML"
 
-#: ../jhbuild/commands/sanitycheck.py:119
+#: ../jhbuild/commands/sanitycheck.py:127
 #, python-format
 msgid "Could not find %s in XML catalog"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и %s Ñ? каÑ?алозÑ? XML"
 
-#: ../jhbuild/commands/sanitycheck.py:126
+#: ../jhbuild/commands/sanitycheck.py:134
 #, python-format
 msgid "Could not find the perl module %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и модÑ?лÑ? perl %s"
 
-#: ../jhbuild/commands/sanitycheck.py:143
+#: ../jhbuild/commands/sanitycheck.py:146
+#, python-format
+msgid "%s or %s not found"
+msgstr "%s або %s не знайдено"
+
+#: ../jhbuild/commands/sanitycheck.py:155
 msgid "Installed git program is not the right git"
 msgstr "Ð?Ñ?Ñ?ановлена пÑ?огÑ?ама git не Ñ? Ñ?пÑ?авжнÑ?оÑ? пÑ?огÑ?амоÑ? git"
 
-#: ../jhbuild/commands/sanitycheck.py:145
+#: ../jhbuild/commands/sanitycheck.py:161
 msgid "Could not check git program"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?евÑ?Ñ?иÑ?и пÑ?огÑ?амÑ? git"
 
+#: ../jhbuild/commands/snapshot.py:34
+msgid "Print out a moduleset for the exact versions that are checked out"
+msgstr "Ð?ивеÑ?Ñ?и набÑ?Ñ? модÑ?лÑ?в веÑ?Ñ?Ñ?й, Ñ?кÑ? бÑ?ло оÑ?Ñ?имано"
+
 #: ../jhbuild/commands/tinderbox.py:28
 msgid "Build modules non-interactively and store build logs"
 msgstr "Ð?Ñ?бÑ?аÑ?и модÑ?лÑ? не Ñ?нÑ?еÑ?акÑ?ивно Ñ?а веÑ?Ñ?и жÑ?Ñ?нал бзиÑ?аннÑ?"
@@ -530,87 +584,13 @@ msgstr "Ð?Ñ?бÑ?аÑ?и модÑ?лÑ? не Ñ?нÑ?еÑ?акÑ?ивно Ñ?а веÑ?Ñ?
 msgid "directory to store build logs in"
 msgstr "каÑ?алог длÑ? збеÑ?еженнÑ? жÑ?Ñ?налÑ?в збиÑ?аннÑ?"
 
-#: ../jhbuild/commands/tinderbox.py:90
+#: ../jhbuild/commands/tinderbox.py:75
 msgid "output directory for tinderbox build not specified"
 msgstr "не вказано каÑ?алог виводÑ? длÑ? tinderbox build"
 
-#: ../jhbuild/cut_n_paste/optparse.py:134
-#, python-format
-msgid "no such option: %s"
-msgstr "немаÑ? Ñ?акого паÑ?амеÑ?Ñ?Ñ?: %s"
-
-#: ../jhbuild/cut_n_paste/optparse.py:145
-#, python-format
-msgid "ambiguous option: %s (%s?)"
-msgstr "неоднознаÑ?ний паÑ?амеÑ?Ñ?: %s (%s?)"
-
-#: ../jhbuild/cut_n_paste/optparse.py:368
-#, python-format
-msgid "Usage: %s\n"
-msgstr "Ð?икоÑ?иÑ?Ñ?аннÑ?: %s\n"
-
-#: ../jhbuild/cut_n_paste/optparse.py:387
-msgid "Usage"
-msgstr "Ð?икоÑ?иÑ?Ñ?аннÑ?"
-
-#: ../jhbuild/cut_n_paste/optparse.py:412
-msgid "integer"
-msgstr "Ñ?Ñ?ле Ñ?иÑ?ло"
-
-#: ../jhbuild/cut_n_paste/optparse.py:413
-msgid "long integer"
-msgstr "довге Ñ?Ñ?ле"
-
-#: ../jhbuild/cut_n_paste/optparse.py:414
-msgid "floating-point"
-msgstr "з Ñ?Ñ?Ñ?омоÑ? кÑ?апкоÑ?"
-
-#: ../jhbuild/cut_n_paste/optparse.py:415
-msgid "complex"
-msgstr "комплекÑ?не Ñ?иало"
-
-#: ../jhbuild/cut_n_paste/optparse.py:423
-#, python-format
-msgid "option %s: invalid %s value: %r"
-msgstr "паÑ?амеÑ?Ñ? %s: непÑ?авилÑ?не знаÑ?еннÑ? %s: %r"
-
-#: ../jhbuild/cut_n_paste/optparse.py:431
-#, python-format
-msgid "option %s: invalid choice: %r (choose from %s)"
-msgstr "паÑ?амеÑ?Ñ? %s: непÑ?авилÑ?ний вибÑ?Ñ?: %r (вибеÑ?Ñ?Ñ?Ñ? з %s)"
-
-#: ../jhbuild/cut_n_paste/optparse.py:1237
-msgid "show this help message and exit"
-msgstr "показаÑ?и Ñ?Ñ? довÑ?дкÑ? Ñ?а вийÑ?и"
-
-#: ../jhbuild/cut_n_paste/optparse.py:1242
-msgid "show program's version number and exit"
-msgstr "показаÑ?и веÑ?Ñ?Ñ?Ñ? пÑ?огÑ?ами Ñ?а вийÑ?и"
-
-#: ../jhbuild/cut_n_paste/optparse.py:1265
-msgid "%prog [options]"
-msgstr "%prog [паÑ?амеÑ?Ñ?и]"
-
-#: ../jhbuild/cut_n_paste/optparse.py:1475
-#: ../jhbuild/cut_n_paste/optparse.py:1514
-#, python-format
-msgid "%s option requires an argument"
-msgstr "%s паÑ?амеÑ?Ñ? маÑ? обов'Ñ?зковий аÑ?гÑ?менÑ?"
-
-#: ../jhbuild/cut_n_paste/optparse.py:1477
-#: ../jhbuild/cut_n_paste/optparse.py:1516
-#, python-format
-msgid "%s option requires %d arguments"
-msgstr "%s паÑ?амеÑ?Ñ? маÑ? %d обов'Ñ?зковиÑ? аÑ?гÑ?менÑ?Ñ?в"
-
-#: ../jhbuild/cut_n_paste/optparse.py:1486
-#, python-format
-msgid "%s option does not take a value"
-msgstr "длÑ? паÑ?амеÑ?Ñ?Ñ? %s не можна вказÑ?ваÑ?и знаÑ?еннÑ?"
-
-#: ../jhbuild/cut_n_paste/optparse.py:1603
-msgid "Options"
-msgstr "Ð?аÑ?амеÑ?Ñ?и"
+#: ../jhbuild/commands/uninstall.py:29
+msgid "Uninstall all modules"
+msgstr "Ð?еÑ?нÑ?Ñ?алÑ?ваÑ?и Ñ?Ñ?Ñ? модÑ?лÑ?"
 
 #: ../jhbuild/frontends/autobuild.py:72
 #, python-format
@@ -626,7 +606,7 @@ msgstr "Ð?омилка Ñ?еÑ?веÑ?а, опеÑ?аÑ?Ñ?Ñ? Ñ?каÑ?овано"
 msgid "Error: %s"
 msgstr "Ð?омилка: %s"
 
-#: ../jhbuild/frontends/autobuild.py:183 ../jhbuild/utils/cmds.py:62
+#: ../jhbuild/frontends/autobuild.py:183 ../jhbuild/utils/cmds.py:66
 #, python-format
 msgid "Error running %s"
 msgstr "Ð?омилка пÑ?д Ñ?аÑ? запÑ?Ñ?кÑ? %s"
@@ -645,143 +625,147 @@ msgstr "Ð?апÑ?Ñ?к збиÑ?аннÑ? #%s"
 msgid "**** Starting module %s ****"
 msgstr "**** Ð?апÑ?Ñ?каÑ?Ñ?Ñ?Ñ?Ñ? модÑ?лÑ? %s ****"
 
-#: ../jhbuild/frontends/buildscript.py:40
-msgid "checkout root can not be created"
-msgstr "неможливо Ñ?Ñ?воÑ?иÑ?и коÑ?Ñ?нÑ? длÑ? checkout"
+#: ../jhbuild/frontends/buildscript.py:38
+#, python-format
+msgid "install prefix (%s) must be writable"
+msgstr "пÑ?еÑ?Ñ?кÑ? вÑ?Ñ?анвленнÑ? (%s) повинен бÑ?Ñ?и доÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
 
-#: ../jhbuild/frontends/buildscript.py:42
-msgid "checkout root must be writable"
-msgstr "коÑ?Ñ?нÑ? длÑ? checkout повинен бÑ?Ñ?и доÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
+#: ../jhbuild/frontends/buildscript.py:45
+#, python-format
+msgid "checkout root (%s) can not be created"
+msgstr "неможливо Ñ?Ñ?воÑ?иÑ?и коÑ?Ñ?нÑ? (%s) длÑ? checkout"
 
 #: ../jhbuild/frontends/buildscript.py:47
-msgid "install prefix can not be created"
-msgstr "неможливо Ñ?Ñ?воÑ?иÑ?и пÑ?еÑ?Ñ?кÑ? вÑ?Ñ?ановленнÑ?"
+#, python-format
+msgid "checkout root (%s) must be writable"
+msgstr "коÑ?Ñ?нÑ? длÑ? checkout (%s) повинен бÑ?Ñ?и доÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
 
-#: ../jhbuild/frontends/buildscript.py:49
-msgid "install prefix must be writable"
-msgstr "пÑ?еÑ?Ñ?кÑ? вÑ?Ñ?анвленнÑ? повинен бÑ?Ñ?и доÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
+#: ../jhbuild/frontends/buildscript.py:54
+#, python-format
+msgid "checkout copy dir (%s) can not be created"
+msgstr "неможливо Ñ?копÑ?Ñ?ваÑ?и коÑ?Ñ?нÑ? длÑ? checkout (%s)"
 
 #: ../jhbuild/frontends/buildscript.py:56
 #, python-format
-msgid "could not create directory %s"
-msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и каÑ?алог %s"
+msgid "checkout copy dir (%s) must be writable"
+msgstr "коÑ?Ñ?нÑ? длÑ? checkout (%s) повинен бÑ?Ñ?и доÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
 
-#: ../jhbuild/frontends/buildscript.py:83
+#: ../jhbuild/frontends/buildscript.py:63
 #, python-format
-msgid "Failed to clean %s"
-msgstr "Ð?омилка пÑ?и оÑ?иÑ?еннÑ? %s"
+msgid "could not create directory %s"
+msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и каÑ?алог %s"
 
-#: ../jhbuild/frontends/buildscript.py:101
+#: ../jhbuild/frontends/buildscript.py:87
 #, python-format
 msgid "Skipping %s (installed recently)"
 msgstr "Ð?Ñ?опÑ?Ñ?к %s (недавно вÑ?Ñ?ановлено)"
 
-#: ../jhbuild/frontends/buildscript.py:109
+#: ../jhbuild/frontends/buildscript.py:96
 #, python-format
 msgid "module %(mod)s will be build even though %(dep)s failed"
 msgstr "модÑ?лÑ? %(mod)s бÑ?де зÑ?бÑ?аний навÑ?Ñ?Ñ? Ñ?кÑ?о %(dep)s зазнаÑ? помилки"
 
-#: ../jhbuild/frontends/buildscript.py:112
+#: ../jhbuild/frontends/buildscript.py:99
 #, python-format
 msgid "module %(mod)s not built due to non buildable %(dep)s"
 msgstr "модÑ?лÑ? %(mod)s не зÑ?бÑ?аний Ñ?еÑ?ез неможливÑ?Ñ?Ñ?Ñ? зÑ?бÑ?аÑ?и %(dep)s"
 
-#: ../jhbuild/frontends/gtkui.py:88
-#, python-format
-msgid "Found meta module %s"
-msgstr "Ð?найдено меÑ?амодÑ?лÑ? %s"
+#: ../jhbuild/frontends/gtkui.py:99
+msgid "Others..."
+msgstr "Ð?нÑ?Ñ?..."
 
-#: ../jhbuild/frontends/gtkui.py:159
-msgid "Build"
-msgstr "Ð?Ñ?бÑ?аÑ?и"
+#: ../jhbuild/frontends/gtkui.py:140
+msgid "Choose Module:"
+msgstr "Ð?беÑ?Ñ?Ñ?Ñ? модÑ?лÑ?:"
+
+#: ../jhbuild/frontends/gtkui.py:160
+msgid "Build Progress"
+msgstr "Ð?Ñ?оÑ?еÑ? збиÑ?аннÑ?"
 
 #: ../jhbuild/frontends/gtkui.py:163
-msgid "Module Group"
-msgstr "Ð?Ñ?Ñ?па модÑ?лÑ?в"
+msgid "Terminal"
+msgstr "ТеÑ?мÑ?нал"
 
-#: ../jhbuild/frontends/gtkui.py:280
-#, python-format
-msgid "%d of %d modules"
-msgstr "%d з %d модÑ?лÑ?в"
+#. Translators: This is a button label (to start build)
+#: ../jhbuild/frontends/gtkui.py:203
+msgid "Start"
+msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и"
 
-#: ../jhbuild/frontends/gtkui.py:283
+#: ../jhbuild/frontends/gtkui.py:347
+msgid "Build Completed"
+msgstr "Ð?биÑ?аннÑ? завеÑ?Ñ?ено"
+
+#: ../jhbuild/frontends/gtkui.py:373 ../jhbuild/frontends/terminal.py:254
 #, python-format
-msgid "[%(num)d/%(total)d] %(action)s %(module)s"
-msgstr "[%(num)d/%(total)d] %(action)s %(module)s"
+msgid "Error during phase %(phase)s of %(module)s"
 
-#: ../jhbuild/frontends/gtkui.py:376 ../jhbuild/frontends/terminal.py:242
-msgid "success"
-msgstr "виконано"
+msgstr "Ð?омилка на Ñ?Ñ?адÑ?Ñ? збиÑ?аннÑ? %(phase)s модÑ?лÑ? %(module)s"
+#: ../jhbuild/frontends/gtkui.py:390
+msgid "Pick an Action"
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? дÑ?Ñ?"
 
-#: ../jhbuild/frontends/gtkui.py:378
+#: ../jhbuild/frontends/gtkui.py:393 ../jhbuild/frontends/terminal.py:281
 #, python-format
-msgid ""
-"the following modules were not built:\n"
-"%s"
-msgstr ""
-"наÑ?Ñ?Ñ?пнÑ? модÑ?лÑ? не зÑ?бÑ?ано:\n"
-"%s"
+msgid "Rerun phase %s"
+msgstr "Ð?овеÑ?нÑ?Ñ?и Ñ?азÑ? %s"
 
-#: ../jhbuild/frontends/gtkui.py:394
+#: ../jhbuild/frontends/gtkui.py:396 ../jhbuild/frontends/terminal.py:283
 #, python-format
-msgid "Error during %(state)s for module %(module)s"
-msgstr "Ð?омилка пÑ?д Ñ?аÑ? %(state)s длÑ? модÑ?лÑ? %(module)s"
+msgid "Ignore error and continue to %s"
+msgstr "Ð?гноÑ?Ñ?ваÑ?и Ñ?а пÑ?одовжиÑ?и з %s"
 
-#: ../jhbuild/frontends/gtkui.py:396
-#, python-format
-msgid "_Try %s Again"
-msgstr "_СпÑ?обÑ?ваÑ?и %s Ñ?е Ñ?аз"
+#: ../jhbuild/frontends/gtkui.py:399 ../jhbuild/frontends/terminal.py:285
+msgid "Ignore error and continue to next module"
+msgstr "Ð?гноÑ?Ñ?ваÑ?и Ñ?а пÑ?одовжиÑ?и з наÑ?Ñ?Ñ?пного модÑ?лÑ?"
 
-#: ../jhbuild/frontends/gtkui.py:397
-msgid "_Ignore Error"
-msgstr "_Ð?гноÑ?Ñ?ваÑ?и помилкÑ?"
+#: ../jhbuild/frontends/gtkui.py:401 ../jhbuild/frontends/terminal.py:286
+msgid "Give up on module"
+msgstr "Ð?алиÑ?иÑ?и модÑ?лÑ?"
 
-#: ../jhbuild/frontends/gtkui.py:398
-msgid "_Skip Module"
-msgstr "_Ð?Ñ?опÑ?Ñ?Ñ?иÑ?и модÑ?лÑ?"
+#: ../jhbuild/frontends/gtkui.py:408 ../jhbuild/frontends/terminal.py:295
+#, python-format
+msgid "Go to phase \"%s\""
+msgstr "Ð?еÑ?ейÑ?и до Ñ?ази \"%s\""
 
-#: ../jhbuild/frontends/gtkui.py:399
-msgid "_Terminal"
-msgstr "_ТеÑ?мÑ?нал"
+#: ../jhbuild/frontends/gtkui.py:411
+msgid "Open Terminal"
+msgstr "Ð?Ñ?дкÑ?иÑ?и Ñ?еÑ?мÑ?нал"
 
-#: ../jhbuild/frontends/gtkui.py:402
+#: ../jhbuild/frontends/gtkui.py:585
 #, python-format
-msgid "Go to %s"
-msgstr "Ð?еÑ?ейÑ?и до %s"
-
-#: ../jhbuild/frontends/jhbuild.glade.h:1
-msgid "Always run autogen.sh"
-msgstr "Ð?авжди запÑ?Ñ?каÑ?и autogen.sh"
+msgid "%(command)s died with signal %(rc)s"
+msgstr "%(command)s завеÑ?Ñ?илаÑ?Ñ? Ñ?игналом %(rc)s"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:2
-msgid "Build Output"
-msgstr "Ð?ивÑ?д збиÑ?аннÑ?"
+#: ../jhbuild/frontends/gtkui.py:589
+#, python-format
+msgid "%(command)s returned with an error code (%(rc)s)"
+msgstr "%(command)s завеÑ?Ñ?илаÑ?Ñ? з кодом помилки (%(rc)s)"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:3
-msgid "Configure Build"
-msgstr "Ð?алаÑ?Ñ?овÑ?ваннÑ? збиÑ?аннÑ?"
+#: ../jhbuild/frontends/gtkui.py:639
+msgid "Module"
+msgstr "Ð?одÑ?лÑ?"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:4
-msgid "Do not build"
-msgstr "Ð?е збиÑ?аÑ?и"
+#: ../jhbuild/frontends/gtkui.py:658
+msgid "Start At"
+msgstr "Ð?оÑ?аÑ?и з"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:5
-msgid "Start Building At:"
-msgstr "Ð?оÑ?аÑ?и збиÑ?аÑ?и з:"
+#: ../jhbuild/frontends/gtkui.py:701
+msgid "Preferences"
+msgstr "Ð?аÑ?амеÑ?Ñ?и"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:6
-msgid "Start _Build"
-msgstr "Ð?оÑ?аÑ?и _збиÑ?аÑ?и"
+#: ../jhbuild/frontends/gtkui.py:713
+msgid "Disable network access"
+msgstr "Ð?имкнÑ?Ñ?и доÑ?Ñ?Ñ?п до меÑ?ежÑ?"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:7
-msgid "Update from CVS"
-msgstr "Ð?новиÑ?и з CVS"
+#: ../jhbuild/frontends/gtkui.py:714
+msgid "Always run autogen.sh"
+msgstr "Ð?авжди запÑ?Ñ?каÑ?и autogen.sh"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:8
-msgid "_Pause Build"
-msgstr "_Ð?Ñ?изÑ?пиÑ?иÑ?и збиÑ?аÑ?и"
+#: ../jhbuild/frontends/gtkui.py:715
+msgid "Don't poison modules on failure"
+msgstr "не виконÑ?ваÑ?и poison модÑ?лÑ?в Ñ? Ñ?азÑ? помилки"
 
-#: ../jhbuild/frontends/terminal.py:207
+#: ../jhbuild/frontends/terminal.py:210
 msgid ""
 "\n"
 "Conflicts during checkout:\n"
@@ -790,72 +774,63 @@ msgstr ""
 "Ð?онÑ?лÑ?кÑ?и пÑ?д Ñ?аÑ? збиÑ?аннÑ?:\n"
 
 #. it could happen on a really badly-timed ctrl-c (see bug 551641)
-#: ../jhbuild/frontends/terminal.py:230 ../jhbuild/frontends/terminal.py:233
+#: ../jhbuild/frontends/terminal.py:233 ../jhbuild/frontends/terminal.py:236
 #, python-format
 msgid "########## Error running %s"
 msgstr "########## Ð?омилка пÑ?д Ñ?аÑ? запÑ?Ñ?кÑ? %s"
 
-#: ../jhbuild/frontends/terminal.py:244
+#: ../jhbuild/frontends/terminal.py:245
+msgid "success"
+msgstr "виконано"
+
+#: ../jhbuild/frontends/terminal.py:247
 msgid "the following modules were not built"
 msgstr "наÑ?Ñ?Ñ?пнÑ? модÑ?лÑ? не бÑ?ло зÑ?бÑ?ано"
 
-#: ../jhbuild/frontends/terminal.py:251
-#, python-format
-msgid "error during stage %(stage)s of %(module)s"
-msgstr "помилка на Ñ?Ñ?адÑ?Ñ? збиÑ?аннÑ? %(stage)s модÑ?лÑ? %(module)s"
+#: ../jhbuild/frontends/terminal.py:269 ../jhbuild/frontends/tinderbox.py:349
+msgid "automatically retrying configure"
+msgstr "авÑ?омаÑ?иÑ?но повÑ?оÑ?Ñ?ваÑ?и Ñ?пÑ?обÑ? налаÑ?Ñ?Ñ?ваннÑ?"
 
-#: ../jhbuild/frontends/terminal.py:272
-#, python-format
-msgid "  [1] rerun stage %s"
-msgstr "  [1] пеÑ?езапÑ?Ñ?к Ñ?Ñ?адÑ?Ñ? %s"
+#: ../jhbuild/frontends/terminal.py:273 ../jhbuild/frontends/tinderbox.py:353
+msgid "automatically forcing a fresh checkout"
+msgstr "авÑ?омаÑ?иÑ?но виконÑ?ваÑ?и Ñ?вÑ?жий checkout"
 
-#: ../jhbuild/frontends/terminal.py:273
-#, python-format
-msgid "  [2] ignore error and continue to %s"
-msgstr "  [2] Ñ?гноÑ?Ñ?ваÑ?и Ñ?а пÑ?одовжиÑ?и з %s"
+#: ../jhbuild/frontends/terminal.py:287
+msgid "Start shell"
+msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и оболонкÑ?"
 
-#: ../jhbuild/frontends/terminal.py:274
-msgid "  [3] give up on module"
-msgstr "  [3] залиÑ?иÑ?и модÑ?лÑ?"
+#: ../jhbuild/frontends/terminal.py:288
+msgid "Reload configuration"
+msgstr "Ð?еÑ?езаванÑ?ажиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?"
 
-#: ../jhbuild/frontends/terminal.py:275
-msgid "  [4] start shell"
-msgstr "  [4] запÑ?Ñ?Ñ?иÑ?и оболонкÑ?"
-
-#: ../jhbuild/frontends/terminal.py:278
-#, python-format
-msgid "  [%d] go to stage %s"
-msgstr "  [%d] пеÑ?ейÑ?и до Ñ?Ñ?адÑ?Ñ? %s"
-
-#: ../jhbuild/frontends/terminal.py:280
+#: ../jhbuild/frontends/terminal.py:297
 msgid "choice: "
 msgstr "вибÑ?Ñ?: "
 
-#: ../jhbuild/frontends/terminal.py:294
+#: ../jhbuild/frontends/terminal.py:311
 msgid "exit shell to continue with build"
 msgstr "вийÑ?и з оболонки Ñ?а пÑ?одовжиÑ?и збиÑ?аÑ?и"
 
-#: ../jhbuild/frontends/terminal.py:302
+#: ../jhbuild/frontends/terminal.py:321
 msgid "invalid choice"
 msgstr "непÑ?авилÑ?ний вибÑ?Ñ?"
 
-#: ../jhbuild/modtypes/ant.py:80 ../jhbuild/modtypes/autotools.py:100
-#: ../jhbuild/modtypes/cmake.py:74 ../jhbuild/modtypes/distutils.py:75
-#: ../jhbuild/modtypes/__init__.py:221 ../jhbuild/modtypes/linux.py:92
-#: ../jhbuild/modtypes/linux.py:103 ../jhbuild/modtypes/mesa.py:89
-#: ../jhbuild/modtypes/mozillamodule.py:75 ../jhbuild/modtypes/perl.py:71
-#: ../jhbuild/modtypes/waf.py:76
-msgid "Checking out"
-msgstr "ТÑ?иваÑ? checkout"
+#: ../jhbuild/frontends/terminal.py:329
+msgid "Type \"yes\" to confirm the action: "
+msgstr "Ð?ведÑ?Ñ?Ñ? \"yes\" длÑ? пÑ?дÑ?веÑ?дженнÑ? дÑ?Ñ?: "
+
+#: ../jhbuild/frontends/terminal.py:331
+msgid "yes"
+msgstr "yes"
 
-#: ../jhbuild/modtypes/ant.py:89 ../jhbuild/modtypes/autotools.py:217
-#: ../jhbuild/modtypes/cmake.py:98 ../jhbuild/modtypes/distutils.py:84
-#: ../jhbuild/modtypes/linux.py:186 ../jhbuild/modtypes/mesa.py:98
-#: ../jhbuild/modtypes/perl.py:80 ../jhbuild/modtypes/waf.py:129
+#: ../jhbuild/modtypes/ant.py:63 ../jhbuild/modtypes/autotools.py:213
+#: ../jhbuild/modtypes/cmake.py:75 ../jhbuild/modtypes/distutils.py:62
+#: ../jhbuild/modtypes/linux.py:164 ../jhbuild/modtypes/perl.py:58
+#: ../jhbuild/modtypes/waf.py:99
 msgid "Building"
 msgstr "Ð?биÑ?аннÑ?"
 
-#: ../jhbuild/modtypes/ant.py:94
+#: ../jhbuild/modtypes/ant.py:68
 msgid "Missing ant build tool"
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ? Ñ?нÑ?Ñ?Ñ?Ñ?менÑ?и длÑ? збиÑ?аннÑ?"
 
@@ -863,42 +838,38 @@ 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:110 ../jhbuild/modtypes/autotools.py:266
-#: ../jhbuild/modtypes/cmake.py:120 ../jhbuild/modtypes/distutils.py:99
-#: ../jhbuild/modtypes/linux.py:202 ../jhbuild/modtypes/mesa.py:114
-#: ../jhbuild/modtypes/mozillamodule.py:147 ../jhbuild/modtypes/perl.py:95
-#: ../jhbuild/modtypes/waf.py:172
+#: ../jhbuild/modtypes/ant.py:81 ../jhbuild/modtypes/autotools.py:267
+#: ../jhbuild/modtypes/cmake.py:91 ../jhbuild/modtypes/distutils.py:74
+#: ../jhbuild/modtypes/perl.py:72 ../jhbuild/modtypes/waf.py:134
 msgid "Installing"
 msgstr "Ð?Ñ?Ñ?ановленнÑ?"
 
-#: ../jhbuild/modtypes/autotools.py:135 ../jhbuild/modtypes/cmake.py:83
-#: ../jhbuild/modtypes/linux.py:133 ../jhbuild/modtypes/mozillamodule.py:121
-#: ../jhbuild/modtypes/waf.py:102
+#: ../jhbuild/modtypes/autotools.py:110 ../jhbuild/modtypes/cmake.py:63
+#: ../jhbuild/modtypes/linux.py:119 ../jhbuild/modtypes/waf.py:79
 msgid "Configuring"
 msgstr "Ð?алаÑ?Ñ?овÑ?ваннÑ?"
 
-#: ../jhbuild/modtypes/autotools.py:206 ../jhbuild/modtypes/linux.py:169
-#: ../jhbuild/modtypes/waf.py:119
+#: ../jhbuild/modtypes/autotools.py:203 ../jhbuild/modtypes/linux.py:151
+#: ../jhbuild/modtypes/waf.py:92
 msgid "Cleaning"
 msgstr "Ð?Ñ?иÑ?еннÑ?"
 
-#: ../jhbuild/modtypes/autotools.py:237 ../jhbuild/modtypes/waf.py:145
+#: ../jhbuild/modtypes/autotools.py:233 ../jhbuild/modtypes/waf.py:113
 msgid "Checking"
 msgstr "Ð?еÑ?евÑ?Ñ?ка"
 
-#: ../jhbuild/modtypes/autotools.py:252 ../jhbuild/modtypes/cmake.py:109
-#: ../jhbuild/modtypes/waf.py:159
+#: ../jhbuild/modtypes/autotools.py:247 ../jhbuild/modtypes/autotools.py:257
+#: ../jhbuild/modtypes/cmake.py:83 ../jhbuild/modtypes/waf.py:124
 msgid "Creating tarball for"
 msgstr "СÑ?воÑ?еннÑ? tar-аÑ?зÑ?вÑ? длÑ?"
 
-#: ../jhbuild/modtypes/autotools.py:290
+#: ../jhbuild/modtypes/autotools.py:279
 msgid "Distcleaning"
 msgstr "Distclean"
 
-#: ../jhbuild/modtypes/autotools.py:424 ../jhbuild/modtypes/__init__.py:101
-#, python-format
-msgid "Repository=%s not found for module id=%s. Possible repositories are %s"
-msgstr "Repository=%s не знайдено длÑ? модÑ?лÑ? id=%s. Ð?ожливÑ? Ñ?епозиÑ?оÑ?Ñ?Ñ? %s"
+#: ../jhbuild/modtypes/autotools.py:296 ../jhbuild/modtypes/waf.py:141
+msgid "Uninstalling"
+msgstr "Ð?еÑ?нÑ?Ñ?алÑ?Ñ?Ñ?Ñ?"
 
 #: ../jhbuild/modtypes/__init__.py:55
 #, python-format
@@ -915,6 +886,11 @@ msgstr "dep вÑ?зла длÑ? модÑ?лÑ? %s вÑ?дÑ?Ñ?Ñ?нÑ?й аÑ?Ñ?ибÑ?Ñ?
 msgid "no <branch> element found for %s"
 msgstr "не знайдено елеменÑ?Ñ? <branch> длÑ? %s"
 
+#: ../jhbuild/modtypes/__init__.py:101
+#, python-format
+msgid "Repository=%s not found for module id=%s. Possible repositories are %s"
+msgstr "Repository=%s не знайдено длÑ? модÑ?лÑ? id=%s. Ð?ожливÑ? Ñ?епозиÑ?оÑ?Ñ?Ñ? %s"
+
 #: ../jhbuild/modtypes/__init__.py:107
 #, python-format
 msgid ""
@@ -923,40 +899,52 @@ msgid ""
 msgstr ""
 "Типовий Ñ?епозиÑ?оÑ?Ñ?й=%s не знайдено длÑ? модÑ?лÑ? id=%s. Ð?ожливÑ? Ñ?епозиÑ?оÑ?Ñ?Ñ? %s"
 
-#: ../jhbuild/modtypes/__init__.py:204
+#: ../jhbuild/modtypes/__init__.py:183
 #, python-format
 msgid "Skipping %s (not updated)"
 msgstr "Ð?Ñ?опÑ?Ñ?к %s (не оновлено)"
 
-#: ../jhbuild/modtypes/__init__.py:216
+#: ../jhbuild/modtypes/__init__.py:195
 #, python-format
 msgid "Skipping %s (package and dependencies not updated)"
 msgstr "Ð?Ñ?опÑ?Ñ?к %s (пакеÑ? Ñ?а залежноÑ?Ñ?Ñ? не оновлено)"
 
-#: ../jhbuild/modtypes/__init__.py:225
-#: ../jhbuild/modtypes/mozillamodule.py:106
+#: ../jhbuild/modtypes/__init__.py:247 ../jhbuild/modtypes/__init__.py:265
+#: ../jhbuild/modtypes/linux.py:88 ../jhbuild/modtypes/linux.py:95
+msgid "Checking out"
+msgstr "ТÑ?иваÑ? checkout"
+
+#: ../jhbuild/modtypes/__init__.py:251
 #, python-format
 msgid "source directory %s was not created"
 msgstr "пеÑ?винний каÑ?алог %s не Ñ?Ñ?воÑ?ено"
 
+#: ../jhbuild/modtypes/__init__.py:268
+msgid "wipe directory and start over"
+msgstr "Ñ?Ñ?еÑ?Ñ?и каÑ?алог Ñ?а запÑ?Ñ?Ñ?иÑ?и"
+
 #: ../jhbuild/modtypes/linux.py:46
 #, python-format
 msgid "kconfig file %s was not created"
 msgstr "Ñ?айл kconfig %s не бÑ?ло Ñ?Ñ?воÑ?ено"
 
-#: ../jhbuild/modtypes/linux.py:112
+#: ../jhbuild/modtypes/linux.py:103
 msgid "make mrproper"
 msgstr "make mrproper"
 
-#: ../jhbuild/modtypes/linux.py:223
+#: ../jhbuild/modtypes/linux.py:177
+msgid "Installing kernel"
+msgstr "Ð?Ñ?Ñ?ановленнÑ? Ñ?дÑ?а"
+
+#: ../jhbuild/modtypes/linux.py:195
 msgid "Installing modules"
 msgstr "Ð?Ñ?Ñ?ановлÑ?Ñ?Ñ?Ñ?Ñ?Ñ? модÑ?лÑ?"
 
-#: ../jhbuild/modtypes/linux.py:241
-msgid "Installing kernel"
-msgstr "Ð?Ñ?Ñ?ановленнÑ? Ñ?дÑ?а"
+#: ../jhbuild/modtypes/linux.py:210
+msgid "Installing kernel headers"
+msgstr "Ð?Ñ?Ñ?ановленнÑ? заголовкÑ?в Ñ?дÑ?а"
 
-#: ../jhbuild/modtypes/linux.py:275
+#: ../jhbuild/modtypes/linux.py:248
 #, python-format
 msgid ""
 "Repository=%s not found for kconfig in linux id=%s. Possible repositories "
@@ -964,7 +952,7 @@ msgid ""
 msgstr ""
 "Repository=%s не знайдено длÑ? kconfig Ñ? linux id=%s. Ð?ожливÑ? Ñ?епозиÑ?оÑ?Ñ?Ñ? %s"
 
-#: ../jhbuild/modtypes/linux.py:280
+#: ../jhbuild/modtypes/linux.py:253
 #, python-format
 msgid ""
 "Default Repository=%s not found for kconfig in module id=%s. Possible "
@@ -973,34 +961,35 @@ msgstr ""
 "Типовий Ñ?епозиÑ?оÑ?Ñ?й=%s не знайдено длÑ? kconfig Ñ? модÑ?лÑ? id=%s. Ð?ожливÑ? "
 "Ñ?епозиÑ?оÑ?Ñ?Ñ? %s"
 
-#: ../jhbuild/modtypes/mozillamodule.py:72
-msgid "could not determine mozilla version"
-msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? визнаÑ?иÑ?и веÑ?Ñ?Ñ?Ñ? mozilla"
-
-#: ../jhbuild/modtypes/mozillamodule.py:98
-msgid "Updating"
-msgstr "Ð?новленнÑ?"
+#: ../jhbuild/modtypes/tarball.py:68
+#, python-format
+msgid "module '%(module)s' has invalid size attribute ('%(size)s')"
+msgstr "модÑ?лÑ? '%(module)s' маÑ? непÑ?авилÑ?нй аÑ?Ñ?ибÑ?Ñ? Ñ?озмÑ?Ñ?Ñ? ('%(size)s')"
 
-#: ../jhbuild/modtypes/waf.py:104
+#: ../jhbuild/modtypes/waf.py:81
 msgid "Missing waf, try jhbuild -m bootstrap buildone waf"
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ?й waf, Ñ?пÑ?обÑ?йÑ?е jhbuild -m bootstrap buildone waf"
 
-#: ../jhbuild/utils/httpcache.py:45 ../jhbuild/utils/packagedb.py:24
-#: ../jhbuild/moduleset.py:31
+#: ../jhbuild/utils/cmds.py:40
+msgid "Call to undefined command"
+msgstr "Ð?иклик до невизнаÑ?еноÑ? команди"
+
+#: ../jhbuild/utils/httpcache.py:46 ../jhbuild/utils/packagedb.py:24
+#: ../jhbuild/moduleset.py:32
 msgid "Python xml packages are required but could not be found"
 msgstr "Ð?оÑ?Ñ?Ñ?бнÑ? пакеÑ?и Ñ?обоÑ?и з xml длÑ? Python, але Ñ?Ñ? не знайдено"
 
-#: ../jhbuild/utils/httpcache.py:180
+#: ../jhbuild/utils/httpcache.py:184
 msgid "file not in cache, but not allowed to check network"
 msgstr ""
 "Ñ?айл вÑ?дÑ?Ñ?Ñ?нÑ?й Ñ? кеÑ?Ñ?, але недозволено пеÑ?евÑ?Ñ?Ñ?Ñ?и наÑ?внÑ?Ñ?Ñ?Ñ? Ñ?айлÑ? Ñ? меÑ?ежÑ?"
 
-#: ../jhbuild/utils/unpack.py:105
+#: ../jhbuild/utils/unpack.py:132
 #, python-format
 msgid "Failed to unpack %s (unknown archive type)"
 msgstr "Ð?омилка пÑ?и Ñ?озпаковÑ?ваннÑ? %s (невÑ?домий Ñ?ип аÑ?Ñ?Ñ?вÑ?)"
 
-#: ../jhbuild/utils/unpack.py:107
+#: ../jhbuild/utils/unpack.py:134
 #, python-format
 msgid "Failed to unpack %s"
 msgstr "Ð?омилка пÑ?и Ñ?озпаковÑ?ваннÑ? %s"
@@ -1015,19 +1004,18 @@ msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заÑ?еÑ?Ñ?Ñ?Ñ?Ñ?ваÑ?и аÑ?Ñ?Ñ?в %s"
 msgid "archive %s not registered"
 msgstr "аÑ?Ñ?Ñ?в %s не заÑ?еÑ?Ñ?Ñ?Ñ?овано"
 
-#: ../jhbuild/versioncontrol/arch.py:92 ../jhbuild/versioncontrol/bzr.py:62
-#: ../jhbuild/versioncontrol/darcs.py:55 ../jhbuild/versioncontrol/git.py:77
-#: ../jhbuild/versioncontrol/hg.py:53 ../jhbuild/versioncontrol/mtn.py:52
-#: ../jhbuild/versioncontrol/tarball.py:67
+#: ../jhbuild/versioncontrol/arch.py:92 ../jhbuild/versioncontrol/bzr.py:72
+#: ../jhbuild/versioncontrol/darcs.py:55 ../jhbuild/versioncontrol/hg.py:53
+#: ../jhbuild/versioncontrol/mtn.py:52 ../jhbuild/versioncontrol/tarball.py:67
 #, python-format
 msgid "branch for %s has wrong override, check your .jhbuildrc"
 msgstr "гÑ?лка длÑ? %s маÑ? непÑ?авилÑ?не пеÑ?евизнаÑ?еннÑ?, пеÑ?евÑ?Ñ?Ñ?е Ñ?айл .jhbuildrc"
 
 #: ../jhbuild/versioncontrol/arch.py:128 ../jhbuild/versioncontrol/arch.py:141
-#: ../jhbuild/versioncontrol/bzr.py:121 ../jhbuild/versioncontrol/bzr.py:127
+#: ../jhbuild/versioncontrol/bzr.py:131 ../jhbuild/versioncontrol/bzr.py:137
 #: ../jhbuild/versioncontrol/darcs.py:84 ../jhbuild/versioncontrol/darcs.py:90
-#: ../jhbuild/versioncontrol/git.py:348 ../jhbuild/versioncontrol/git.py:384
-#: ../jhbuild/versioncontrol/git.py:443 ../jhbuild/versioncontrol/hg.py:85
+#: ../jhbuild/versioncontrol/git.py:433 ../jhbuild/versioncontrol/git.py:473
+#: ../jhbuild/versioncontrol/git.py:549 ../jhbuild/versioncontrol/hg.py:85
 #: ../jhbuild/versioncontrol/hg.py:91
 msgid "date based checkout not yet supported\n"
 msgstr "checkout оÑ?нований на даÑ?Ñ? Ñ?е не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?\n"
@@ -1060,17 +1048,39 @@ msgstr ""
 msgid "Consider using the changecvsroot.py script to fix this."
 msgstr "Ð?лÑ? випÑ?авленнÑ? Ñ?коÑ?иÑ?Ñ?айÑ?еÑ?Ñ? Ñ?Ñ?енаÑ?Ñ?Ñ?м changecvsroot.py."
 
-#: ../jhbuild/versioncontrol/git.py:152
+#: ../jhbuild/versioncontrol/git.py:94
+msgid "ignored bad branch redefinition for module:"
+msgstr "Ñ?гноÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? непÑ?авилÑ?не пеÑ?евизнаÑ?еннÑ? гÑ?лки длÑ? модÑ?лÑ?:"
+
+#: ../jhbuild/versioncontrol/git.py:188
 #, python-format
 msgid "Command %s returned no output"
 msgstr "Ð?оманда %s не повеÑ?нÑ?ла виводÑ?"
 
-#: ../jhbuild/versioncontrol/git.py:157
+#: ../jhbuild/versioncontrol/git.py:193
 #, python-format
 msgid "Command %s did not include commit line: %r"
 msgstr "Ð?оманда %s не мÑ?Ñ?Ñ?иÑ?Ñ? commit-Ñ?Ñ?док: %r"
 
-#: ../jhbuild/versioncontrol/git.py:315
+#: ../jhbuild/versioncontrol/git.py:255
+msgid ""
+"Failed to update module as it switched to git (you should check for changes "
+"then remove the directory)."
+msgstr ""
+"Ð?омилка пÑ?и оновленнÑ? модÑ?лÑ?, оÑ?кÑ?лÑ?ки вÑ?н пеÑ?ейÑ?ов на git (Ñ?лÑ?д пеÑ?евÑ?Ñ?иÑ?и змÑ?ни, Ñ? поÑ?Ñ?м видалиÑ?и каÑ?алог)."
+
+#: ../jhbuild/versioncontrol/git.py:256
+msgid ""
+"Failed to update module (missing .git) (you should check for changes then "
+"remove the directory)."
+msgstr ""
+"Ð?омилка пÑ?и оновленнÑ? модÑ?лÑ? (вÑ?дÑ?Ñ?Ñ?нÑ?й .git) (Ñ?лÑ?д пеÑ?евÑ?Ñ?иÑ?и змÑ?ни, поÑ?Ñ?м видалиÑ?и каÑ?алог)."
+
+#: ../jhbuild/versioncontrol/git.py:279
+msgid "Failed to update module (corrupt .git?)"
+msgstr "Ð?омилка пÑ?и оновленнÑ? модÑ?лÑ? (поÑ?коджений .git?)"
+
+#: ../jhbuild/versioncontrol/git.py:400
 msgid ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
@@ -1078,17 +1088,13 @@ msgstr ""
 "Ð?омилка Ñ? зовнÑ?Ñ?нÑ?й обÑ?обÑ?Ñ?\n"
 " ЯкÑ?о Ñ? Ð?аÑ? git веÑ?Ñ?Ñ?Ñ? < 1.5.6 Ñ?екомендÑ?Ñ?Ñ?Ñ?Ñ?Ñ? оновиÑ?и Ñ?Ñ?.\n"
 
-#: ../jhbuild/versioncontrol/git.py:360
+#: ../jhbuild/versioncontrol/git.py:445
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и оÑ?Ñ?аннÑ? веÑ?Ñ?Ñ?Ñ? з %s. Ð?еÑ?евÑ?Ñ?Ñ?е Ñ?озÑ?аÑ?Ñ?ваннÑ? модÑ?лÑ?."
 
-#: ../jhbuild/versioncontrol/__init__.py:104
-msgid "force_checkout not implemented"
-msgstr "force_checkout не Ñ?еалÑ?зовано"
-
-#: ../jhbuild/versioncontrol/__init__.py:137
+#: ../jhbuild/versioncontrol/__init__.py:186
 #, python-format
 msgid "unknown repository type %s"
 msgstr "невÑ?домий Ñ?ип Ñ?епозиÑ?оÑ?Ñ?Ñ? %s"
@@ -1136,119 +1142,210 @@ msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?озÑ?бÑ?аÑ?и вивÑ?д \"svn info\" длÑ?
 msgid "Error checking for conflicts"
 msgstr "Ð?омилка пÑ?и пеÑ?евÑ?Ñ?Ñ?Ñ? конÑ?лÑ?кÑ?Ñ?в"
 
-#: ../jhbuild/versioncontrol/tarball.py:83
+#: ../jhbuild/versioncontrol/tarball.py:85
 #, python-format
 msgid "branch for %s is not correct, check the moduleset file."
 msgstr "гÑ?лка %s не Ñ? коÑ?екÑ?ноÑ?, пеÑ?евÑ?Ñ?Ñ?е Ñ?айл moduleset."
 
-#: ../jhbuild/versioncontrol/tarball.py:119
+#: ../jhbuild/versioncontrol/tarball.py:121
 #, python-format
 msgid "URL has no filename component: %s"
 msgstr "URL не мÑ?Ñ?Ñ?иÑ?Ñ? компоненÑ?Ñ? Ñ?менÑ? Ñ?айлÑ?: %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:158
+#: ../jhbuild/versioncontrol/tarball.py:162
 msgid "file not downloaded"
 msgstr "Ñ?айл не заванÑ?ажено"
 
-#: ../jhbuild/versioncontrol/tarball.py:163
+#: ../jhbuild/versioncontrol/tarball.py:167
 #, python-format
 msgid "downloaded file size is incorrect (expected %(size1)d, got %(size2)d)"
 msgstr ""
 "Ñ?озмÑ?Ñ? заванÑ?аженого Ñ?айлÑ? Ñ? некоÑ?екÑ?ним (оÑ?Ñ?кÑ?вавÑ?Ñ? %(size1)d, оÑ?Ñ?имано %"
 "(size2)d)"
 
-#: ../jhbuild/versioncontrol/tarball.py:174
+#: ../jhbuild/versioncontrol/tarball.py:173
+#, python-format
+msgid "invalid hash attribute on module %s"
+msgstr "непÑ?авилÑ?ний аÑ?Ñ?ибÑ?Ñ? hash Ñ? модÑ?лÑ? %s"
+
+#: ../jhbuild/versioncontrol/tarball.py:186
 #, python-format
-msgid "file MD5 sum is incorrect (expected %(sum1)s, got %(sum2)s)"
-msgstr "MD5-Ñ?Ñ?ма Ñ?айл Ñ? некоÑ?екÑ?ноÑ? (оÑ?Ñ?кÑ?валоÑ?Ñ? %(sum1)s, оÑ?Ñ?имано %(sum2)s)"
+msgid "file hash is incorrect (expected %(sum1)s, got %(sum2)s)"
+msgstr "Ñ?еÑ? Ñ?айлÑ? Ñ? некоÑ?екÑ?ним (оÑ?Ñ?кÑ?валоÑ?Ñ? %(sum1)s, оÑ?Ñ?имано %(sum2)s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:192
+#: ../jhbuild/versioncontrol/tarball.py:189
+#, python-format
+msgid "skipped hash check (missing support for %s)"
+msgstr "пÑ?опÑ?Ñ?ено пеÑ?евÑ?Ñ?кÑ? Ñ?еÑ?Ñ? (вÑ?дÑ?Ñ?Ñ?нÑ? пÑ?дÑ?Ñ?имка %s)"
+
+#: ../jhbuild/versioncontrol/tarball.py:198
+#, python-format
+msgid "tarball dir (%s) can not be created"
+msgstr "неможливо Ñ?Ñ?воÑ?иÑ?и пÑ?еÑ?Ñ?кÑ? вÑ?Ñ?ановленнÑ? (%s)"
+
+#: ../jhbuild/versioncontrol/tarball.py:200
+#, python-format
+msgid "tarball dir (%s) must be writable"
+msgstr "пÑ?еÑ?Ñ?кÑ? вÑ?Ñ?ановленнÑ? (%s) повинен бÑ?Ñ?и доÑ?Ñ?Ñ?пний длÑ? запиÑ?Ñ?"
+
+#: ../jhbuild/versioncontrol/tarball.py:212
 msgid "unable to find wget or curl"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и wget або curl"
 
-#: ../jhbuild/versioncontrol/tarball.py:200
+#: ../jhbuild/versioncontrol/tarball.py:220
 #, python-format
 msgid "failed to unpack %s"
 msgstr "помилка пÑ?и Ñ?озпаковÑ?ваннÑ? %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:203
+#: ../jhbuild/versioncontrol/tarball.py:223
 #, python-format
 msgid "could not unpack tarball (expected %s dir)"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?озпакÑ?ваÑ?и tar-аÑ?Ñ?Ñ?в (оÑ?Ñ?кÑ?вавÑ?Ñ? каÑ?алог %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:218
+#: ../jhbuild/versioncontrol/tarball.py:238
 #, python-format
 msgid "could not download patch (error: %s)"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и лаÑ?кÑ? (помилка: %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:220
+#: ../jhbuild/versioncontrol/tarball.py:240
 msgid "could not download patch"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? завеÑ?Ñ?иÑ?и лаÑ?кÑ?"
 
-#: ../jhbuild/versioncontrol/tarball.py:241
+#: ../jhbuild/versioncontrol/tarball.py:272
+#, python-format
+msgid "Failed to find patch: %s"
+msgstr "Ð?омилка пÑ?и поÑ?Ñ?кÑ? Ñ?лÑ?Ñ?Ñ?: %s"
+
+#: ../jhbuild/versioncontrol/tarball.py:274
 msgid "Applying patch"
 msgstr "Ð?аÑ?Ñ?оÑ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? лаÑ?ка"
 
-#: ../jhbuild/versioncontrol/tarball.py:248
+#: ../jhbuild/versioncontrol/tarball.py:281
 msgid "unable to find quilt"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и quilt"
 
-#: ../jhbuild/versioncontrol/tarball.py:259
+#: ../jhbuild/versioncontrol/tarball.py:292
 msgid "could not checkout quilt patch set"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? виконаÑ?и checkout quilt набоÑ?Ñ? лаÑ?ок"
 
-#: ../jhbuild/config.py:105
+#: ../jhbuild/config.py:137
+#, python-format
+msgid "unable to parse '%s' as relative time."
+msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?оаналÑ?зÑ?ваÑ?и '%s' Ñ?к вÑ?дноÑ?ний Ñ?аÑ?."
+
+#: ../jhbuild/config.py:164
+msgid ""
+"JHBuild start script has been installed in ~/.local/bin/jhbuild, you should "
+"remove the old version that is still in ~/bin/ (or make it a symlink to ~/."
+"local/bin/jhbuild)"
+msgstr ""
+"СÑ?аÑ?Ñ?овий Ñ?Ñ?енаÑ?Ñ?й JHBuild вÑ?Ñ?ановлено Ñ? ~/.local/bin/jhbuild, Ñ?лÑ?д видалиÑ?и "
+"Ñ?Ñ?аÑ?Ñ? веÑ?Ñ?Ñ?Ñ?, Ñ?ка Ñ?Ñ?нÑ?Ñ? Ñ? ~/bin/ (або зÑ?обиÑ?и Ñ?имволÑ?Ñ?не поÑ?иланнÑ? на ~/."
+"local/bin/jhbuild)"
+
+#: ../jhbuild/config.py:176
+msgid ""
+"Obsolete JHBuild start script, make sure it is removed then do run 'make "
+"install'"
+msgstr ""
+"Ð?аÑ?Ñ?аÑ?Ñ?лий Ñ?Ñ?енаÑ?Ñ?й JHBuild, пеÑ?евÑ?Ñ?Ñ?е, Ñ?о вÑ?н видÑ?лений поÑ?Ñ?м запÑ?Ñ?Ñ?Ñ?Ñ?Ñ? 'make "
+"install'"
+
+#: ../jhbuild/config.py:184
 msgid "could not load config defaults"
-msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и подÑ?обиÑ?Ñ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?"
+msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и подÑ?обиÑ?Ñ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?"
 
-#: ../jhbuild/config.py:109
+#: ../jhbuild/config.py:188
 #, python-format
 msgid "could not load config file, %s is missing"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний Ñ?айл, вÑ?дÑ?Ñ?Ñ?нÑ?й %s"
 
-#: ../jhbuild/config.py:120
+#: ../jhbuild/config.py:204
+#, python-format
+msgid "Could not include config file (%s)"
+msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний Ñ?айл (%s)"
+
+#: ../jhbuild/config.py:217
 msgid "could not load config file"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний Ñ?айл"
 
-#: ../jhbuild/config.py:134
+#: ../jhbuild/config.py:231
+#, python-format
+msgid "unknown keys defined in configuration file: %s"
+msgstr "Ñ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йномÑ? Ñ?айлÑ? визнаÑ?ено невÑ?домÑ? клÑ?Ñ?Ñ?: %s"
+
+#: ../jhbuild/config.py:238
+#, python-format
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos"
+"['gnome.org']\"."
+msgstr ""
+"змÑ?нна конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? \"%s\" заÑ?Ñ?аÑ?Ñ?ла, Ñ?лÑ?д викоÑ?иÑ?Ñ?овÑ?ваÑ?и \"repos"
+"['gnome.org']\"."
+
+#: ../jhbuild/config.py:243 ../jhbuild/config.py:248
 #, python-format
-msgid "I: unknown keys defined in configuration file: %s"
-msgstr "I: Ñ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йномÑ? Ñ?айлÑ? визнаÑ?ено невÑ?домÑ? клÑ?Ñ?Ñ?: %s"
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos\"."
+msgstr ""
+"змÑ?нна конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? \"%s\"заÑ?Ñ?аÑ?Ñ?ла, Ñ?лÑ?д викоÑ?иÑ?Ñ?овÑ?ваÑ?и \"repos\"."
 
-#: ../jhbuild/config.py:162
+#: ../jhbuild/config.py:269
 msgid "invalid checkout mode"
 msgstr "непÑ?авилÑ?ний Ñ?ежим checkout"
 
-#: ../jhbuild/config.py:165
+#: ../jhbuild/config.py:273
 #, python-format
 msgid "invalid checkout mode (module: %s)"
 msgstr "непÑ?авилÑ?ний Ñ?ежим checkout (модÑ?лÑ?: %s)"
 
-#: ../jhbuild/config.py:174 ../jhbuild/config.py:235
+#: ../jhbuild/config.py:275
+msgid "copy mode requires copy_dir to be set"
+msgstr "Ñ?ежим копÑ?Ñ?ваннÑ? вимагаÑ? вÑ?Ñ?ановленнÑ? copy_dir"
+
+#: ../jhbuild/config.py:280
+#, python-format
+msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
+msgstr "каÑ?алог модÑ?лÑ?в (%s) не знайдено, вимикаÑ?Ñ?Ñ?Ñ?Ñ? use_local_modulesets"
+
+#: ../jhbuild/config.py:292
+#, python-format
+msgid "install prefix (%s) can not be created"
+msgstr "неможливо Ñ?Ñ?воÑ?иÑ?и пÑ?еÑ?Ñ?кÑ? вÑ?Ñ?ановленнÑ? (%s)"
+
+#: ../jhbuild/config.py:362
 #, python-format
 msgid "Can't create %s directory"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и каÑ?алог %s"
 
-#: ../jhbuild/config.py:294
+#: ../jhbuild/config.py:437
+#, python-format
+msgid "Could not create GConf config (%s)"
+msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и каÑ?алог GConf (%s)"
+
+#: ../jhbuild/config.py:524
+msgid "Failed to parse relative time"
+msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?озÑ?бÑ?аÑ?и вÑ?дноÑ?ний Ñ?аÑ?"
+
+#: ../jhbuild/config.py:534
 msgid ""
-"W: quiet mode has been disabled because the Python curses module is missing."
-msgstr ""
-"W: Ñ?иÑ?ий Ñ?ежим вимкнено оÑ?кÑ?лÑ?ки вÑ?дÑ?Ñ?Ñ?нÑ?й модÑ?лÑ? curses длÑ?  Python."
+"quiet mode has been disabled because the Python curses module is missing."
+msgstr "Ñ?иÑ?ий Ñ?ежим вимкнено оÑ?кÑ?лÑ?ки вÑ?дÑ?Ñ?Ñ?нÑ?й модÑ?лÑ? curses длÑ?  Python."
 
-#: ../jhbuild/main.py:85
+#: ../jhbuild/main.py:91
 msgid "JHBuild commands are:"
 msgstr "Ð?оманди JHBuild:"
 
-#: ../jhbuild/main.py:91
+#: ../jhbuild/main.py:97
 msgid "For more information run \"jhbuild <command> --help\""
 msgstr ""
 "Ð?лÑ? оÑ?Ñ?иманнÑ? додаÑ?ковоÑ? Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? запÑ?Ñ?Ñ?Ñ?Ñ?Ñ? \"jhbuild <command> --help\""
 
-#: ../jhbuild/main.py:96
+#: ../jhbuild/main.py:111
 msgid "%prog [ -f config ] command [ options ... ]"
 msgstr "%prog [ -f config ] команда [ паÑ?амеÑ?Ñ?и ... ]"
 
-#: ../jhbuild/main.py:97
+#: ../jhbuild/main.py:112
 msgid ""
 "Build a set of modules from diverse repositories in correct dependency order "
 "(such as GNOME)."
@@ -1256,81 +1353,80 @@ msgstr ""
 "Ð?Ñ?бÑ?аÑ?и набÑ?Ñ? модÑ?лÑ?в з Ñ?Ñ?зниÑ? Ñ?епозиÑ?оÑ?Ñ?Ñ?в з Ñ?Ñ?аÑ?Ñ?ваннÑ?м поÑ?Ñ?дкÑ? "
 "залежноÑ?Ñ?ей (напÑ?иклад, GNOME)."
 
-#: ../jhbuild/main.py:101
+#: ../jhbuild/main.py:116
 msgid "Information about available jhbuild commands"
 msgstr "Ð?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о доÑ?Ñ?Ñ?пнÑ? команди jhbuild"
 
-#: ../jhbuild/main.py:105
+#: ../jhbuild/main.py:120
 msgid "use a non default configuration file"
 msgstr "викоÑ?иÑ?Ñ?овÑ?ваÑ?и неÑ?иповий конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?йний Ñ?айл"
 
-#: ../jhbuild/main.py:108
+#: ../jhbuild/main.py:123
 msgid "use a non default module set"
 msgstr "викоÑ?иÑ?Ñ?овÑ?ваÑ?и неÑ?иповий набÑ?Ñ? модÑ?лÑ?в"
 
-#: ../jhbuild/main.py:111
+#: ../jhbuild/main.py:126
 msgid "do not prompt for input"
 msgstr "не пÑ?опонÑ?ваÑ?и ввÑ?д"
 
-#: ../jhbuild/main.py:142
+#: ../jhbuild/main.py:157
 msgid "Interrupted"
 msgstr "Ð?еÑ?еÑ?вано"
 
-#: ../jhbuild/main.py:145
+#: ../jhbuild/main.py:160
 msgid "EOF"
 msgstr "EOF"
 
 #: ../jhbuild/moduleset.py:56
 #, python-format
-msgid "I: fixed case of module '%(orig)s' to '%(new)s'"
-msgstr "I: випÑ?авлено Ñ?егÑ?Ñ?Ñ?Ñ? модÑ?лÑ? '%(orig)s' на '%(new)s'"
+msgid "fixed case of module '%s' to '%s'"
+msgstr "випÑ?авлено Ñ?егÑ?Ñ?Ñ?Ñ? модÑ?лÑ? '%s' на '%s'"
 
-#: ../jhbuild/moduleset.py:71
+#: ../jhbuild/moduleset.py:72
 #, python-format
 msgid "module \"%s\" not found"
 msgstr "не знайдено модÑ?лÑ? \"%s\""
 
-#: ../jhbuild/moduleset.py:85
+#: ../jhbuild/moduleset.py:86
 #, python-format
 msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
 msgstr "%(module)s маÑ? залежнÑ?Ñ?Ñ?Ñ? вÑ?д невÑ?домого модÑ?лÑ? \"%(invalid)s\""
 
-#: ../jhbuild/moduleset.py:230
-msgid "W: Unknown module:"
-msgstr "W: Ð?евÑ?домий модÑ?лÑ?:"
-
-#: ../jhbuild/moduleset.py:315
-#, python-format
-msgid "could not download %s: %s"
-msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и %s: %s"
+#: ../jhbuild/moduleset.py:231
+msgid "Unknown module:"
+msgstr "Ð?евÑ?домий модÑ?лÑ?:"
 
-#: ../jhbuild/moduleset.py:320 ../jhbuild/moduleset.py:322
+#: ../jhbuild/moduleset.py:294 ../jhbuild/moduleset.py:324
 #, python-format
 msgid "failed to parse %s: %s"
 msgstr "помилка Ñ?озбоÑ?Ñ? %s: %s"
 
-#: ../jhbuild/moduleset.py:440
+#: ../jhbuild/moduleset.py:319
+#, python-format
+msgid "could not download %s: %s"
+msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и %s: %s"
+
+#: ../jhbuild/moduleset.py:444
 msgid ""
-"I: modulesets were edited locally but jhbuild is configured to get them from "
-"subversion, perhaps you need to add use_local_modulesets = True to your ."
+"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."
 msgstr ""
-"I: набÑ?Ñ? модÑ?лÑ?в бÑ?ло вÑ?дÑ?едаговано локалÑ?но, але jhbuild налаÑ?Ñ?овано на "
+"набÑ?Ñ? модÑ?лÑ?в бÑ?ло вÑ?дÑ?едаговано локалÑ?но, але jhbuild налаÑ?Ñ?овано на "
 "оÑ?Ñ?иманнÑ? Ñ?Ñ? з subversion, можливо Ñ?лÑ?д додаÑ?и use_local_modulesets = True Ñ? "
 "Ð?аÑ? Ñ?айл .jhbuildrc."
 
-#: ../jhbuild/monkeypatch.py:144
+#: ../jhbuild/monkeypatch.py:102
 #, python-format
 msgid "Invalid placeholder in string: line %d, col %d"
 msgstr "Ð?евÑ?домий placeholder Ñ? Ñ?Ñ?дкÑ?: Ñ?Ñ?док %d, Ñ?Ñ?овпÑ?ик %d"
 
-#: ../jhbuild/monkeypatch.py:149 ../jhbuild/monkeypatch.py:175
+#: ../jhbuild/monkeypatch.py:107 ../jhbuild/monkeypatch.py:133
 msgid "Too many positional arguments"
 msgstr "Ð?Ñ?же багаÑ?о позиÑ?Ñ?йниÑ? аÑ?гÑ?менÑ?Ñ?в"
 
-#: ../jhbuild/monkeypatch.py:169 ../jhbuild/monkeypatch.py:202
+#: ../jhbuild/monkeypatch.py:127 ../jhbuild/monkeypatch.py:160
 msgid "Unrecognized named group in pattern"
 msgstr "Ð?евÑ?дома Ñ?менована гÑ?Ñ?па Ñ? Ñ?аблонÑ?"
 
-#~ msgid "No <kconfig> elements found for module %s"
-#~ msgstr "Ð?е знайдено елеменÑ? <kconfig> Ñ? модÑ?лÑ? %s"
+