[jhbuild] Updated Greek translations



commit dc6139aea5706309862b70f3d75031a7a1525287
Author: Tom Tryfonidis <tomtryf gmail com>
Date:   Sun Sep 16 01:41:39 2012 +0300

    Updated Greek translations

 doc/el/el.po | 4232 +++++++++++++++++++++++++++++++++++-----------------------
 po/el.po     | 1018 ++++++++-------
 2 files changed, 3092 insertions(+), 2158 deletions(-)
---
diff --git a/doc/el/el.po b/doc/el/el.po
index 2808b54..b067b5b 100644
--- a/doc/el/el.po
+++ b/doc/el/el.po
@@ -3,87 +3,78 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2010-01-06 16:35+0000\n"
-"PO-Revision-Date: 2010-01-29 21:08+0200\n"
-"Last-Translator: ÎÎÏÎÎÏ ÎÎÎÏÎÎÎÏ <m zindilis dmajor org>\n"
+"POT-Creation-Date: 2012-09-12 12:57+0000\n"
+"PO-Revision-Date: 2012-09-16 01:40+0200\n"
+"Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
 "Language-Team: Greek <team gnome gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/jhbuild.xml:929(None)
-msgid ""
-"@@image: 'figures/jhbuild_sample_dot_output.png'; "
-"md5=af9fe7edb29fcaefeadfb2f5987aa6e4"
-msgstr ""
-"@@image: 'figures/jhbuild_sample_dot_output.png'; "
-"md5=af9fe7edb29fcaefeadfb2f5987aa6e4"
-
-#: C/jhbuild.xml:7(title)
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr "ÎÎÎÎÏ ÎÏÏÏÏÎÎÎÎÏ <tomtryf gmail com>, 2012"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.docbook:1102(imagedata)
+#| msgid ""
+#| "@@image: 'figures/jhbuild_sample_dot_output.png'; "
+#| "md5=af9fe7edb29fcaefeadfb2f5987aa6e4"
+msgctxt "_"
+msgid ""
+"external ref='figures/jhbuild_sample_dot_output.png' "
+"md5='af9fe7edb29fcaefeadfb2f5987aa6e4'"
+msgstr ""
+"external ref='figures/jhbuild_sample_dot_output.png' "
+"md5='af9fe7edb29fcaefeadfb2f5987aa6e4'"
+
+#: C/index.docbook:7(articleinfo/title)
 msgid "JHBuild Manual"
 msgstr "ÎÎÏÎÎÏÎÎÎÎ JHBuild"
 
-#: C/jhbuild.xml:10(firstname)
-msgid "James"
-msgstr "James"
-
-#: C/jhbuild.xml:11(surname)
-msgid "Henstridge"
-msgstr "Henstridge"
-
-#: C/jhbuild.xml:14(firstname)
-msgid "C.J."
-msgstr "C.J."
-
-#: C/jhbuild.xml:15(surname)
-msgid "Adams-Collier"
-msgstr "Adams-Collier"
-
-#: C/jhbuild.xml:18(firstname)
-msgid "Frederic"
-msgstr "Frederic"
+#: C/index.docbook:9(authorgroup/author)
+msgid "<firstname>James</firstname> <surname>Henstridge</surname>"
+msgstr "<firstname>James</firstname> <surname>Henstridge</surname>"
 
-#: C/jhbuild.xml:19(surname)
-msgid "Peters"
-msgstr "Peters"
+#: C/index.docbook:13(authorgroup/author)
+msgid "<firstname>C.J.</firstname> <surname>Adams-Collier</surname>"
+msgstr "<firstname>C.J.</firstname> <surname>Adams-Collier</surname>"
 
-#: C/jhbuild.xml:22(firstname)
-msgid "David"
-msgstr "David"
+#: C/index.docbook:17(authorgroup/author)
+msgid "<firstname>Frederic</firstname> <surname>Peters</surname>"
+msgstr "<firstname>Frederic</firstname> <surname>Peters</surname>"
 
-#: C/jhbuild.xml:23(surname)
-msgid "Turner"
-msgstr "Turner"
+#: C/index.docbook:21(authorgroup/author)
+msgid "<firstname>David</firstname> <surname>Turner</surname>"
+msgstr "<firstname>David</firstname> <surname>Turner</surname>"
 
-#: C/jhbuild.xml:27(year)
-msgid "2004, 2008"
-msgstr "2004, 2008"
+#: C/index.docbook:26(articleinfo/copyright)
+msgid "<year>2004, 2008</year> <holder>James Henstridge</holder>"
+msgstr "<year>2004, 2008</year> <holder>James Henstridge</holder>"
 
-#: C/jhbuild.xml:28(holder)
-msgid "James Henstridge"
-msgstr "James Henstridge"
-
-#: C/jhbuild.xml:33(revnumber)
-msgid "JHBuild Manual v0.5"
-msgstr "ÎÎÏÎÎÏÎÎÎÎ JHBuild, ÎÎÎÎÏÎ 0.5"
-
-#: C/jhbuild.xml:34(date)
-msgid "January 2008"
-msgstr "ÎÎÎÎÏÎÏÎÎÏ 2008"
-
-#: C/jhbuild.xml:37(revnumber)
-msgid "JHBuild Manual v0.1"
-msgstr "ÎÎÏÎÎÏÎÎÎÎ JHBuild v0.1"
+#: C/index.docbook:31(revhistory/revision)
+msgid "<revnumber>JHBuild Manual v0.5</revnumber> <date>January 2008</date>"
+msgstr ""
+"<revnumber>ÎÎÏÎÎÏÎÎÎÎ JHBuild v0.5</revnumber> <date>ÎÎÎÎÏÎÏÎÎÏ 2008</date>"
 
-#: C/jhbuild.xml:38(date)
-msgid "August 2007"
-msgstr "ÎÏÎÎÏÏÏÎÏ 2007"
+#: C/index.docbook:35(revhistory/revision)
+msgid "<revnumber>JHBuild Manual v0.1</revnumber> <date>August 2007</date>"
+msgstr ""
+"<revnumber>ÎÎÏÎÎÏÎÎÎÎ JHBuild v0.1</revnumber> <date>ÎÏÎÎÏÏÏÎÏ 2007</date>"
 
-#: C/jhbuild.xml:43(para)
+#: C/index.docbook:41(abstract/para)
 msgid ""
 "JHBuild is a tool used to build the whole GNOME desktop from the version "
 "control system. JHBuild can also be customized to build other projects too."
@@ -92,11 +83,11 @@ msgstr ""
 "ÏÎÏ ÎÏÎÏÎÎÎÎÎÏ ÎÏÎÎÏÎÎÏ ÏÎÏ GNOME ÎÏÏ ÏÎ ÏÏÏÏÎÎÎ ÎÎÎÎÏÎÏ ÎÎÎÏÏÎÏÎ. ÎÏÎÏÎÎ "
 "ÎÏÎÏÎÏ ÎÎ ÏÏÎÏÎÏÎÎÏÏÎÎ ÏÏÏÎ ÎÎ ÎÏÎÏÎÎ ÎÎÎ ÎÎÎÎ ÎÏÎÎ."
 
-#: C/jhbuild.xml:50(title)
+#: C/index.docbook:48(section/title)
 msgid "Introduction"
 msgstr "ÎÎÏÎÎÏÎÎ"
 
-#: C/jhbuild.xml:52(para)
+#: C/index.docbook:50(section/para)
 msgid ""
 "JHBuild is a tool designed to ease building collections of source packages, "
 "called <quote>modules</quote>. JHBuild uses <quote>module set</quote> files "
@@ -105,13 +96,13 @@ msgid ""
 "modules need to be built and in what order."
 msgstr ""
 "ÎÎ JHBuild ÎÎÎÎÎ ÎÎÎ ÎÏÎÎÎÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎ ÏÏÏÎ ÎÎ ÎÎÎÏÎÎÎÏÎÎÎ ÏÎ ÎÏÎÏÎÎÎ "
-"ÏÏÎÎÎÎÏÎ ÎÏÏ ÏÎÎÎÏÎ, ÏÎÏ ÎÎÎÎÎÎÎÎÏÎÎ <quote>ÎÏÎÏÏÎÎÏÎ</quote>. ÎÎ JHBuild "
-"ÏÏÎÏÎÎÎÏÎÎÎÎ ÎÏÏÎÎÎ <quote>ÎÎÎÎÏÎ ÎÏÎÏÏÎÎÏÏÎ</quote> ÎÎÎ ÎÎ ÏÎÏÎÎÏÎÏÎÎ ÏÎ "
-"ÎÎÎÎÎÏÎÎÎ ÏÏÎÏ ÎÏÎÏÎÎÎ ÎÏÎÏÏÎÎÏÎ. ÎÎ ÎÏÏÎÎÎ <quote>ÎÎÎÎÏÎ ÎÏÎÏÏÎÎÏÏÎ</quote> "
+"ÏÏÎÎÎÎÏÎ ÎÏÏ ÏÎÎÎÏÎ, ÏÎÏ ÎÎÎÎÎÎÎÎÏÎÎ <quote>ÎÎÏÏÎÏÎÏ</quote>. ÎÎ JHBuild "
+"ÏÏÎÏÎÎÎÏÎÎÎÎ ÎÏÏÎÎÎ <quote>ÎÎÎÎÏÎ ÎÎÎÏÎÏÏÎ</quote> ÎÎÎ ÎÎ ÏÎÏÎÎÏÎÏÎÎ ÏÎÏ "
+"ÎÎÎÎÎÏÎÎÎ ÏÏÎÏ ÎÏÎÏÎÎÎ ÎÎÏÏÎÏÎÏ. ÎÎ ÎÏÏÎÎÎ <quote>ÎÎÎÎÏÎ ÎÎÎÏÎÏÏÎ</quote> "
 "ÏÎÏÎÎÏÎÏÎ ÏÎÎÏÎÏÎÏÎÎÏ ÎÎÎÏÏÎÏÎÏÎ ÏÎÏ ÎÏÎÏÏÎÏÎÏÎ ÏÏÎ JHBuild ÎÎ ÎÎÎÎÎÎÏÏÏÎÎ "
-"ÏÎÎÎ ÎÏÎÏÏÎÎÏÎ ÏÏÎÎÎÎÎÏÎÎ ÎÎ ÎÏÎÏÏÎÏÎ ÎÎÎ ÎÎ ÏÎÎÎ ÏÎÎÏÎ."
+"ÏÎÎÎÏ ÎÎÏÏÎÏÎÏ ÏÏÎÎÎÎÎÏÎÎ ÎÎ ÎÏÎÏÏÎÏÎ ÎÎÎ ÎÎ ÏÎÎÎ ÏÎÎÏÎ."
 
-#: C/jhbuild.xml:59(para)
+#: C/index.docbook:57(section/para)
 msgid ""
 "JHBuild was originally written for building <ulink url=\"http://www.gnome.org";
 "\">GNOME</ulink>, but has since been extended to be usable with other "
@@ -120,24 +111,35 @@ msgid ""
 msgstr ""
 "ÎÎ JHBuild ÎÏÏÎÎÎ ÎÏÎÏÏÎÎÎ ÎÎÎ ÏÎ ÎÏÎÏÎÎÎ ÏÎÏ <ulink url=\"http://www.gnome.";
 "org\">GNOME</ulink>, ÎÎÎÎ ÎÏÎÎ ÎÎÏÎÏÎ ÎÏÎÎÏÎÎÎÎ ÎÎÎ ÎÎ ÎÏÎÏÎÎ ÎÎ "
-"ÏÏÎÏÎÎÎÏÎÎÎÎÎÎ ÎÎÎ ÎÎ ÎÎÎÎ ÎÏÎÎ. ÎÎÎ ÎÏÏÎÎÎ <quote>ÎÎÎÎÎÏ ÎÏÎÏÏÎÎÏÏÎ</quote> "
+"ÏÏÎÏÎÎÎÏÎÎÎÎÎÎ ÎÎÎ ÎÎ ÎÎÎÎ ÎÏÎÎ. ÎÎÎ ÎÏÏÎÎÎ <quote>ÎÎÎÎÎÏ ÎÎÎÏÎÏÏÎ</quote> "
 "ÎÏÎÏÎÎ ÎÎ ÏÎÎÎÎÎÎÎÎÏÎÎ ÏÎ ÎÎÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎÎÎÎÎÏÏÎÏ, ÎÏÎÏÏÎÏÎÎÏÎÏ ÎÎÎÏÎÎÏ "
 "ÎÏÎÏÎÎÎÏÎÏ ÎÎÎÎÎÏÏÎÏÎ ÎÏÏ ÏÎ ÎÏÎÎ JHBuild.Î"
 
-#: C/jhbuild.xml:65(para)
+#: C/index.docbook:63(section/para)
+#, fuzzy
+#| msgid ""
+#| "JHBuild can build modules from a variety of sources, including <ulink url="
+#| "\"http://www.cvshome.org/\";>CVS</ulink>, <ulink url=\"http://subversion.";
+#| "tigris.org/\">Subversion,</ulink><ulink url=\"http://wiki.gnuarch.org/";
+#| "\">Arch</ulink>, <ulink url=\"http://www.bazaar-vcs.org/\";>Bazaar</"
+#| "ulink>, <ulink url=\"http://darcs.net/\";>Darcs</ulink>, <ulink url="
+#| "\"http://git.or.cz/\";>Git</ulink> and <ulink url=\"http://www.selenic.com/";
+#| "mercurial/\">Mercurial</ulink> repositories, as well as Tar and Zip "
+#| "archives hosted on web or FTP sites. JHBuild can build modules using a "
+#| "variety of build systems, including Autotools, CMake, WAF, Ant, Python "
+#| "Distutils and Perl Makefiles."
 msgid ""
 "JHBuild can build modules from a variety of sources, including <ulink url="
 "\"http://www.cvshome.org/\";>CVS</ulink>, <ulink url=\"http://subversion.";
-"tigris.org/\">Subversion,</ulink><ulink url=\"http://wiki.gnuarch.org/";
-"\">Arch</ulink>, <ulink url=\"http://www.bazaar-vcs.org/\";>Bazaar</ulink>, "
-"<ulink url=\"http://darcs.net/\";>Darcs</ulink>, <ulink url=\"http://git.or.";
-"cz/\">Git</ulink> and <ulink url=\"http://www.selenic.com/mercurial/";
-"\">Mercurial</ulink> repositories, as well as Tar and Zip archives hosted on "
-"web or FTP sites. JHBuild can build modules using a variety of build "
-"systems, including Autotools, CMake, WAF, Ant, Python Distutils and Perl "
-"Makefiles."
-msgstr ""
-"ÎÎ JHBuild ÎÏÎÏÎÎ ÎÎ ÎÏÎÏÎÎ ÎÏÎÏÏÎÎÏÎ ÎÏÏ ÎÎÎ ÏÎÎÎÎÎÎÎ ÎÏÏ ÏÎÎÎÏ, ÏÎÏ "
+"tigris.org/\">Subversion</ulink>, <ulink url=\"http://www.bazaar-vcs.org/";
+"\">Bazaar</ulink>, <ulink url=\"http://darcs.net/\";>Darcs</ulink>, <ulink "
+"url=\"http://git.or.cz/\";>Git</ulink> and <ulink url=\"http://www.selenic.";
+"com/mercurial/\">Mercurial</ulink> repositories, as well as Tar and Zip "
+"archives hosted on web or FTP sites. JHBuild can build modules using a "
+"variety of build systems, including Autotools, CMake, WAF, Python Distutils "
+"and Perl Makefiles."
+msgstr ""
+"ÎÎ JHBuild ÎÏÎÏÎÎ ÎÎ ÎÏÎÏÎÎ ÎÎÏÏÎÏÎÏ ÎÏÏ ÎÎÎ ÏÎÎÎÎÎÎÎ ÎÏÏ ÏÎÎÎÏ, ÏÎÏ "
 "ÏÎÏÎÎÎÎÎÎÎÎÏÎ ÎÏÎÎÎÏÎÏÎÎ <ulink url=\"http://www.cvshome.org/\";>CVS</ulink>, "
 "<ulink url=\"http://subversion.tigris.org/\";>Subversion,</ulink><ulink url="
 "\"http://wiki.gnuarch.org/\";>Arch</ulink>, <ulink url=\"http://www.bazaar-";
@@ -148,7 +150,7 @@ msgstr ""
 "ÎÏÎÏÏÎÎÏÎ ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÎÎÎÏÎÏÎ ÏÏÏÏÎÎÎÏÎ ÎÏÎÏÎÎÎÏÎÏ, ÏÎÏ ÏÎÏÎÎÎÎÎÎÎÎÏÎ ÏÎ "
 "Autotools, CMake, WAF, Ant, Python Distutils ÎÎÎ Perl Makefiles."
 
-#: C/jhbuild.xml:79(para)
+#: C/index.docbook:74(section/para)
 msgid ""
 "JHBuild is not intended as a replacement for the distribution's package "
 "management system. Instead, it makes it easy to build software into a "
@@ -158,11 +160,11 @@ msgstr ""
 "ÏÎÏ ÎÎÎÎÎÎÎÏ. ÎÎÏÎ ÎÏÏÎÏ, ÎÎÎÏÎÎÎÏÎÎÎ ÏÎ ÎÏÎÏÎÎÎ ÎÎÎÎÏÎÎÎÎÏ ÏÎ ÎÎÎ ÎÎÏÏÏÎÏÏÎ "
 "ÎÎÎÎÏÎÏÏÎÏÎ, ÏÏÏÎÏ ÎÎ ÎÎÏÎÎÎÎÏÎÎ ÎÎ ÏÎ ÏÏÏÎÎÎÏÎ ÏÏÏÏÎÎÎ."
 
-#: C/jhbuild.xml:87(title)
+#: C/index.docbook:81(section/title)
 msgid "Getting Started"
 msgstr "ÎÎÎÎÎÏÎÏÎÏ"
 
-#: C/jhbuild.xml:89(para)
+#: C/index.docbook:83(section/para)
 msgid ""
 "JHBuild requires a few set up steps to be run before building software. "
 "JHBuild requires some prerequisite software, and it is necessary to install "
@@ -170,115 +172,49 @@ msgid ""
 msgstr ""
 "ÎÎ JHBuild ÎÏÎÎÏÎÎ ÎÎÏÎÎÎÏ ÏÏÎÎÎÏÎÎÏ ÏÏÎÏÎÏ ÎÏÎÏÎÎ ÎÎÎÎÏÎÎÎÏ. ÎÏÎÎ ÎÏÎÏÎÏ "
 "ÎÎÏÎÎÎ ÏÏÎÎÏÎÎÏÎÏÎÎÎÎ ÎÎÎÎÏÎÎÎÏ, ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÎÎÎ ÎÎ ÎÎÎÎÏÎÏÏÎÎÎÏÎ ÏÎ "
-"ÏÏÎÎÏÎÎÏÎÏÎÎÎÎ ÎÎÎÎÎÎÎÎ ÎÏÎÎÎÎÎÎ ÎÎÎ ÏÎ ÎÎÏÎ ÎÎÎ ÏÎ ÎÏÎÏÎÎÎ ÏÏÎ ÎÏÎÏÏÎÎÏÏÎ "
+"ÏÏÎÎÏÎÎÏÎÏÎÎÎÎ ÎÎÎÎÎÎÎÎ ÎÏÎÎÎÎÎÎ ÎÎÎ ÏÎ ÎÎÏÎ ÎÎÎ ÏÎ ÎÏÎÏÎÎÎ ÏÏÎ ÎÎÎÏÎÏÏÎ "
 "ÎÎÎÎÏÎÎÎÎÏ."
 
-#: C/jhbuild.xml:95(title)
+#: C/index.docbook:89(section/title)
 msgid "Installing JHBuild"
 msgstr "ÎÎÎÎÎÎÏÏÏÎÏÎÏ ÏÎ JHBuild"
 
-#: C/jhbuild.xml:97(para)
-msgid ""
-"Before downloading JHBuild, verify a copy of Python &gt;= 2.0 is installed. "
-"It is essential that the Expat XML parser extension is installed. Expat XML "
-"is supplied with Python &gt;= 2.3. To verify Expat XML is installed run the "
-"following commands:"
-msgstr ""
-"ÎÏÎÏÎÏ ÎÎÏÎÎÎÏÎÏÎ ÏÎ JHBuild, ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÏÏÎÏÏÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÎÎ "
-"ÎÎÎÎÏÎ ÎÎÏÏÎÏÎ ÏÎÏ Python 2.0. ÎÎÎÎÎ ÏÎÎÎÎÏÎÎÏ ÎÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ Î "
-"ÎÏÎÎÏÎÏÎ Expat XML. Î Expat XML ÏÎÏÎÏÎÏÎÎ ÎÎ ÏÎÎ Python 2.3 Î ÎÎÏÏÎÏÎ. ÎÎÎ "
-"ÎÎ ÎÏÎÎÎÎÎÎÏÏÎÏÎ ÏÏÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ Î Expat XML ÏÏÎÎÏÎ ÏÎÏ ÎÎÏÎÎÏÎÎÏ "
-"ÎÎÏÎÎÎÏ:"
-
-#: C/jhbuild.xml:103(prompt)
-msgid "#"
-msgstr "#"
-
-#: C/jhbuild.xml:103(userinput)
-#, no-wrap
-msgid "python"
-msgstr "python"
-
-#: C/jhbuild.xml:107(prompt) C/jhbuild.xml:108(prompt)
-msgid "&gt;&gt;&gt;"
-msgstr "&gt;&gt;&gt;"
-
-#: C/jhbuild.xml:107(userinput)
-#, no-wrap
-msgid "import xml.parsers.expat"
-msgstr "import xml.parsers.expat"
-
-#: C/jhbuild.xml:103(screen)
-#, no-wrap
-msgid ""
-"<placeholder-1/> <placeholder-2/>\n"
-"Python 2.6.2+ (release26-maint, Sep 13 2009, 21:26:06) \n"
-"[GCC 4.4.1] on linux2\n"
-"Type \"help\", \"copyright\", \"credits\" or \"license\" for more information.\n"
-"<placeholder-3/> <placeholder-4/>\n"
-"<placeholder-5/>"
-msgstr ""
-"<placeholder-1/> <placeholder-2/>\n"
-"Python 2.6.2+ (release26-maint, Sep 13 2009, 21:26:06) \n"
-"[GCC 4.4.1] on linux2\n"
-"Type \"help\", \"copyright\", \"credits\" or \"license\" for more information.\n"
-"<placeholder-3/> <placeholder-4/>\n"
-"<placeholder-5/>"
-
-#: C/jhbuild.xml:110(para)
+#: C/index.docbook:91(section/para)
 msgid ""
-"If the above completes without an exception, then Expat XML is installed "
-"correctly."
+"JHBuild requires a Python runtime. Verify Python &gt;= 2.3 is installed."
 msgstr ""
-"ÎÎ ÏÎ ÏÎÎ ÏÎÎÏ ÎÎÎÎÎÎÏÏÎÎÎ ÏÏÏÎÏ ÎÎÎÎÏÎÏÎ, ÏÏÏÎ Î Expat XML ÎÎÎÎÎ ÏÏÏÏÎ "
-"ÎÎÎÎÏÎÏÏÎÎÎÎÎ."
 
-#: C/jhbuild.xml:113(para)
+#: C/index.docbook:94(section/para)
+#| msgid ""
+#| "The only way to download JHBuild is via the version control system, "
+#| "<command>git</command>. This can be achieved with the following command. "
+#| "It is recommended to run the command from a new directory where all "
+#| "source code will be installed, for example, <filename>~/checkout/gnome2</"
+#| "filename>."
 msgid ""
-"The only way to download JHBuild is via the version control system, "
+"The recommended way to download JHBuild is via the version control system, "
 "<command>git</command>. This can be achieved with the following command. It "
 "is recommended to run the command from a new directory where all source code "
-"will be installed, for example, <filename>~/checkout/gnome2</filename>."
+"will be installed, for example, <filename>~/checkout/gnome</filename>."
 msgstr ""
 "Î ÎÏÎÎÏ ÏÏÏÏÎÏ ÎÎÎ ÎÎ ÎÎÏÎÎÎÏÎÏÎ ÏÎ JHBuild ÎÎÎÎÎ ÎÎÏÏ ÏÎÏ ÏÏÏÏÎÎÎÏÎÏ "
 "ÎÎÎÎÏÎÏ ÎÎÎÏÏÎÏÎ <command>git</command>. ÎÏÏÏ ÎÏÎÏÎÎ ÎÎ ÎÏÎÏÎÏÏÎÎÎ ÎÎ ÏÎÎ "
 "ÎÎÏÎÎÎ ÏÎÏ ÎÎÎÎÎÏÎÎÎ. ÎÏÎÎÏÏÎÏÎÎ ÎÎ ÎÎÏÎÎÎÏÎÏÎ ÏÎÎ ÎÎÏÎÎÎ ÎÏÏ ÎÎÎ ÎÎÎ ÏÎÎÎÎÎ "
 "ÏÏÎÏ ÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎ ÏÎÎÏ Î ÏÎÎÎÎÎÏ ÎÏÎÎÎÎÏ, ÎÎÎ ÏÎÏÎÎÎÎÎÎÎ <filename>~/"
-"checkout/gnome2</filename>."
-
-#: C/jhbuild.xml:119(prompt) C/jhbuild.xml:121(prompt)
-#: C/jhbuild.xml:127(prompt) C/jhbuild.xml:128(prompt)
-#: C/jhbuild.xml:130(prompt) C/jhbuild.xml:132(prompt)
-#: C/jhbuild.xml:134(prompt) C/jhbuild.xml:139(prompt)
-#: C/jhbuild.xml:140(prompt) C/jhbuild.xml:142(prompt)
-#: C/jhbuild.xml:144(prompt) C/jhbuild.xml:151(prompt)
-#: C/jhbuild.xml:152(prompt) C/jhbuild.xml:159(prompt)
-#: C/jhbuild.xml:160(prompt) C/jhbuild.xml:290(prompt)
-#: C/jhbuild.xml:308(prompt) C/jhbuild.xml:337(prompt)
-#: C/jhbuild.xml:366(prompt) C/jhbuild.xml:372(prompt)
-#: C/jhbuild.xml:380(prompt) C/jhbuild.xml:386(prompt)
-#: C/jhbuild.xml:391(prompt) C/jhbuild.xml:399(prompt)
-#: C/jhbuild.xml:404(prompt) C/jhbuild.xml:409(prompt)
-#: C/jhbuild.xml:414(prompt) C/jhbuild.xml:445(prompt)
-#: C/jhbuild.xml:861(prompt) C/jhbuild.xml:863(prompt)
-#: C/jhbuild.xml:918(prompt) C/jhbuild.xml:922(prompt)
-#: C/jhbuild.xml:1150(prompt)
-msgid "$"
-msgstr "$"
-
-#: C/jhbuild.xml:119(userinput)
-#, no-wrap
-msgid "git clone git://git.gnome.org/jhbuild"
-msgstr "git clone git://git.gnome.org/jhbuild"
-
-#: C/jhbuild.xml:120(computeroutput) C/jhbuild.xml:129(computeroutput)
-#: C/jhbuild.xml:131(computeroutput) C/jhbuild.xml:133(computeroutput)
-#: C/jhbuild.xml:141(computeroutput) C/jhbuild.xml:143(computeroutput)
-#, no-wrap
-msgid "..."
-msgstr "..."
-
-#: C/jhbuild.xml:123(para)
+"checkout/gnome</filename>."
+
+#: C/index.docbook:100(section/screen)
+#, no-wrap
+msgid ""
+"<prompt>$</prompt> <userinput>git clone git://git.gnome.org/jhbuild</userinput>\n"
+"<computeroutput>...</computeroutput>\n"
+"<prompt>$</prompt>"
+msgstr ""
+"<prompt>$</prompt> <userinput>git clone git://git.gnome.org/jhbuild</userinput>\n"
+"<computeroutput>...</computeroutput>\n"
+"<prompt>$</prompt>"
+
+#: C/index.docbook:104(section/para)
 msgid ""
 "This will download JHBuild into a new folder named <filename>jhbuild</"
 "filename> under the current directory. Now to build and install JHBuild:"
@@ -287,45 +223,41 @@ msgstr ""
 "<filename>jhbuild</filename> ÎÎÏÎ ÏÏÎÎ ÏÏÎÏÎÎÏÎ ÏÎÎÎÎÎ. ÎÏÏÎ ÎÎÎ ÎÎ ÎÏÎÏÎÏÎ "
 "ÎÎÎ ÎÎ ÎÎÎÎÏÎÏÏÎÏÎÏÎ ÏÎ JHBuild:"
 
-#: C/jhbuild.xml:127(userinput) C/jhbuild.xml:139(userinput)
+#: C/index.docbook:108(section/screen)
 #, no-wrap
-msgid "cd jhbuild"
-msgstr "cd jhbuild"
-
-#: C/jhbuild.xml:128(userinput)
-#, no-wrap
-msgid "./autogen.sh"
-msgstr "./autogen.sh"
-
-#: C/jhbuild.xml:130(userinput)
-#, no-wrap
-msgid "make"
-msgstr "make"
-
-#: C/jhbuild.xml:132(userinput)
-#, no-wrap
-msgid "make install"
-msgstr "make install"
-
-#: C/jhbuild.xml:136(para)
 msgid ""
-"Alternatively, if autotools or gnome-doc-utils is not installed, install "
-"JHBuild as follows:"
-msgstr ""
-"ÎÎÎÎÎÎÎÏÎÎÎ, ÎÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÏÎ autotools Î gnome-doc-utils, "
-"ÎÎÎÎÏÎÏÏÎÏÏÎ ÏÎ JHBuild ÏÏ ÎÎÎÏ:"
-
-#: C/jhbuild.xml:140(userinput)
-#, no-wrap
-msgid "make -f Makefile.plain"
-msgstr "make -f Makefile.plain"
-
-#: C/jhbuild.xml:142(userinput)
-#, no-wrap
-msgid "make -f Makefile.plain install"
-msgstr "make -f Makefile.plain install"
-
-#: C/jhbuild.xml:146(para)
+"<prompt>$</prompt> <userinput>cd jhbuild</userinput>\n"
+"<prompt>$</prompt> <userinput>./autogen.sh</userinput>\n"
+"<computeroutput>...</computeroutput>\n"
+"<prompt>$</prompt> <userinput>make</userinput>\n"
+"<computeroutput>...</computeroutput>\n"
+"<prompt>$</prompt> <userinput>make install</userinput>\n"
+"<computeroutput>...</computeroutput>\n"
+"<prompt>$</prompt>"
+msgstr ""
+"<prompt>$</prompt> <userinput>cd jhbuild</userinput>\n"
+"<prompt>$</prompt> <userinput>./autogen.sh</userinput>\n"
+"<computeroutput>...</computeroutput>\n"
+"<prompt>$</prompt> <userinput>make</userinput>\n"
+"<computeroutput>...</computeroutput>\n"
+"<prompt>$</prompt> <userinput>make install</userinput>\n"
+"<computeroutput>...</computeroutput>\n"
+"<prompt>$</prompt>"
+
+#: C/index.docbook:117(section/para)
+msgid ""
+"If <application>gnome-common</application>, <application>yelp-tools</"
+"application> and <application>autotools</application> are available, "
+"<filename>autogen.sh</filename> will configure JHBuild to install via "
+"<application>autotools</application>. If <application>gnome-common</"
+"application>, <application>yelp-tools</application> and "
+"<application>autotools</application> are not available, <filename>autogen."
+"sh</filename> will configure JHBuild to install via a plain Makefile. To "
+"always use the plain Makefile method pass <option>--simple-install</option> "
+"to <filename>autogen.sh</filename>."
+msgstr ""
+
+#: C/index.docbook:130(section/para)
 msgid ""
 "If the above steps complete successfully, a small shell script will be "
 "installed in <filename>~/.local/bin</filename> to start JHBuild. Add "
@@ -336,12 +268,16 @@ msgstr ""
 "ÎÎÎÎÎÎÎ ÏÎ JHBuild. ÎÏÎÏÎÎÏÏÎ ÏÎ <filename>~/.local/bin</filename> ÏÏÎ "
 "<envar>PATH</envar>:"
 
-#: C/jhbuild.xml:151(userinput)
+#: C/index.docbook:134(section/screen)
 #, no-wrap
-msgid "PATH=$PATH:~/.local/bin"
-msgstr "PATH=$PATH:~/.local/bin"
+msgid ""
+"<prompt>$</prompt> <userinput>PATH=$PATH:~/.local/bin</userinput>\n"
+"<prompt>$</prompt>"
+msgstr ""
+"<prompt>$</prompt> <userinput>PATH=$PATH:~/.local/bin</userinput>\n"
+"<prompt>$</prompt>"
 
-#: C/jhbuild.xml:154(para)
+#: C/index.docbook:137(section/para)
 msgid ""
 "To permanently add <filename>~/.local/bin</filename> to the <envar>PATH</"
 "envar> variable, run the following command:"
@@ -349,30 +285,37 @@ msgstr ""
 "ÎÎÎ ÎÎ ÏÏÎÏÎÎÏÎÏÎ ÎÏÎÎÎÎ ÏÎ <filename>~/.local/bin</filename> ÏÏÎ ÎÎÏÎÎÎÎÏÎ "
 "<envar>PATH</envar>, ÎÎÏÎÎÎÏÏÎ ÏÎÎ ÎÎÏÎÎÏÎÎ ÎÎÏÎÎÎ:"
 
-#: C/jhbuild.xml:159(userinput)
+#: C/index.docbook:140(section/screen)
 #, no-wrap
-msgid "echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc"
-msgstr "echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc"
-
-#: C/jhbuild.xml:162(para)
+#| msgid "echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc"
 msgid ""
-"Before running JHBuild, it is necessary to set up a configuration file "
-"located at <filename>~/.jhbuildrc</filename>."
+"\n"
+"<prompt>$</prompt> <userinput>echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc</userinput>\n"
+"<prompt>$</prompt>"
 msgstr ""
-"ÎÏÎÏÎÏ ÏÏÎÎÎÏÎ ÏÎ JHBuild, ÎÎÎÎÎ ÎÏÎÏÎÎÏÎÏÎ ÎÎ ÎÏÎÏÎÏÎ ÎÎÎ ÎÏÏÎÎÎ ÏÏÎÎÎÏÎÏÎ "
-"ÏÏÎ ÏÎÎÎÎÎ <filename>~/.jhbuildrc</filename>."
+"\n"
+"<prompt>$</prompt> <userinput>echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc</userinput>\n"
+"<prompt>$</prompt>"
 
-#: C/jhbuild.xml:169(title)
+#: C/index.docbook:146(section/title)
 msgid "Configuring JHBuild"
 msgstr "ÎÎÏÎÎÎÏÏÎÏÎÎÎÏÎ ÏÎÏ JHBuild"
 
-#: C/jhbuild.xml:171(para)
-msgid ""
-"The <filename>~/.jhbuildrc</filename> file uses Python syntax to set "
-"configuration variables for JHBuild. An example is provided within the "
-"jhbuild directory, see <filename>sample.jhbuildrc</filename>. Copy "
-"<filename>sample.jhbuildrc</filename> to <filename>~/.jhbuildrc</filename> "
-"and customize as required."
+#: C/index.docbook:148(section/para)
+#, fuzzy
+#| msgid ""
+#| "The <filename>~/.jhbuildrc</filename> file uses Python syntax to set "
+#| "configuration variables for JHBuild. An example is provided within the "
+#| "jhbuild directory, see <filename>sample.jhbuildrc</filename>. Copy "
+#| "<filename>sample.jhbuildrc</filename> to <filename>~/.jhbuildrc</"
+#| "filename> and customize as required."
+msgid ""
+"JHBuild can be configured via a configuration file. The default location is "
+"<filename>~/.config/jhbuildrc</filename>. If a configuration file does not "
+"exist, the defaults are used. The configuration file uses Python syntax. An "
+"example is provided, see <filename>examples/sample.jhbuildrc</filename>. "
+"Copy <filename>examples/sample.jhbuildrc</filename> to <filename>~/.config/"
+"jhbuildrc</filename> and customize as required."
 msgstr ""
 "ÎÎ ÎÏÏÎÎÎ <filename>~/.jhbuildrc</filename> ÏÏÎÏÎÎÎÏÎÎÎÎ ÏÏÎÏÎÎÎ Python ÎÎÎ "
 "ÎÎ ÎÏÎÏÎÎ ÎÎÏÎÎÎÎÏÎÏ ÏÎÏÎÎÎÏÏÎÏÎÎÎÏÎÏ ÎÎÎ ÏÎ JHBuild. ÎÎÎ ÏÎÏÎÎÎÎÎÎÎ "
@@ -380,23 +323,30 @@ msgstr ""
 "filename>. ÎÎÏÎÎÏÎÏÏÎ ÏÎ <filename>sample.jhbuildrc</filename> ÏÏÎ "
 "<filename>~/.jhbuildrc</filename> ÎÎÎ ÏÎÏÎÎÎÏÏÎÏÎÎÎÏÏÎ ÏÎ ÏÏÏÏ ÎÏÎÎÏÎÎÏÎÎ."
 
-#: C/jhbuild.xml:179(para)
+#: C/index.docbook:157(section/para)
+#| msgid ""
+#| "The sample configuration will make JHBuild build the <application>meta-"
+#| "gnome-desktop</application> module and its dependencies from the "
+#| "<systemitem>gnome-2.30</systemitem> module set. JHBuild will unpack "
+#| "source trees to <filename>~/checkout/gnome2</filename> and install all "
+#| "files to subdirectories of <filename>/opt/gnome2</filename>. The two "
+#| "directories must be writable."
 msgid ""
 "The sample configuration will make JHBuild build the <application>meta-gnome-"
-"desktop</application> module and its dependencies from the <systemitem>gnome-"
-"2.30</systemitem> module set. JHBuild will unpack source trees to "
-"<filename>~/checkout/gnome2</filename> and install all files to "
-"subdirectories of <filename>/opt/gnome2</filename>. The two directories must "
-"be writable."
-msgstr ""
-"Î ÏÏÎÎÎÏÎ ÏÎÏ ÏÎÏÎÏÎÏÎÎ ÏÏ ÏÎÏÎÎÎÎÎÎÎ ÎÎ ÎÎÎÎÎ ÏÎ JHBuild ÎÎ ÎÏÎÏÎÎ ÏÎ "
-"ÎÏÎÏÏÎÎ <application>meta-gnome-desktop</application> ÎÎÎ ÏÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÎÏ "
+"core</application> and <application>meta-gnome-apps-tested</application> "
+"modules and dependencies from the <systemitem>gnome-apps</systemitem> module "
+"set. JHBuild will unpack source trees to <filename>~/checkout/gnome</"
+"filename> and install all files to subdirectories of <filename>/opt/gnome</"
+"filename>. The two directories must be writable."
+msgstr ""
+"Î ÏÏÎÎÎÏÎ ÏÎÏ ÏÎÏÎÏÎÏÎÎ ÏÏ ÏÎÏÎÎÎÎÎÎÎ ÎÎ ÎÎÎÎÎ ÏÎ JHBuild ÎÎ ÎÏÎÏÎÎ ÏÎÎ "
+"ÎÎÏÏÎÏÎ <application>meta-gnome-desktop</application> ÎÎÎ ÏÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÎÏ "
 "ÎÏÏ ÏÎÎ ÎÎÎÎÎ ÎÏÎÏÏÎÎÏÏÎ <systemitem>gnome-2.30</systemitem>. ÎÎ JHBuild ÎÎ "
 "ÎÎÏÎÎÎÏÎÏÎÎ ÏÎ ÎÎÎÎÏÎ ÎÏÎÎÎÎ ÏÏÎ <filename>~/checkout/gnome2</filename> ÎÎÎ "
 "ÎÎ ÎÎÎÎÏÎÏÏÎÏÎÎ ÏÎÎ ÏÎ ÎÏÏÎÎÎ ÏÎ ÏÏÎÏÎÎÎÎÎÏÏ ÏÎÏ <filename>/opt/gnome2</"
 "filename>. ÎÎ ÎÏÎ ÎÏÏÎÎ ÏÎÎÎÎÎÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÎÎÎÏÎÏÎÎÎÎ."
 
-#: C/jhbuild.xml:187(para)
+#: C/index.docbook:166(section/para)
 msgid ""
 "Configuration variables are documented in <xref linkend=\"config-reference\"/"
 ">. The most commonly used variables are:"
@@ -404,11 +354,11 @@ msgstr ""
 "ÎÎ ÎÎÏÎÎÎÎÏÎÏ ÏÎÏÎÎÎÏÏÎÏÎÎÎÏÎÏ ÏÎÎÎÎÏÎÏÎÎÎÏÎÎ ÏÏÎ <xref linkend=\"config-"
 "reference\"/>. ÎÎ ÏÎÎ ÎÎÎÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÎÏÎÏ ÎÎÎÎÎ:"
 
-#: C/jhbuild.xml:194(varname) C/jhbuild.xml:1698(varname)
-msgid "repos"
-msgstr "ÎÏÎÎÎÏÎÏÎÎ"
+#: C/index.docbook:173(varlistentry/term)
+msgid "<link linkend=\"cfg-repos\"><varname>repos</varname></link>"
+msgstr "<link linkend=\"cfg-repos\"><varname>repos</varname></link>"
 
-#: C/jhbuild.xml:196(simpara)
+#: C/index.docbook:177(listitem/simpara)
 msgid ""
 "A dictionary that can be used to specify an alternative repository location "
 "for a particular repository. This configuration variable is useful to a "
@@ -418,23 +368,24 @@ msgid ""
 "For example:"
 msgstr ""
 "ÎÎÎ ÎÎÎÎÎÏ ÏÎ ÎÏÎÎÎ ÎÏÎÏÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÎÎ ÎÎÎ ÎÎ ÎÏÎÏÏÎÎ ÎÎÎ ÎÎÎÎÎÎÎÏÎÎÎ "
-"ÏÎÏÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎÏ ÎÎÎ ÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ. ÎÏÏÎ Î ÎÎÏÎÎÎÎÏÎ "
-"ÏÎÏÎÎÎÏÏÎÏÎÎÎÏÎÏ ÎÎÎÎÎ ÏÏÎÏÎÎÎ ÏÎ ÎÎÎÎ ÏÏÎÎÏÎÎÎÎÏÎÏÏÎ ÎÏÎÏÏÎÎÏÏÎ. ÎÏÏ "
+"ÏÎÏÎÎÎÏÎÎ ÎÏÎÎÎÏÎÏÎÎÏ ÎÎÎ ÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ. ÎÏÏÎ Î ÎÎÏÎÎÎÎÏÎ "
+"ÏÎÏÎÎÎÏÏÎÏÎÎÎÏÎÏ ÎÎÎÎÎ ÏÏÎÏÎÎÎ ÏÎ ÎÎÎÎ ÏÏÎÎÏÎÎÎÎÏÎÏÏÎ ÎÎÎÏÎÏÏÎ. ÎÏÏ "
 "ÏÏÎÎÏÎÎÎÎÎ, ÏÎ JHBuild ÎÎ ÎÎÏÎÎÎÏÎÎ ÏÎÎ ÎÏÎÎÎÎ ÎÏÏ ÎÏÎÎÎÏÎÏÎÎ "
 "ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÎÎÎ ÎÎÏÎÏÎÎ ÏÎÏÎÎÎÏÎÎ ÎÏÎÎÎÏÎÏÎÎÏ. ÎÎ ÎÎÎÎÎÎÎ ÏÎÏ ÎÎÎÎÎÎÏ "
 "ÎÎÎÎÎ ÏÏÎÏÎÎÎ ÎÎÏÎÎÏÎ ÎÏÎÎÎÏÎÏÎÏÎ ÎÎÎ ÎÎ ÎÎÎÎÏ ÏÎÏÏ ÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎÏ "
 "ÎÎÎÎÎÎÎÏÎÎÏÎ ÏÎÏÎÎÎÏÎÏÎ ÎÏÎÎÎÏÎÏÎÏÎ. ÎÎÎ ÏÎÏÎÎÎÎÎÎÎ:"
 
-#: C/jhbuild.xml:203(programlisting)
+#: C/index.docbook:185(listitem/programlisting)
 #, no-wrap
 msgid "repos['git.gnome.org'] = 'ssh://<replaceable>username</replaceable>@git.gnome.org/git/'"
 msgstr "repos['git.gnome.org'] = 'ssh://<replaceable>ÏÎÎÎÎ ÏÏÎÏÏÎ</replaceable>@git.gnome.org/git/'"
 
-#: C/jhbuild.xml:207(varname) C/jhbuild.xml:1582(varname)
-msgid "moduleset"
-msgstr "moduleset"
+#: C/index.docbook:189(varlistentry/term)
+msgid "<link linkend=\"cfg-moduleset\"><varname>moduleset</varname></link>"
+msgstr "<link linkend=\"cfg-moduleset\"><varname>moduleset</varname></link>"
 
-#: C/jhbuild.xml:209(simpara) C/jhbuild.xml:1584(simpara)
+#: C/index.docbook:193(listitem/simpara)
+#: C/index.docbook:1890(listitem/simpara)
 msgid ""
 "A string or list of strings specifying the name(s) of the module set(s) to "
 "use. This can either be the filename of a moduleset included with JHBuild "
@@ -445,107 +396,152 @@ msgid ""
 "current GNOME development release."
 msgstr ""
 "ÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ Î ÎÎÏÏÎ ÏÏÎÎÎÎÎÏÎÎÏÏÎ ÏÎÏ ÎÎÎÎÏÎÎÎÏÎ ÏÎ ÏÎÎÎÎ Î ÎÎÏÎÎÏÎ ÏÎÏ "
-"ÎÎÎÎÎÏ Î ÏÏÎ ÎÎÎÎÏÎ ÎÏÎÏÏÎÎÏÏÎ ÏÎÏ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÎÏÎ. ÎÏÏÎ ÎÏÎÏÎÎ ÎÎ ÎÎÎÎÎ "
-"ÎÎÏÎ ÏÎ ÏÎÎÎÎ ÎÎÎÏ ÎÎÎÎÎÏ ÎÏÎÏÏÎÎÏÏÎ ÏÎÏ ÏÎÏÎÎÎÎÎÎÎÎÏÎÎ ÎÎ ÏÎ JHBuild (ÏÏÏÎÏ "
+"ÎÎÎÎÎÏ Î ÏÏÎ ÎÎÎÎÏÎ ÎÎÎÏÎÏÏÎ ÏÎÏ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÎÏÎ. ÎÏÏÎ ÎÏÎÏÎÎ ÎÎ ÎÎÎÎÎ "
+"ÎÎÏÎ ÏÎ ÏÎÎÎÎ ÎÎÎÏ ÎÎÎÎÎÏ ÎÎÎÏÎÏÏÎ ÏÎÏ ÏÎÏÎÎÎÎÎÎÎÎÏÎÎ ÎÎ ÏÎ JHBuild (ÏÏÏÎÏ "
 "ÏÎ ÎÎÎÎÏÎÎÎ ÎÎÎ ÏÎÎ ÎÏÎÎÏÎÏÎ ÎÏÏÎÎÎÏ), ÎÎÏÎ ÎÎÎ ÏÎÎÏÎÏ HTTP URL ÏÏÎÏ ÎÎÎ "
-"ÎÎÏÏÎÏÎÎÎ ÎÎÎÏÎÎÏÎÎÏÎÎÎÎ ÎÎÎÎÎ ÎÏÎÏÏÎÎÏÏÎ. ÎÎ ÎÎÎÎÎÏ ÎÏÎÏÏÎÎÏÏÎ HTTP URL "
-"ÎÏÎÎÎÎÎÏÎÎÏÎÎ ÏÏÎÏÏÏÎÎÎ ÏÎÏÎÎÎ. ÎÎ ÎÎÎ ÎÏÎÏÏÎÎ ÎÎ ÏÎ ÎÎÎÎ ÏÎÎÎÎ ÏÏÎÏÏÎÎ ÏÎ "
-"ÏÎÏÎÏÏÏÏÎÏÎÏ ÎÏÏ ÎÎÎ ÎÎÎÎÎÏ ÎÏÎÏÏÎÎÏÏÎ, Î ÏÎÎÎÏÏÎÎÎ ÎÎÎÎÎ ÏÏÎ ÎÎÏÏÎ ÎÏÎÎ ÏÎÎ "
-"ÏÏÎÏÎÏÎÎÏÏÎÏÎ. ÎÎ ÎÎÎÎÎÏ ÎÏÎÏÏÎÎÏÏÎ ÏÎÏ ÏÎÏÎÏÎÎÏÎÎ ÎÎ ÏÎ JHBuild "
-"ÎÎÎÎÎÏÏÎÎÎÏÎÎ ÎÎÎ ÎÎ ÏÎÎÏÎÎÎÎÏÎ ÎÎ ÏÎÎ ÏÏÎÏÎÏÏÎ ÎÎÎÎÏÎ ÎÎÎÏÏÏÎÎÏ ÏÎÏ GNOME."
-
-#: C/jhbuild.xml:221(varname) C/jhbuild.xml:918(replaceable)
-#: C/jhbuild.xml:922(replaceable) C/jhbuild.xml:1571(varname)
-msgid "modules"
-msgstr "modules"
-
-#: C/jhbuild.xml:223(simpara) C/jhbuild.xml:1573(simpara)
+"ÎÎÏÏÎÏÎÎÎ ÎÎÎÏÎÎÏÎÎÏÎÎÎÎ ÎÎÎÎÎ ÎÎÎÏÎÏÏÎ. ÎÎ ÎÎÎÎÎÏ ÎÎÎÏÎÏÏÎ HTTP URL "
+"ÎÏÎÎÎÎÎÏÎÎÏÎÎ ÏÏÎÏÏÏÎÎÎ ÏÎÏÎÎÎ. ÎÎ ÎÎÎ ÎÎÏÏÎÏÎ ÎÎ ÏÎ ÎÎÎÎ ÏÎÎÎÎ ÏÏÎÏÏÎÎ ÏÎ "
+"ÏÎÏÎÏÏÏÏÎÏÎÏ ÎÏÏ ÎÎÎ ÎÎÎÎÎÏ ÎÎÎÏÎÏÏÎ, Î ÏÎÎÎÏÏÎÎÎ ÎÎÎÎÎ ÏÏÎ ÎÎÏÏÎ ÎÏÎÎ ÏÎÎ "
+"ÏÏÎÏÎÏÎÎÏÏÎÏÎ. ÎÎ ÎÎÎÎÎÏ ÎÎÎÏÎÏÏÎ ÏÎÏ ÏÎÏÎÏÎÎÏÎÎ ÎÎ ÏÎ JHBuild ÎÎÎÎÎÏÏÎÎÎÏÎÎ "
+"ÎÎÎ ÎÎ ÏÎÎÏÎÎÎÎÏÎ ÎÎ ÏÎÎ ÏÏÎÏÎÏÏÎ ÎÎÎÎÏÎ ÎÎÎÏÏÏÎÎÏ ÏÎÏ GNOME."
+
+#: C/index.docbook:204(varlistentry/term)
+msgid "<link linkend=\"cfg-modules\"><varname>modules</varname></link>"
+msgstr "<link linkend=\"cfg-modules\"><varname>modules</varname></link>"
+
+#: C/index.docbook:208(listitem/simpara)
+#: C/index.docbook:1877(listitem/simpara)
+#, fuzzy
+#| msgid ""
+#| "A list of strings specifying the modules to build. The list of modules "
+#| "actually built will be recursively expanded to include all the "
+#| "dependencies unless the <link linkend=\"command-reference-buildone"
+#| "\"><command>buildone</command></link> command is used. Defaults to "
+#| "<literal>['meta-gnome-desktop']</literal>."
 msgid ""
 "A list of strings specifying the modules to build. The list of modules "
 "actually built will be recursively expanded to include all the dependencies "
-"unless the <link linkend=\"command-reference-buildone\"><command>buildone</"
+"unless the <link linkend=\"command-reference-buildone\"> <command>buildone</"
 "command></link> command is used. Defaults to <literal>['meta-gnome-desktop']"
 "</literal>."
 msgstr ""
-"ÎÎÎ ÎÎÏÏÎ ÏÏÎÎÎÎÎÏÎÎÏÏÎ ÏÎÏ ÎÎÎÎÏÎÎÎÏÎ ÏÎ ÎÏÎÏÏÎÎÏÎ ÏÎÏ ÎÎ ÎÏÎÏÏÎÏÎ. Î ÎÎÏÏÎ "
+"ÎÎÎ ÎÎÏÏÎ ÏÏÎÎÎÎÎÏÎÎÏÏÎ ÏÎÏ ÎÎÎÎÏÎÎÎÏÎ ÏÎÏ ÎÎÏÏÎÏÎÏ ÏÎÏ ÎÎ ÎÏÎÏÏÎÏÎ. Î ÎÎÏÏÎ "
 "ÎÏÎÏÏÎÎÏÏÎ ÏÎÏ ÏÏÎÎÎÎÏÎÎÎ ÎÎ ÎÏÎÏÏÎÏÎ ÎÎ ÎÏÎÎÏÎÎÎÎ ÎÏÎÎÎÎÎ ÏÏÏÎ ÎÎ "
 "ÏÏÎÏÎÏÎÎÎÎÎÎÎÎÎ ÏÎÎÏ ÏÎÏ ÎÎÎÏÏÎÏÎÎÏ, ÎÎÏÏÏ ÎÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÎÎ Î ÎÎÏÎÎÎ "
 "<link linkend=\"command-reference-buildone\"><command>buildone</command></"
 "link>. Î ÏÏÎÎÏÎÎÎÎÎ ÎÎÎÎÎ <literal>['meta-gnome-desktop']</literal>."
 
-#: C/jhbuild.xml:234(varname) C/jhbuild.xml:1379(varname)
-msgid "checkoutroot"
-msgstr "checkoutroot"
+#: C/index.docbook:217(varlistentry/term)
+msgid ""
+"<link linkend=\"cfg-checkoutroot\"><varname>checkoutroot</varname></link>"
+msgstr ""
+"<link linkend=\"cfg-checkoutroot\"><varname>checkoutroot</varname></link>"
 
-#: C/jhbuild.xml:236(simpara)
+#: C/index.docbook:221(listitem/simpara)
+#, fuzzy
+#| msgid ""
+#| "A string specifying the directory to unpack source trees to. Unless <link "
+#| "linkend=\"cfg-buildroot\"><varname>buildroot</varname></link> is set, "
+#| "builds will occur in this directory too. Defaults to <filename>~/checkout/"
+#| "gnome2</filename>."
 msgid ""
 "A string specifying the directory to unpack source trees to. Unless <link "
-"linkend=\"cfg-buildroot\"><varname>buildroot</varname></link> is set, builds "
-"will occur in this directory too. Defaults to <filename>~/checkout/gnome2</"
-"filename>."
+"linkend=\"cfg-buildroot\"> <varname>buildroot</varname></link> is set, "
+"builds will occur in this directory too. Defaults to <filename>~/checkout/"
+"gnome</filename>."
 msgstr ""
 "ÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ Î ÎÏÎÎÎ ÎÎÎÎÏÎÎÎÎ ÏÎ ÏÎÎÎÎÎ ÏÏÎÎ ÎÏÎÎÎ ÎÎ ÎÎÏÎÎÎÏÎÏÎÏÏÎÏÎ "
 "ÏÎ ÎÎÎÎÏÎ ÎÏÎÎÎÎ. ÎÎÏÏÏ ÎÎÎ ÎÎ ÎÎÎÎÎ ÎÏÎÏÎÎÎÎ Î <link linkend=\"cfg-buildroot"
 "\"><varname>buildroot</varname></link>, ÏÎ ÎÏÎÏÎÎÎÏÎ ÎÎ ÎÎÎÎÎÏÎÎ ÎÎÎ ÏÎ ÎÏÏÏ "
 "ÏÎ ÏÎÎÎÎÎ. Î ÏÏÎÎÏÎÎÎÎÎ ÎÎÎÎÎ <filename>~/checkout/gnome2</filename>."
 
-#: C/jhbuild.xml:244(varname) C/jhbuild.xml:1665(varname)
-msgid "prefix"
-msgstr "prefix"
+#: C/index.docbook:229(varlistentry/term)
+msgid "<link linkend=\"cfg-prefix\"><varname>prefix</varname></link>"
+msgstr "<link linkend=\"cfg-prefix\"><varname>prefix</varname></link>"
 
-#: C/jhbuild.xml:246(simpara) C/jhbuild.xml:1667(simpara)
+#: C/index.docbook:233(listitem/simpara)
+#: C/index.docbook:2008(listitem/simpara)
+#, fuzzy
+#| msgid ""
+#| "A string specifying the prefix to install modules to. This directory must "
+#| "be writable. Defaults to <literal>'/opt/gnome2'</literal>."
 msgid ""
-"A string specifying the prefix to install modules to. This directory must be "
-"writable. Defaults to <literal>'/opt/gnome2'</literal>."
+"A string specifying the prefix to install modules to. <varname>prefix</"
+"varname> must be an absolute path. This directory must be writable. Defaults "
+"to <literal>'/opt/gnome'</literal>."
 msgstr ""
-"ÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ Î ÎÏÎÎÎ ÎÎÎÎÏÎÎÎÎ ÏÎ ÏÏÏÎÎÎÎ ÏÏÎ ÎÏÎÎÎ ÎÎ ÎÎÎÎÎÎÏÏÎÏÎÏÎÎ ÏÎ "
-"ÎÏÎÏÏÎÎÏÎ. ÎÏÏÏÏ Î ÏÎÎÎÎÎÏ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÎÎÎÏÎÏÎÎÎÏ. Î ÏÏÎÎÏÎÎÎÎÎ ÎÎÎÎÎ "
+"ÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ Î ÎÏÎÎÎ ÎÎÎÎÏÎÎÎÎ ÏÎ ÏÏÏÎÎÎÎ ÏÏÎ ÎÏÎÎÎ ÎÎ ÎÎÎÎÎÎÏÏÎÏÎÏÎÎ ÎÎ "
+"ÎÎÏÏÎÏÎÏ. ÎÏÏÏÏ Î ÏÎÎÎÎÎÏ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÎÎÎÏÎÏÎÎÎÏ. Î ÏÏÎÎÏÎÎÎÎÎ ÎÎÎÎÎ "
 "<literal>'/opt/gnome2'</literal>."
 
-#: C/jhbuild.xml:252(varname) C/jhbuild.xml:1300(varname)
-msgid "autogenargs"
-msgstr "autogenargs"
+#: C/index.docbook:240(varlistentry/term)
+msgid "<link linkend=\"cfg-autogenargs\"><varname>autogenargs</varname></link>"
+msgstr ""
+"<link linkend=\"cfg-autogenargs\"><varname>autogenargs</varname></link>"
 
-#: C/jhbuild.xml:254(simpara)
+#: C/index.docbook:244(listitem/simpara)
+#, fuzzy
+#| msgid ""
+#| "A string containing arguments passed to the <command>autogen.sh</command> "
+#| "script of all modules. Can be overridden for particular modules using the "
+#| "<link linkend=\"cfg-module-autogenargs\"><varname>module_autogenargs</"
+#| "varname></link> dictionary."
 msgid ""
 "A string containing arguments passed to the <command>autogen.sh</command> "
 "script of all modules. Can be overridden for particular modules using the "
-"<link linkend=\"cfg-module-autogenargs\"><varname>module_autogenargs</"
+"<link linkend=\"cfg-module-autogenargs\"> <varname>module_autogenargs</"
 "varname></link> dictionary."
 msgstr ""
 "ÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ Î ÎÏÎÎÎ ÏÎÏÎÎÏÎÎ ÎÏÎÏÎÎÏÎ ÏÎ ÎÏÎÎÎ ÏÎÏÎÎÏÎ ÏÏÎ ÏÎÎÎÏÎÎ "
 "ÎÎÏÎÎÏÎ <command>autogen.sh</command> ÏÎÏÎ ÏÏÎ ÎÏÎÏÏÎÎÏÏÎ. ÎÏÎÏÎÎ ÎÎ "
-"ÏÎÏÎÎÎÎÏÎÎÎ ÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎ ÎÏÎÏÏÎÎÏÎ ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ ÎÎÎÎÎÏ <link "
+"ÏÎÏÎÎÎÎÏÎÎÎ ÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎÏ ÎÎÏÏÎÏÎÏ ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ ÎÎÎÎÎÏ <link "
 "linkend=\"cfg-module-autogenargs\"><varname>module_autogenargs</varname></"
 "link>."
 
-#: C/jhbuild.xml:263(varname) C/jhbuild.xml:1450(varname)
-msgid "makeargs"
-msgstr "makeargs"
+#: C/index.docbook:252(varlistentry/term)
+msgid "<link linkend=\"cfg-makeargs\"><varname>makeargs</varname></link>"
+msgstr "<link linkend=\"cfg-makeargs\"><varname>makeargs</varname></link>"
 
-#: C/jhbuild.xml:265(simpara) C/jhbuild.xml:1452(simpara)
+#: C/index.docbook:256(listitem/simpara)
+#: C/index.docbook:1739(listitem/simpara)
+#, fuzzy
+#| msgid ""
+#| "A string listing additional arguments to be passed to <command>make</"
+#| "command>. Defaults to <literal>''</literal>."
 msgid ""
 "A string listing additional arguments to be passed to <command>make</"
-"command>. Defaults to <literal>''</literal>."
+"command>. JHBuild will automatically append the parallel execution option "
+"(<option>-j</option>) based upon available CPU cores. Defaults to "
+"<literal>''</literal>."
 msgstr ""
 "ÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ ÎÎ ÎÏÎÏÏÏÏÎÎÏÎ ÎÏÎÏÎÎÏÎ ÏÎÏ ÎÎ ÏÎÏÎÏÏÎÏÎ ÏÏÎ <command>make</"
 "command>. Î ÏÏÎÎÏÎÎÎÎÎ ÎÎÎÎÎ <literal>''</literal>."
 
-#: C/jhbuild.xml:274(title)
+#: C/index.docbook:266(section/title)
 msgid "Build Prerequisites"
 msgstr "ÎÏÎÎÏÎÎÏÎÏÎÎÎÎ ÎÎÎ ÏÎ ÎÏÎÏÎÎÎ"
 
-#: C/jhbuild.xml:276(para)
+#: C/index.docbook:268(section/para)
+#, fuzzy
+#| msgid ""
+#| "Before any modules can be built, it is necessary to have certain build "
+#| "tools installed. Common build tools include the GNU Autotools "
+#| "(<application>autoconf</application>, <application>automake</"
+#| "application>, <application>libtool</application> and "
+#| "<application>gettext</application>), The GNU Toolchain "
+#| "(<application>binutils</application>, <application>gcc</application>, "
+#| "<application>g++</application>), pkg-config and Python, depending on "
+#| "which modules will be built."
 msgid ""
 "Before any modules can be built, it is necessary to have certain build tools "
 "installed. Common build tools include the GNU Autotools "
 "(<application>autoconf</application>, <application>automake</application>, "
 "<application>libtool</application> and <application>gettext</application>), "
 "The GNU Toolchain (<application>binutils</application>, <application>gcc</"
-"application>, <application>g++</application>), pkg-config and Python, "
+"application>, <application>g++</application>), make, pkg-config and Python, "
 "depending on which modules will be built."
 msgstr ""
-"ÎÏÎÏÎÏ ÎÏÎÏÎÏÎ ÎÎ ÎÏÎÏÏÎÏÎ ÎÏÎÎÎÎÎÏÎÏÎ ÎÏÎÏÏÎÎÏÎ, ÎÎÎÎÎ ÎÎÎÎÎÎÎÎ ÎÎ ÎÎÎÎÎ "
+"ÎÏÎÏÎÏ ÎÏÎÏÎÏÎ ÎÎ ÎÏÎÏÏÎÏÎ ÎÏÎÎÎÎÎÏÎÏÎ ÎÎÏÏÎÏÎÏ, ÎÎÎÎÎ ÎÎÎÎÎÎÎÎ ÎÎ ÎÎÎÎÎ "
 "ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÎÏÎÎÎ ÎÏÎÎÎÎÎÎ ÎÏÎÏÎÎÎÏÎÏ. ÎÎ ÎÎÎÎÎ ÎÏÎÎÎÎÎÎ ÎÏÎÏÎÎÎÏÎÏ "
 "ÏÎÏÎÎÎÎÎÎÎÎÏÎ ÏÎ GNU Autotools (<application>autoconf</application>, "
 "<application>automake</application>, <application>libtool</application> ÎÎÎ "
@@ -554,7 +550,7 @@ msgstr ""
 "<application>g++</application>), ÏÎ pkg-config ÎÎÎ ÏÎÎ Python, ÎÎÎÎÎÎÎ ÎÎ ÏÎ "
 "ÏÎÎÎ ÎÏÎÏÏÎÎÏÎ ÎÎ ÎÏÎÏÏÎÏÎ."
 
-#: C/jhbuild.xml:287(para)
+#: C/index.docbook:277(section/para)
 msgid ""
 "JHBuild can check the tools are installed using the <command>sanitycheck</"
 "command> command:"
@@ -562,26 +558,27 @@ msgstr ""
 "ÎÎ JHBuild ÎÏÎÏÎÎ ÎÎ ÎÎÎÎÎÎÎ ÎÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÏÏÎ ÏÎ ÎÏÎÎÎÎÎÎ "
 "ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎÎ ÎÎÏÎÎÎ <command>sanitycheck</command>:"
 
-#: C/jhbuild.xml:290(userinput) C/jhbuild.xml:1110(command)
+#: C/index.docbook:280(section/screen)
 #, no-wrap
-msgid "jhbuild sanitycheck"
-msgstr "jhbuild sanitycheck"
-
-#: C/jhbuild.xml:292(para)
-msgid ""
-"If this command displays any messages, the errors can be fixed in one of two "
-"ways:"
-msgstr ""
-"ÎÎ ÎÏÏÎ Î ÎÎÏÎÎÎ ÎÎÏÎÎÎÏÎÎ ÎÏÎÎÎÎÎÏÎÏÎ ÎÎÎÏÎÎÏÎ, ÏÎ ÏÏÎÎÎÎÏÎ ÎÏÎÏÎÏÎ ÎÎ "
-"ÎÎÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎ ÎÏÏ ÏÎÏÏ ÎÎÎÏ ÎÏÎ ÏÏÏÏÎÏÏ:"
-
-#: C/jhbuild.xml:297(simpara)
-msgid ""
-"Install the required package from your distribution's repository. A list of "
-"<ulink url=\"http://live.gnome.org/JhbuildDependencies\";>package names</"
-"ulink> for different distributions is maintained on the GNOME wiki. Run the "
-"<command>sanitycheck</command> command again after installing the "
-"distribution's packages to ensure the required tools are present."
+msgid "<prompt>$</prompt> <userinput>jhbuild sanitycheck</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild sanitycheck</userinput>"
+
+#: C/index.docbook:282(section/para)
+#, fuzzy
+#| msgid ""
+#| "Install the required package from your distribution's repository. A list "
+#| "of <ulink url=\"http://live.gnome.org/JhbuildDependencies\";>package "
+#| "names</ulink> for different distributions is maintained on the GNOME "
+#| "wiki. Run the <command>sanitycheck</command> command again after "
+#| "installing the distribution's packages to ensure the required tools are "
+#| "present."
+msgid ""
+"If this command displays any messages, please install the required package "
+"from your distribution's repository. A list of <ulink url=\"http://live.";
+"gnome.org/JhbuildDependencies\">package names </ulink> for different "
+"distributions is maintained on the GNOME wiki. Run the <command>sanitycheck</"
+"command> command again after installing the distribution's packages to "
+"ensure the required tools are present."
 msgstr ""
 "ÎÎÎÎÏÎÏÏÎÏÏÎ ÏÎ ÎÏÎÎÏÎÏÎÎÎÎ ÏÎÎÎÏÎ ÎÏÏ ÏÎ ÎÏÎÎÎÏÎÏÎÎ ÏÎÏ ÎÎÎÎÎÎÎÏ ÏÎÏ. ÎÎÎ "
 "ÎÎÏÏÎ ÎÏÏ <ulink url=\"http://live.gnome.org/JhbuildDependencies\";>ÎÎÏÎÎÏÎ "
@@ -590,69 +587,32 @@ msgstr ""
 "ÎÎÎÎÏÎÏÏÎÏÎ ÏÏÎ ÏÎÎÎÏÏÎ ÏÎÏ ÎÎÎÎÎÎÎÏ ÎÎÎ ÎÎ ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÏÎ ÎÏÎÎÏÎÏÎÎÎÎ "
 "ÎÏÎÎÎÎÎÎ ÎÎÎÎÎ ÏÎÏÏÎÏÎ."
 
-#: C/jhbuild.xml:306(simpara)
-msgid ""
-"Run the <command>bootstrap</command> command to download, build and install "
-"the build prerequisites:"
-msgstr ""
-"ÎÎÏÎÎÎÏÏÎ ÏÎÎ ÎÎÏÎÎÎ <command>bootstrap</command> ÎÎÎ ÎÎ ÎÎÏÎÎÎÏÎÏÎ, ÎÎ "
-"ÎÏÎÏÎÏÎ ÎÎÎ ÎÎ ÎÎÎÎÏÎÏÏÎÏÎÏÎ ÏÎ ÏÏÎÎÏÎÎÏÎÏÎÎÎÎ ÎÎÎ ÏÎ ÎÏÎÏÎÎÎ:"
-
-#: C/jhbuild.xml:308(userinput) C/jhbuild.xml:596(command)
-#, no-wrap
-msgid "jhbuild bootstrap"
-msgstr "jhbuild bootstrap"
-
-#: C/jhbuild.xml:309(para)
-msgid ""
-"When complete, run the <command>sanitycheck</command> command to verify the "
-"required tools are present."
-msgstr ""
-"ÎÏÎÎ ÎÎÎÎÎÎÏÏÎÎÎ, ÎÎÏÎÎÎÏÏÎ ÏÎÎ ÎÎÏÎÎÎ <command>sanitycheck</command> ÎÎÎ ÎÎ "
-"ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÏÎ ÎÏÎÏÎÎÏÎÏÎ ÎÏÎÎÎÎÎÎ ÎÎÎÎÎ ÏÎÏÏÎÏÎ."
-
-#: C/jhbuild.xml:314(para)
-msgid ""
-"The <command>bootstrap</command> command does not build all the package "
-"dependencies required by the build tools. If your distribution does not "
-"provide the required packages, they will need to be built outside of the "
-"JHBuild environment."
-msgstr ""
-"Î ÎÎÏÎÎÎ <command>bootstrap</command> ÎÎ ÎÏÎÎÎÎ ÏÎÎÏ ÏÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÎÎÎÏÏÎ "
-"ÏÎÏ ÎÏÎÎÏÎÏÎÏÎÎ ÎÏÏ ÏÎ ÎÏÎÎÎÎÎÎ ÎÏÎÏÎÎÎÏÎÏ. ÎÎ Î ÎÎÎÎÎÎÎ ÏÎÏ ÎÎÎ ÏÎÏÎÏÎÎ ÏÎ "
-"ÎÏÎÏÎÎÏÎÏÎ ÏÎÎÎÏÎ, ÎÎ ÏÏÎÏÎÎ ÎÎ ÎÏÎÏÏÎÏÎ ÎÎÏ ÎÏÏ ÏÎ ÏÎÏÎÎÎÎÎÎÎ ÏÎÏ JHBuild."
-
-#: C/jhbuild.xml:320(para)
-msgid ""
-"The build tools dependencies include <application>m4</application>, "
-"<application>perl</application> and a C compiler (for example, "
-"<application>gcc</application>)."
-msgstr ""
-"ÎÎ ÎÎÎÏÏÎÏÎÎÏ ÏÏÎ ÎÏÎÎÎÎÎÏÎ ÎÏÎÏÎÎÎÏÎÏ ÏÎÏÎÎÎÎÎÎÎÎÏÎ ÏÎ <application>m4</"
-"application>, <application>perl</application> ÎÎÎ ÎÎÎÎ ÎÎÏÎÎÎÏÏÏÎÏÏÎ C (ÎÎÎ "
-"ÏÎÏÎÎÎÎÎÎÎ ÏÎÎ <application>gcc</application>)."
-
-#: C/jhbuild.xml:331(title)
+#: C/index.docbook:292(section/title)
 msgid "Using JHBuild"
 msgstr "ÎÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ JHBuild"
 
-#: C/jhbuild.xml:333(para)
+#: C/index.docbook:294(section/para)
+#, fuzzy
+#| msgid ""
+#| "After set up is complete, JHBuild can be used to build software. To build "
+#| "all the modules selected in the <filename>~/.jhbuildrc</filename> file, "
+#| "run the following command:"
 msgid ""
 "After set up is complete, JHBuild can be used to build software. To build "
-"all the modules selected in the <filename>~/.jhbuildrc</filename> file, run "
-"the following command:"
+"all the modules selected in the <filename>~/.config/jhbuildrc</filename> "
+"file, run the following command:"
 msgstr ""
 "ÎÎÏÎ ÏÎÏ ÎÎ ÎÏÎÎ ÎÎÎÎÎÎÏÏÎÎÎ Î ÎÎÎÎÏÎÏÏÎÏÎ, ÏÎ JHBuild ÎÎ ÎÏÎÏÎÎ ÎÎ "
-"ÏÏÎÏÎÎÎÏÎÎÎÎÎÎ ÎÎÎ ÏÎ ÎÏÎÏÎÎÎ ÎÎÎÎÏÎÎÎÎÏ. ÎÎÎ ÎÎ ÎÏÎÏÎÏÎ ÏÎÎ ÏÎ ÎÏÎÏÏÎÎÏÎ "
+"ÏÏÎÏÎÎÎÏÎÎÎÎÎÎ ÎÎÎ ÏÎ ÎÏÎÏÎÎÎ ÎÎÎÎÏÎÎÎÎÏ. ÎÎÎ ÎÎ ÎÏÎÏÎÏÎ ÏÎÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏ "
 "ÏÎÏ ÎÎÎÎÎ ÎÏÎÎÎÎÎÎÎÎ ÏÏÎ ÎÏÏÎÎÎ <filename>~/.jhbuildrc</filename>, ÎÎÏÎÎÎÏÏÎ "
 "ÏÎÎ ÎÎÏÎÎÏÎÎ ÎÎÏÎÎÎ:"
 
-#: C/jhbuild.xml:337(userinput) C/jhbuild.xml:616(command)
-#, no-wrap
-msgid "jhbuild build"
-msgstr "jhbuild build"
+#: C/index.docbook:299(section/screen)
+#, fuzzy, no-wrap
+msgid "<prompt>$</prompt> <userinput>jhbuild build</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild build</userinput>"
 
-#: C/jhbuild.xml:339(para)
+#: C/index.docbook:301(section/para)
 msgid ""
 "JHBuild will download, configure, compile and install each of the modules. "
 "If an error occurs at any stage, JHBuild will present a menu asking what to "
@@ -661,29 +621,36 @@ msgid ""
 "continue."
 msgstr ""
 "ÎÎ JHBuild ÎÎ ÎÎÏÎÎÎÏÎÎ, ÎÎ ÏÏÎÎÎÏÎÎ, ÎÎ ÎÎÏÎÎÎÏÏÏÎÏÎÎ ÎÎÎ ÎÎ ÎÎÎÎÏÎÏÏÎÏÎÎ "
-"ÎÎÎÎ ÎÎÎ ÎÏÏ ÏÎ ÎÏÎÏÏÎÎÏÎ. ÎÎ ÏÏÎÎÎÎ ÎÎÏÎÎÎ ÏÏÎÎÎÎ ÏÎ ÎÏÎÎÎÎÎÏÎÏÎ ÏÏÎÎÎÎ, ÏÎ "
+"ÎÎÎÎ ÎÎÎ ÎÏÏ ÏÎÏ ÎÎÏÏÎÏÎÏ. ÎÎ ÏÏÎÎÎÎ ÎÎÏÎÎÎ ÏÏÎÎÎÎ ÏÎ ÎÏÎÎÎÎÎÏÎÏÎ ÏÏÎÎÎÎ, ÏÎ "
 "JHBuild ÎÎ ÏÎÏÎÏÏÎÎÏÎÎ ÎÎÎ ÎÎÎÎÏ ÎÎÎ ÎÎ ÏÎÏ ÏÏÏÎÏÎÎ ÏÎ ÎÎ ÎÎÎÎÎ. ÎÎ ÎÏÎÎÎÎÎÏ "
 "ÏÎÏÎÎÎÎÎÎÎÎÏÎ ÏÎ ÎÎÏÎÎÎÏÎ ÏÎ ÎÎÎ ÎÎÎÏÏÎÏ ÎÎÎ ÎÎ ÎÎÎÏÎÏÏÎÏÎ ÏÎ ÏÏÎÎÎÎ, ÏÎ "
-"ÏÏÎÎÎÎÎ ÏÎÏ ÎÏÎÏÎÎÎÏÎÏ ÎÎÎÎ ÎÏÏ ÎÎÎÏÎÏÎ ÏÏÎÎÎÎ, ÏÎÎ ÏÎÏÎÎÎÎÏÎ ÎÎÏÏ "
-"ÎÏÎÏÏÎÎÏÎÏ, Î ÏÎÎ ÎÎÎÏÎÏÎ ÏÎÏ ÏÏÎÎÎÎÏÎÏ ÎÎÎ ÏÎ ÏÏÎÎÏÎÎÎ."
+"ÏÏÎÎÎÎÎ ÏÎÏ ÎÏÎÏÎÎÎÏÎÏ ÎÎÎÎ ÎÏÏ ÎÎÎÏÎÏÎ ÏÏÎÎÎÎ, ÏÎÎ ÏÎÏÎÎÎÎÏÎ ÎÎÎÏ ÎÎÏÏÎÏÎÏ, "
+"Î ÏÎÎ ÏÎÏÎÎÎÏÎ ÏÎÏ ÏÏÎÎÎÎÏÎÏ ÎÎÎ ÏÎ ÏÏÎÎÏÎÎÎ."
 
-#: C/jhbuild.xml:346(simpara)
+#: C/index.docbook:308(note/simpara)
 msgid ""
 "Giving up on a module will cause any modules depending on the module to fail."
 msgstr ""
-"Î ÎÎÎÏÎÏÎ ÎÎÏÏ ÎÏÎÏÏÎÎÏÎÏ ÎÎ ÎÎÎÎÎÏÎÎ ÏÏÎÎ ÎÏÎÏÏÏÎÎ ÎÎÎ ÏÏÏÎ ÎÏÎÏÏÎÎÏÏÎ "
-"ÎÎÎÏÏÎÏÎÏÎÎ ÎÏÏ ÎÏÏÏ."
+"Î ÎÎÎÏÎÏÎ ÎÎÎÏ ÎÎÏÏÎÏÎÏ ÎÎ ÎÎÎÎÎÏÎÎ ÏÏÎÎ ÎÏÎÏÏÏÎÎ ÎÎÎ ÏÏÏÎ ÎÎÎÏÎÏÏÎ "
+"ÎÎÎÏÏÎÎÏÎÏÎÎ ÎÏÏ ÎÏÏÎ."
 
-#: C/jhbuild.xml:349(para)
+#: C/index.docbook:312(section/para)
 msgid "Below is an example of the menu displayed:"
 msgstr "ÎÎÎÎÎÏÎÎÎ ÎÎÎ ÏÎÏÎÎÎÎÎÎÎ ÏÎÏ ÎÎÎÎÏ ÏÎÏ ÎÎÏÎÎÎÎÎÏÎÎ:"
 
-#: C/jhbuild.xml:359(prompt)
-msgid "choice:"
-msgstr "ÎÏÎÎÎÎÎ:"
-
-#: C/jhbuild.xml:350(screen)
-#, no-wrap
+#: C/index.docbook:314(section/screen)
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  [1] Rerun phase build\n"
+#| "  [2] Ignore error and continue to install\n"
+#| "  [3] Give up on module\n"
+#| "  [4] Start shell\n"
+#| "  [5] Reload configuration\n"
+#| "  [6] Go to phase \"wipe directory and start over\"\n"
+#| "  [7] Go to phase \"configure\"\n"
+#| "  [8] Go to phase \"clean\"\n"
+#| "  [9] Go to phase \"distclean\"\n"
+#| "<placeholder-1/> "
 msgid ""
 "  [1] Rerun phase build\n"
 "  [2] Ignore error and continue to install\n"
@@ -694,7 +661,7 @@ msgid ""
 "  [7] Go to phase \"configure\"\n"
 "  [8] Go to phase \"clean\"\n"
 "  [9] Go to phase \"distclean\"\n"
-"<placeholder-1/> "
+"<prompt>choice:</prompt> "
 msgstr ""
 "  [1] ÎÏÎÎÎÎÎÏÎ ÏÎÏÎÏ ÎÏÎÏÎÎÎÏÎÏ\n"
 "  [2] ÎÎÎÏÎÏÎ ÏÏÎÎÎÎÏÎÏ ÎÎÎ ÏÏÎÎÏÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎÏ\n"
@@ -705,84 +672,97 @@ msgstr ""
 "  [7] ÎÎÏÎÎÎÏÎ ÏÏÎ ÏÎÏÎ \"ÏÏÎÎÎÏÎ\"\n"
 "  [8] ÎÎÏÎÎÎÏÎ ÏÏÎ ÏÎÏÎ \"ÎÎÎÎÏÎÏÎÏÏ\"\n"
 "  [9] ÎÎÏÎÎÎÏÎ ÏÏÎ ÏÎÏÎ \"distclean\"\n"
-"<placeholder-1/> "
+"<prompt>choice:</prompt> "
 
-#: C/jhbuild.xml:361(para)
+#: C/index.docbook:325(section/para)
 msgid ""
 "It is also possible to build a different set of modules and their "
 "dependencies by passing the module names as arguments to the <command>build</"
 "command> command. For example, to build gtk+:"
 msgstr ""
-"ÎÎÎÎÎ ÎÏÎÏÎÏ ÎÏÎÎÏÏ ÏÎ ÎÏÎÏÎÎÎ ÎÎÎÏ ÎÎÎÏÎÏÎÏÎÎÎÏ ÎÎÎÎÎÏ ÎÏÎÏÏÎÎÏÏÎ ÎÎÎ ÏÏÎ "
-"ÎÎÎÏÏÎÏÎÏÎ ÏÎÏÏ ÏÎÏÎÏÎÏÎÏ ÏÎ ÎÎÏÎÎÏÎ ÏÏÎ ÎÏÎÏÏÎÎÏÏÎ ÏÏÎÎ ÎÎÏÎÎÎ "
+"ÎÎÎÎÎ ÎÏÎÏÎÏ ÎÏÎÎÏÏ ÏÎ ÎÏÎÏÎÎÎ ÎÎÎÏ ÎÎÎÏÎÏÎÏÎÎÎÏ ÎÎÎÎÎÏ ÎÎÎÏÎÏÏÎ ÎÎÎ ÏÏÎ "
+"ÎÎÎÏÏÎÏÎÏÎ ÏÎÏÏ ÏÎÏÎÏÎÏÎÏ ÏÎ ÎÎÏÎÎÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ ÏÏÎÎ ÎÎÏÎÎÎ "
 "<command>build</command> command. ÎÎÎ ÏÎÏÎÎÎÎÎÎÎ, ÎÎÎ ÎÎ ÎÏÎÏÎÏÎ ÏÎ gtk+:"
 
-#: C/jhbuild.xml:366(userinput)
+#: C/index.docbook:329(section/screen)
 #, no-wrap
-msgid "jhbuild build gtk+"
-msgstr "jhbuild build gtk+"
+msgid "<prompt>$</prompt> <userinput>jhbuild build gtk+</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild build gtk+</userinput>"
 
-#: C/jhbuild.xml:368(para)
+#: C/index.docbook:331(section/para) C/index.docbook:352(section/para)
 msgid ""
 "If JHBuild is cancelled part way through a build, it is possible to resume "
 "the build at a particular module using the <option>--start-at</option> "
 "option:"
 msgstr ""
 "ÎÎ ÏÎ JHBuild ÎÎÏÏÏÎÎÎ ÎÎÏÎ ÏÎ ÎÎÎÏÎÎÎÎ ÎÎÏÏ ÎÏÎÏÎÎÎÏÎÏ, ÎÎÎÎÎ ÎÏÎÎÏÎ Î "
-"ÏÏÎÎÏÎÏÎ ÏÎÏ ÎÏÎÏÎÎÎÏÎÏ ÎÏÏ ÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎ ÎÏÎÏÏÎÎ ÎÎ ÏÏÎÏÎ ÏÎÏ ÎÏÎÎÎÎÎÏ "
+"ÏÏÎÎÏÎÏÎ ÏÎÏ ÎÏÎÏÎÎÎÏÎÏ ÎÏÏ ÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎ ÎÎÏÏÎÏÎ ÎÎ ÏÏÎÏÎ ÏÎÏ ÎÏÎÎÎÎÎÏ "
 "<option>--start-at</option>:"
 
-#: C/jhbuild.xml:372(userinput)
+#: C/index.docbook:335(section/screen)
 #, no-wrap
-msgid "jhbuild build --start-at=pango"
-msgstr "jhbuild build --start-at=pango"
+msgid "<prompt>$</prompt> <userinput>jhbuild build --start-at=pango</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild build --start-at=pango</userinput>"
 
-#: C/jhbuild.xml:374(para)
+#: C/index.docbook:337(section/para)
 msgid ""
 "To build one or more modules, ignoring their dependencies, JHBuild provides "
 "the <command>buildone</command> command. For the <command>buildone</command> "
 "command to complete successfully, all dependencies must be previously built "
 "and installed or provided by distribution packages."
 msgstr ""
-"ÎÎÎ ÎÎ ÎÏÎÏÎÏÎ ÎÎÎ Î ÏÎÏÎÏÏÏÏÎÏÎ ÎÏÎÏÏÎÎÏÎ, ÎÎÎÎÏÎÏÎÏ ÏÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÎÏÏ, "
+"ÎÎÎ ÎÎ ÎÏÎÏÎÏÎ ÎÎÎ Î ÏÎÏÎÏÏÏÏÎÏÎÏ ÎÎÏÏÎÏÎÏ, ÎÎÎÎÏÎÏÎÏ ÏÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÎÏÏ, "
 "ÏÎ JHBuild ÏÎÏÎÏÎÎ ÏÎÎ ÎÎÏÎÎÎ <command>buildone</command>. ÎÎÎ ÎÎ "
 "ÎÎÎÎÎÎÏÏÎÎÎ ÎÎ ÎÏÎÏÏÏÎÎ Î ÎÎÏÎÎÎ <command>buildone</command>, ÏÎÎÏ ÎÎ "
 "ÎÎÎÏÏÎÏÎÎÏ ÏÏÎÏÎÎ ÎÎ ÎÏÎÏÎ ÎÏÎÏÏÎÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎ ÎÏÏ ÏÏÎÎ, Î ÎÎ "
 "ÏÎÏÎÏÎÎÏÎÎ ÎÏÏ ÏÎÎÎÏÎ ÏÎÏ ÎÎÎÎÎÎÎÏ."
 
-#: C/jhbuild.xml:380(userinput)
+#: C/index.docbook:343(section/screen)
+#, no-wrap
+msgid "<prompt>$</prompt> <userinput>jhbuild buildone gtk+</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild buildone gtk+</userinput>"
+
+#: C/index.docbook:345(section/para)
+msgid ""
+"When actively developing a module, you are likely in a source working "
+"directory. The <command>make</command> will invoke the build system and "
+"install the module. This will be a key part of your edit-compile-install-"
+"test cycle."
+msgstr ""
+
+#: C/index.docbook:350(section/screen)
 #, no-wrap
-msgid "jhbuild buildone gtk+"
-msgstr "jhbuild buildone gtk+"
+msgid "<prompt>$</prompt> <userinput>jhbuild make</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild make</userinput>"
 
-#: C/jhbuild.xml:382(para)
+#: C/index.docbook:356(section/para)
 msgid ""
 "To get a list of the modules and dependencies JHBuild will build, and the "
 "order they will be built, use the <command>list</command> command:"
 msgstr ""
-"ÎÎÎ ÎÎ ÎÎÎÎÏÎ ÎÎÎ ÎÎÏÏÎ ÎÎ ÏÎ ÎÏÎÏÏÎÎÏÎ ÎÎÎ ÏÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÎÏ ÎÎ ÎÏÎÏÎÎ ÏÎ "
+"ÎÎÎ ÎÎ ÎÎÎÎÏÎ ÎÎÎ ÎÎÏÏÎ ÎÎ ÏÎÏ ÎÎÏÏÎÏÎÏ ÎÎÎ ÏÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÎÏ ÎÎ ÎÏÎÏÎÎ ÏÎ "
 "JHBuild, ÎÎÎ ÏÎ ÏÎÎÏÎ ÎÎ ÏÎÎ ÎÏÎÎÎ ÎÎ ÎÏÎÏÏÎÏÎ, ÏÏÎÏÎÎÎÏÎÎÎÏÏÎ ÏÎÎ ÎÎÏÎÎÎ "
 "<command>list</command>:"
 
-#: C/jhbuild.xml:386(userinput) C/jhbuild.xml:982(command)
+#: C/index.docbook:360(section/screen)
 #, no-wrap
-msgid "jhbuild list"
-msgstr "jhbuild list"
+msgid "<prompt>$</prompt> <userinput>jhbuild list</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild list</userinput>"
 
-#: C/jhbuild.xml:388(para)
+#: C/index.docbook:362(section/para)
 msgid ""
 "To get information about a particular module, use the <command>info</"
 "command> command:"
 msgstr ""
-"ÎÎÎ ÎÎ ÎÎÎÎÏÎ ÏÎÎÏÎÏÎÏÎÎÏ ÎÎÎ ÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎ ÎÏÎÏÏÎÎ, ÏÏÎÏÎÎÎÏÎÎÎÏÏÎ ÏÎÎ "
+"ÎÎÎ ÎÎ ÎÎÎÎÏÎ ÏÎÎÏÎÏÎÏÎÎÏ ÎÎÎ ÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎ ÎÎÏÏÎÏÎ, ÏÏÎÏÎÎÎÏÎÎÎÏÏÎ ÏÎÎ "
 "ÎÎÏÎÎÎ <command>info</command>:"
 
-#: C/jhbuild.xml:391(userinput)
+#: C/index.docbook:365(section/screen)
 #, no-wrap
-msgid "jhbuild info gtk+"
-msgstr "jhbuild info gtk+"
+msgid "<prompt>$</prompt> <userinput>jhbuild info gtk+</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild info gtk+</userinput>"
 
-#: C/jhbuild.xml:393(para)
+#: C/index.docbook:367(section/para)
 msgid ""
 "To download or update all the software sources without building, use the "
 "<command>update</command> command. The <command>update</command> command "
@@ -795,12 +775,12 @@ msgstr ""
 "ÏÏÎÎ ÏÎ ÎÏÎÏÎÎÎ ÎÎÎ ÎÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÏÎÏÎÎÎ ÎÎ ÏÎÎÎÎÎÎÎ ÏÎ ÎÏÏÎÏ ÎÏÎÎÏ ÏÎÏ "
 "ÏÏÎÎÎÏÎÏ ÏÎÏ ÏÏÎ ÎÎÎÎÎÎÏÏÎ."
 
-#: C/jhbuild.xml:399(userinput) C/jhbuild.xml:1218(command)
+#: C/index.docbook:372(section/screen)
 #, no-wrap
-msgid "jhbuild update"
-msgstr "jhbuild update"
+msgid "<prompt>$</prompt> <userinput>jhbuild update</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild update</userinput>"
 
-#: C/jhbuild.xml:401(para)
+#: C/index.docbook:374(section/para)
 msgid ""
 "Later, JHBuild can build everything without downloading or updating the "
 "sources:"
@@ -808,42 +788,316 @@ msgstr ""
 "ÎÏÎÏÏÎÏÎ, ÏÎ JHBuild ÎÎ ÎÏÎÏÎÎ ÎÎ ÎÏÎÏÎÎ ÏÎ ÏÎÎÏÎ ÏÏÏÎÏ ÎÎ ÎÎÏÎÎÎÏÎÎ Î ÎÎ "
 "ÎÎÎÎÎÏÏÏÎÎ ÏÎÏ ÏÎÎÎÏ:"
 
-#: C/jhbuild.xml:404(userinput)
+#: C/index.docbook:377(section/screen)
 #, no-wrap
-msgid "jhbuild build --no-network"
-msgstr "jhbuild build --no-network"
+msgid "<prompt>$</prompt> <userinput>jhbuild build --no-network</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild build --no-network</userinput>"
 
-#: C/jhbuild.xml:406(para)
+#: C/index.docbook:379(section/para)
 msgid ""
 "To run a particular command with the same environment used by JHBuild, use "
 "the <command>run</command> command:"
 msgstr ""
 
-#: C/jhbuild.xml:409(replaceable) C/jhbuild.xml:1074(replaceable)
-msgid "program"
-msgstr ""
-
-#: C/jhbuild.xml:409(userinput)
+#: C/index.docbook:382(section/screen)
 #, no-wrap
-msgid "jhbuild run <placeholder-1/>"
-msgstr "jhbuild run <placeholder-1/>"
+msgid "<prompt>$</prompt> <userinput>jhbuild run <replaceable>program</replaceable></userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild run <replaceable>program</replaceable></userinput>"
 
-#: C/jhbuild.xml:411(para)
+#: C/index.docbook:384(section/para)
 msgid ""
 "To start a shell with the same environment used by JHBuild, use the "
 "<command>shell</command> command:"
 msgstr ""
 
-#: C/jhbuild.xml:414(userinput) C/jhbuild.xml:1145(command)
+#: C/index.docbook:387(section/screen)
 #, no-wrap
-msgid "jhbuild shell"
-msgstr "jhbuild shell"
+msgid "<prompt>$</prompt> <userinput>jhbuild shell</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild shell</userinput>"
 
-#: C/jhbuild.xml:420(title)
-msgid "Buildbot Integration"
+#: C/index.docbook:392(section/title)
+#| msgid "JHBuild Manual"
+msgid "JHBuild and GNOME"
+msgstr "JHBuild ÎÎÎ GNOME"
+
+#: C/index.docbook:394(section/para)
+msgid ""
+"This section provides guidance on building, installing and running GNOME."
+msgstr ""
+
+#: C/index.docbook:398(section/title)
+msgid "Building GNOME"
+msgstr "ÎÏÎÎÎÎÏÎÏ ÏÎ GNOME"
+
+#: C/index.docbook:400(section/para)
+msgid "To build GNOME some development packages are required. This includes:"
+msgstr ""
+
+#: C/index.docbook:405(listitem/simpara)
+msgid ""
+"DocBook XML DTD and XSLT stylesheets. These need to be registered in the XML "
+"catalog (<filename>/etc/xml/catalog</filename>)."
+msgstr ""
+
+#: C/index.docbook:410(listitem/simpara)
+msgid "X libraries"
+msgstr "ÎÎÎÎÎÎÎÎÎÎÏ X"
+
+#: C/index.docbook:413(listitem/simpara)
+msgid ""
+"<filename>libsmbclient</filename> from Samba (used for browsing Windows "
+"networks)."
+msgstr ""
+
+#: C/index.docbook:417(listitem/simpara)
+msgid "<filename>libbz2</filename> from bzip2."
+msgstr "<filename>libbz2</filename> ÎÏÏ bzip2."
+
+#: C/index.docbook:420(listitem/simpara)
+msgid ""
+"<filename>libpng</filename>, <filename>libjpeg</filename> and "
+"<filename>libtiff</filename> (used for image loading)."
+msgstr ""
+
+#: C/index.docbook:425(section/para)
+msgid ""
+"If installing distribution packages, and if applicable for your "
+"distribution, install the corresponding <quote>dev</quote> or <quote>devel</"
+"quote> packages. A list of <ulink url=\"http://live.gnome.org/";
+"JhbuildDependencies\">package names</ulink> for different distributions is "
+"maintained on the GNOME wiki."
+msgstr ""
+
+#: C/index.docbook:434(section/title)
+#, fuzzy
+msgid "Running a Single GNOME Application"
+msgstr "ÎÎÏÎÎÎÏÎ ÏÎÏ ÎÏÎÏÎÎÎÎÏ ÏÎÏ GNOME"
+
+#: C/index.docbook:436(section/para)
+msgid ""
+"This section details how to run a single GNOME application. The application "
+"will run within the current desktop environment. To run the application "
+"within the complete JHBuild GNOME see <xref linkend=\"running-gnome\"/>."
+msgstr ""
+
+#: C/index.docbook:441(section/para)
+msgid ""
+"Launch a JHBuild shell. The JHBuild shell has all the necessary environment "
+"variables set."
+msgstr ""
+
+#: C/index.docbook:444(section/screen)
+#, no-wrap
+msgid "<prompt>$ </prompt><userinput>jhbuild shell</userinput>"
+msgstr "<prompt>$ </prompt><userinput>jhbuild shell</userinput>"
+
+#: C/index.docbook:446(section/para)
+msgid "Verify the correct application will be run. For example:"
+msgstr ""
+
+#: C/index.docbook:448(section/screen)
+#, no-wrap
+msgid ""
+"<prompt>$ </prompt><userinput>which gedit</userinput>\n"
+"/opt/gnome/bin/gedit"
+msgstr ""
+"<prompt>$ </prompt><userinput>which gedit</userinput>\n"
+"/opt/gnome/bin/gedit"
+
+#: C/index.docbook:451(section/para)
+msgid "Run the application:"
+msgstr "ÎÎÏÎÎÎÏÎ ÏÎÏ ÎÏÎÏÎÎÎÎÏ:"
+
+#: C/index.docbook:453(section/screen)
+#, no-wrap
+msgid "<prompt>$ </prompt><userinput>gedit &amp;</userinput>"
+msgstr "<prompt>$ </prompt><userinput>gedit &amp;</userinput>"
+
+#: C/index.docbook:455(section/para)
+#| msgid ""
+#| "To get information about a particular module, use the <command>info</"
+#| "command> command:"
+msgid ""
+"Alternatively, run the application using the <command>run</command> command:"
+msgstr ""
+"ÎÎÎ ÎÎ ÎÎÎÎÏÎ ÏÎÎÏÎÏÎÏÎÎÏ ÎÎÎ ÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎ ÎÎÏÏÎÏÎ, ÏÏÎÏÎÎÎÏÎÎÎÏÏÎ ÏÎÎ "
+"ÎÎÏÎÎÎ <command>info</command>:"
+
+#: C/index.docbook:458(section/screen)
+#, no-wrap
+msgid "<prompt>$ </prompt><userinput>jhbuild run gedit</userinput>"
+msgstr "<prompt>$ </prompt><userinput>jhbuild run gedit</userinput>"
+
+#: C/index.docbook:462(section/title)
+#, fuzzy
+msgid "Running the GNOME Desktop Environment"
+msgstr "Sticky Notes ÎÎÎ ÏÎÎ ÎÏÎÏÎÎÎÎÎ ÎÏÎÎÏÎÎÏ ÏÎÏ Gnome"
+
+#: C/index.docbook:464(section/para)
+msgid ""
+"Create a new user account to run the JHBuild GNOME. Running JHBuild GNOME "
+"using different user account is recommended to avoid problems caused by user "
+"settings stored in the home directory. This manual refers to the new account "
+"as <systemitem class=\"username\">gnomedev</systemitem>."
+msgstr ""
+
+#: C/index.docbook:470(section/para)
+msgid ""
+"Setup JHBuild on the new <systemitem class=\"username\">gnomedev</"
+"systemitem> account. Copy or soft-link <filename>~/.config/jhbuildrc</"
+"filename> and <filename>~/.local/bin/jhbuild</filename> to <systemitem class="
+"\"username\">gnomedev</systemitem> home directory."
+msgstr ""
+
+#: C/index.docbook:477(section/para)
+#, fuzzy
+#| msgid ""
+#| "To permanently add <filename>~/.local/bin</filename> to the <envar>PATH</"
+#| "envar> variable, run the following command:"
+msgid ""
+"Open a terminal as the user <systemitem class=\"username\">gnomedev</"
+"systemitem>. Permanently add <filename>~/.local/bin</filename> to the "
+"<envar>PATH</envar> variable, run the following command:"
+msgstr ""
+"ÎÎÎ ÎÎ ÏÏÎÏÎÎÏÎÏÎ ÎÏÎÎÎÎ ÏÎ <filename>~/.local/bin</filename> ÏÏÎ ÎÎÏÎÎÎÎÏÎ "
+"<envar>PATH</envar>, ÎÎÏÎÎÎÏÏÎ ÏÎÎ ÎÎÏÎÎÏÎÎ ÎÎÏÎÎÎ:"
+
+#: C/index.docbook:482(section/screen)
+#, no-wrap
+#| msgid "echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc"
+msgid "<prompt>$</prompt> <userinput>echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc</userinput>"
+msgstr "<prompt>$</prompt> <userinput>echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc</userinput>"
+
+#: C/index.docbook:484(section/para)
+#, fuzzy
+msgid "Test JHBuild works:"
+msgstr "ÎÏÏ ÎÎÎÏÎÏÏÎÎÎ"
+
+#: C/index.docbook:486(section/screen)
+#, no-wrap
+msgid ""
+"<prompt>$</prompt> <userinput>jhbuild run pkg-config gtk+-2.0 --modversion</userinput>\n"
+"2.20.1"
+msgstr ""
+"<prompt>$</prompt> <userinput>jhbuild run pkg-config gtk+-2.0 --modversion</userinput>\n"
+"2.20.1"
+
+#: C/index.docbook:490(section/title)
+msgid "Setup GNOME to run from the display manager"
+msgstr ""
+
+#: C/index.docbook:492(section/para)
+#, fuzzy
+msgid "Build and install JHBuild GNOME."
+msgstr "ÎÎÏÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎ '%s' ÎÏÏ ÏÎ extensions.gnome.org;"
+
+#: C/index.docbook:494(section/para)
+msgid ""
+"Enable system services. JHBuild GNOME will use the <filename>/usr/bin</"
+"filename> system <application>D-Bus</application> daemon and the system "
+"services within <filename>/usr/share/dbus-1/system-services/</filename>. "
+"JHBuild GNOME will use the JHBuild session <application>D-Bus</application> "
+"daemon and the services within <filename><replaceable>/opt/gnome</"
+"replaceable>/share/dbus-1/services/</filename>. Replace <filename>/opt/"
+"gnome</filename> with GNOME install <varname>prefix</varname> in the command "
+"below:"
+msgstr ""
+
+#: C/index.docbook:504(section/screen)
+#, no-wrap
+msgid ""
+"<prompt>$ </prompt><userinput>rm -rf <replaceable>/opt/gnome</replaceable>/var/run/dbus</userinput>\n"
+"<prompt>$ </prompt><userinput>ln -s /var/run/dbus <replaceable>/opt/gnome</replaceable>/var/run/dbus</userinput>\n"
+"<prompt>$ </prompt><userinput>rm -rf <replaceable>/opt/gnome</replaceable>/var/lib/dbus/machine-id</userinput>\n"
+"<prompt>$ </prompt><userinput>ln -s /var/lib/dbus/machine-id <replaceable>/opt/gnome</replaceable>/var/lib/dbus/machine-id</userinput>"
+msgstr ""
+"<prompt>$ </prompt><userinput>rm -rf <replaceable>/opt/gnome</replaceable>/var/run/dbus</userinput>\n"
+"<prompt>$ </prompt><userinput>ln -s /var/run/dbus <replaceable>/opt/gnome</replaceable>/var/run/dbus</userinput>\n"
+"<prompt>$ </prompt><userinput>rm -rf <replaceable>/opt/gnome</replaceable>/var/lib/dbus/machine-id</userinput>\n"
+"<prompt>$ </prompt><userinput>ln -s /var/lib/dbus/machine-id <replaceable>/opt/gnome</replaceable>/var/lib/dbus/machine-id</userinput>"
+
+#: C/index.docbook:509(section/para)
+msgid ""
+"Create a GNOME startup script at <filename>/usr/bin/gnome-jhbuild-session</"
+"filename> with the following, replacing <filename>/opt/gnome</filename> with "
+"GNOME install <varname>prefix</varname>:"
+msgstr ""
+
+#: C/index.docbook:514(section/programlisting)
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"\n"
+"GNOME=<replaceable>/opt/gnome</replaceable>\n"
+" \n"
+"GDK_USE_XFT=1\n"
+"XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME/share\n"
+"XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOME/etc/xdg\n"
+"\n"
+"jhbuild run gnome-session\n"
+msgstr ""
+"#!/bin/sh\n"
+"\n"
+"GNOME=<replaceable>/opt/gnome</replaceable>\n"
+" \n"
+"GDK_USE_XFT=1\n"
+"XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME/share\n"
+"XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOME/etc/xdg\n"
+"\n"
+"jhbuild run gnome-session\n"
+
+#: C/index.docbook:525(section/para)
+msgid ""
+"Make the file <filename>/usr/bin/gnome-jhbuild-session</filename> executable:"
+msgstr ""
+
+#: C/index.docbook:528(section/screen)
+#, no-wrap
+msgid "<prompt>$ </prompt><userinput>chmod a+x /usr/bin/gnome-jhbuild-session</userinput>"
+msgstr "<prompt>$ </prompt><userinput>chmod a+x /usr/bin/gnome-jhbuild-session</userinput>"
+
+#: C/index.docbook:530(section/para)
+msgid ""
+"To add a new session entry in the display manager, create <filename>/usr/"
+"share/xsessions/gnome-jhbuild.desktop</filename> and enter:"
+msgstr ""
+
+#: C/index.docbook:534(section/programlisting)
+#, no-wrap
+msgid ""
+"[Desktop Entry]\n"
+"Name=GNOME (JHBuild)\n"
+"Comment=This session logs you into GNOME testing session\n"
+"TryExec=/usr/bin/gnome-jhbuild-session\n"
+"Exec=/usr/bin/gnome-jhbuild-session\n"
+"Icon=\n"
+"Type=Application"
+msgstr ""
+
+#: C/index.docbook:542(section/para)
+msgid "Restart <command>gdm</command>."
+msgstr "ÎÏÎÎÎÎÎÎÎÎÏÎ ÏÎÏ <command>gdm</command>."
+
+#: C/index.docbook:548(section/title)
+#, fuzzy
+msgid "Running GNOME from the display manager"
+msgstr "Session Worker ÎÎÎÏÎÎÏÎÏÏÎ ÎÏÎÏÎÎÎÎÎÏ ÎÏÎÎÏÎÎÏ GNOME"
+
+#: C/index.docbook:550(section/para)
+msgid ""
+"To run the JHBuild GNOME, select the GNOME (JHBuild) session at the display "
+"manager before entering <systemitem class=\"username\">gnomedev</systemitem> "
+"login credentials. If successful, JHBuild GNOME will be displayed. If "
+"unsuccessful, check the log file. The log file will be located at "
+"<filename>~gnomedev/.cache/gdm/session.log</filename> or "
+"<filename>~gnomedev/.xsession-errors</filename>."
 msgstr ""
 
-#: C/jhbuild.xml:422(para)
+#: C/index.docbook:562(section/title)
+msgid "Buildbot Integration"
+msgstr "ÎÎÏÏÎÎÏÏÏÎ ÏÏÎ Buildbot"
+
+#: C/index.docbook:564(section/para)
 msgid ""
 "Coupled with the <ulink url=\"http://buildbot.net\";>Buildbot</ulink> "
 "project, JHBuild can also function as a continuous integration tool. The "
@@ -851,11 +1105,11 @@ msgid ""
 "build.gnome.org\">build.gnome.org</ulink>."
 msgstr ""
 
-#: C/jhbuild.xml:430(title)
+#: C/index.docbook:570(section/title)
 msgid "Configuring a Buildbot Slave"
-msgstr ""
+msgstr "ÎÏÎÎÎÏÎ ÎÎÏÏ Buildbot Slave"
 
-#: C/jhbuild.xml:432(para)
+#: C/index.docbook:572(section/para)
 msgid ""
 "A Buildbot slave is a variation of a normal JHBuild installation that serves "
 "the requests of a Buildbot master. It is recommended to set up JHBuild and "
@@ -863,30 +1117,36 @@ msgid ""
 "Buildbot customizations."
 msgstr ""
 
-#: C/jhbuild.xml:439(para)
+#: C/index.docbook:577(section/para)
 msgid ""
 "Buildbot commands are options to the <command>bot</command> command. To "
 "download and install the extra required software, run the following command:"
 msgstr ""
 
-#: C/jhbuild.xml:445(userinput)
+#: C/index.docbook:581(section/screen)
 #, no-wrap
-msgid "jhbuild bot --setup"
-msgstr "jhbuild bot --setup"
+msgid "<prompt>$</prompt> <userinput>jhbuild bot --setup</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild bot --setup</userinput>"
 
-#: C/jhbuild.xml:447(para)
+#: C/index.docbook:583(section/para)
+#, fuzzy
+#| msgid ""
+#| "Before running JHBuild, it is necessary to set up a configuration file "
+#| "located at <filename>~/.jhbuildrc</filename>."
 msgid ""
 "Once this step has completed successfully, three new configuration variables "
-"are required in <filename>~/.jhbuildrc</filename>."
+"are required in <filename>~/.config/jhbuildrc</filename>."
 msgstr ""
+"ÎÏÎÏÎÏ ÏÏÎÎÎÏÎ ÏÎ JHBuild, ÎÎÎÎÎ ÎÏÎÏÎÎÏÎÏÎ ÎÎ ÎÏÎÏÎÏÎ ÎÎÎ ÎÏÏÎÎÎ ÏÏÎÎÎÏÎÏÎ "
+"ÏÏÎ ÏÎÎÎÎÎ <filename>~/.jhbuildrc</filename>."
 
-#: C/jhbuild.xml:453(para)
+#: C/index.docbook:588(note/para)
 msgid ""
 "It is not possible to use an alternate configuration file, the <link linkend="
 "\"option-file\"><option>--file</option></link> will not get desired effects."
 msgstr ""
 
-#: C/jhbuild.xml:460(programlisting)
+#: C/index.docbook:593(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -899,7 +1159,7 @@ msgstr ""
 "jhbuildbot_slavename = 'slavename'\n"
 "jhbuildbot_password = 'password'\n"
 
-#: C/jhbuild.xml:466(para)
+#: C/index.docbook:599(section/para)
 msgid ""
 "<varname>jhbuildbot_master</varname> is a string specifying the Buildbot "
 "master server; it defaults to <literal>'build.gnome.org:9070'</literal>. "
@@ -908,527 +1168,527 @@ msgid ""
 "master administrators to obtain the slave name and password."
 msgstr ""
 
-#: C/jhbuild.xml:477(para)
+#: C/index.docbook:608(note/para)
 msgid ""
 "The administrators of <ulink url=\"http://build.gnome.org\";>build.gnome.org</"
 "ulink> can be reached on the <ulink url=\"mailto:build-brigade-list gnome org"
 "\">Build Brigade mailing list</ulink>."
 msgstr ""
 
-#: C/jhbuild.xml:497(title)
+#: C/index.docbook:623(section/title)
+#, fuzzy
 msgid "Command Reference"
-msgstr ""
+msgstr "_AÎÎÏÎÏÎ API"
 
-#: C/jhbuild.xml:499(para)
+#: C/index.docbook:625(section/para)
 msgid "JHBuild uses a command line syntax similar to tools like CVS:"
 msgstr ""
 
-#: C/jhbuild.xml:502(command)
-msgid "jhbuild"
-msgstr "jhbuild"
-
-#: C/jhbuild.xml:503(replaceable)
-msgid "global-options"
-msgstr "global-options"
-
-#: C/jhbuild.xml:504(replaceable)
-msgid "command"
-msgstr "command"
-
-#: C/jhbuild.xml:505(replaceable)
-msgid "command-arguments"
-msgstr "command-arguments"
+#: C/index.docbook:627(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild</command> <arg><replaceable>global-options</replaceable></"
+"arg> <arg choice=\"plain\"><replaceable>command</replaceable></arg> "
+"<arg><replaceable>command-arguments</replaceable></arg>"
+msgstr ""
+"<command>jhbuild</command> <arg><replaceable>global-options</replaceable></"
+"arg> <arg choice=\"plain\"><replaceable>command</replaceable></arg> "
+"<arg><replaceable>command-arguments</replaceable></arg>"
 
-#: C/jhbuild.xml:508(para)
+#: C/index.docbook:633(section/para)
 msgid "The global JHBuild options are:"
-msgstr ""
+msgstr "ÎÎ ÎÎÎÎÎÎÎÎÏ ÎÏÎÎÎÎÎÏ ÏÎÏ JHBuild ÎÎÎÎÎ:"
 
-#: C/jhbuild.xml:512(term)
+#: C/index.docbook:637(varlistentry/term)
 msgid ""
-"<option>-f</option>, <option>--file</option><replaceable>config</replaceable>"
+"<option>-f</option>, <option>--file</option> <replaceable>config</"
+"replaceable>"
 msgstr ""
+"<option>-f</option>, <option>--file</option> <replaceable>config</"
+"replaceable>"
 
-#: C/jhbuild.xml:515(simpara)
+#: C/index.docbook:642(listitem/simpara)
+#, fuzzy
+#| msgid ""
+#| "Before running JHBuild, it is necessary to set up a configuration file "
+#| "located at <filename>~/.jhbuildrc</filename>."
 msgid ""
 "Use an alternative configuration file instead of the default <filename>~/."
-"jhbuildrc</filename>."
+"config/jhbuildrc</filename>."
 msgstr ""
+"ÎÏÎÏÎÏ ÏÏÎÎÎÏÎ ÏÎ JHBuild, ÎÎÎÎÎ ÎÏÎÏÎÎÏÎÏÎ ÎÎ ÎÏÎÏÎÏÎ ÎÎÎ ÎÏÏÎÎÎ ÏÏÎÎÎÏÎÏÎ "
+"ÏÏÎ ÏÎÎÎÎÎ <filename>~/.jhbuildrc</filename>."
 
-#: C/jhbuild.xml:521(term)
+#: C/index.docbook:647(varlistentry/term)
 msgid ""
-"<option>-m</option>, <option>--moduleset</option><replaceable>moduleset</"
+"<option>-m</option>, <option>--moduleset</option> <replaceable>moduleset</"
 "replaceable>"
 msgstr ""
+"<option>-m</option>, <option>--moduleset</option> <replaceable>moduleset</"
+"replaceable>"
 
-#: C/jhbuild.xml:524(simpara)
+#: C/index.docbook:652(listitem/simpara)
 msgid ""
 "Use a module set other than the module set listed in the configuration file. "
 "This option can be a relative path if the module set is located in the "
 "JHBuild moduleset folder, or an absolute path if located elsewhere."
 msgstr ""
 
-#: C/jhbuild.xml:532(option)
-msgid "--no-interact"
-msgstr "--no-interact"
+#: C/index.docbook:659(varlistentry/term)
+#| msgid "--no-interact"
+msgid "<option>--no-interact</option>"
+msgstr "<option>--no-interact</option>"
 
-#: C/jhbuild.xml:534(simpara)
+#: C/index.docbook:663(listitem/simpara)
 msgid ""
 "Do not prompt the user for any input. This option is useful if leaving a "
 "build unattended, in order to ensure the build is not interrupted."
 msgstr ""
 
-#: C/jhbuild.xml:541(para)
+#: C/index.docbook:670(section/para)
 msgid "Command specific options are listed below."
 msgstr ""
 
-#: C/jhbuild.xml:544(title)
+#: C/index.docbook:673(section/title)
 msgid "autobuild"
 msgstr "autobuild"
 
-#: C/jhbuild.xml:546(para)
+#: C/index.docbook:675(section/para)
 msgid ""
 "The <command>autobuild</command> command automatically builds the modules as "
 "specified in the configuration file, and then upload the results to "
 "JhAutobuild."
 msgstr ""
 
-#: C/jhbuild.xml:551(command)
-msgid "jhbuild autobuild"
-msgstr "jhbuild autobuild"
-
-#: C/jhbuild.xml:552(arg) C/jhbuild.xml:617(arg) C/jhbuild.xml:815(arg)
-#: C/jhbuild.xml:1164(arg)
-msgid "--autogen"
-msgstr "--autogen"
-
-#: C/jhbuild.xml:553(arg) C/jhbuild.xml:618(arg) C/jhbuild.xml:816(arg)
-#: C/jhbuild.xml:1165(arg)
-msgid "--clean"
-msgstr ""
-
-#: C/jhbuild.xml:554(replaceable) C/jhbuild.xml:555(replaceable)
-#: C/jhbuild.xml:624(replaceable) C/jhbuild.xml:625(replaceable)
-#: C/jhbuild.xml:634(arg) C/jhbuild.xml:824(arg)
-#: C/jhbuild.xml:875(replaceable) C/jhbuild.xml:876(replaceable)
-#: C/jhbuild.xml:902(arg) C/jhbuild.xml:960(arg)
-#: C/jhbuild.xml:986(replaceable) C/jhbuild.xml:990(arg)
-#: C/jhbuild.xml:1042(arg) C/jhbuild.xml:1168(replaceable)
-#: C/jhbuild.xml:1169(replaceable) C/jhbuild.xml:1174(arg)
-#: C/jhbuild.xml:1205(arg) C/jhbuild.xml:1219(replaceable)
-#: C/jhbuild.xml:1220(replaceable) C/jhbuild.xml:1224(arg)
-#: C/jhbuild.xml:1245(arg)
-msgid "module"
-msgstr ""
-
-#: C/jhbuild.xml:554(arg) C/jhbuild.xml:624(arg) C/jhbuild.xml:875(arg)
-#: C/jhbuild.xml:1168(arg) C/jhbuild.xml:1219(arg)
-msgid "--skip=<placeholder-1/>"
-msgstr ""
-
-#: C/jhbuild.xml:555(arg) C/jhbuild.xml:625(arg) C/jhbuild.xml:876(arg)
-#: C/jhbuild.xml:986(arg) C/jhbuild.xml:1169(arg) C/jhbuild.xml:1220(arg)
-msgid "--start-at=<placeholder-1/>"
-msgstr ""
-
-#: C/jhbuild.xml:556(replaceable)
-msgid "reporturl"
-msgstr ""
-
-#: C/jhbuild.xml:556(arg)
-msgid "--report-url=<placeholder-1/>"
-msgstr ""
-
-#: C/jhbuild.xml:557(arg)
-msgid "--verbose"
+#: C/index.docbook:679(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild autobuild</command> <arg>--autogen</arg> <arg>--clean</arg> "
+"<arg>--distcheck</arg> <arg rep=\"repeat\">--skip=<replaceable>module</"
+"replaceable></arg> <arg>--start-at=<replaceable>module</replaceable></arg> "
+"<arg>--report-url=<replaceable>reporturl</replaceable></arg> <arg>--verbose</"
+"arg>"
 msgstr ""
+"<command>jhbuild autobuild</command> <arg>--autogen</arg> <arg>--clean</arg> "
+"<arg>--distcheck</arg> <arg rep=\"repeat\">--skip=<replaceable>module</"
+"replaceable></arg> <arg>--start-at=<replaceable>module</replaceable></arg> "
+"<arg>--report-url=<replaceable>reporturl</replaceable></arg> <arg>--verbose</"
+"arg>"
 
-#: C/jhbuild.xml:560(para)
+#: C/index.docbook:689(section/para)
 msgid ""
-"The <option>--autogen</option>, <option>--clean</option>, <option>--skip</"
-"option> and <option>--start-at</option> options are processed as per the "
-"<link linkend=\"command-reference-build\"><command>build</command></link> "
-"command."
+"The <option>--autogen</option>, <option>--clean</option>, <option>--"
+"distcheck</option>, <option>--skip</option> and <option>--start-at</option> "
+"options are processed as per the <link linkend=\"command-reference-build"
+"\"><command>build</command></link> command."
 msgstr ""
 
-#: C/jhbuild.xml:568(term)
+#: C/index.docbook:697(varlistentry/term)
 msgid ""
 "<option>--report-url=<replaceable>reporturl</replaceable></option>, <option>-"
 "r <replaceable>reporturl</replaceable></option>"
 msgstr ""
+"<option>--report-url=<replaceable>reporturl</replaceable></option>, <option>-"
+"r <replaceable>reporturl</replaceable></option>"
 
-#: C/jhbuild.xml:571(simpara)
+#: C/index.docbook:702(listitem/simpara)
 msgid "This option specifies the JhAutobuild URL to report to."
 msgstr ""
 
-#: C/jhbuild.xml:577(term)
+#: C/index.docbook:707(varlistentry/term)
 msgid "<option>--verbose</option>, <option>-v</option>"
-msgstr ""
+msgstr "<option>--verbose</option>, <option>-v</option>"
 
-#: C/jhbuild.xml:579(simpara)
+#: C/index.docbook:711(listitem/simpara)
 msgid "If specified, JHBuild's output will be more verbose."
 msgstr ""
 
-#: C/jhbuild.xml:588(title)
+#: C/index.docbook:719(section/title)
 msgid "bootstrap"
-msgstr ""
+msgstr "bootstrap"
 
-#: C/jhbuild.xml:590(para)
+#: C/index.docbook:721(section/para)
 msgid ""
-"The <command>bootstrap</command> command installs a set of build utilities "
-"required to build most modules (e.g. <application>autoconf</application>, "
-"<application>automake</application>, etc)."
+"The <command>bootstrap</command> command installs a set of build utilities. "
+"The build utilities include <application>autoconf</application>, "
+"<application>automake</application> and similar utilities. The recommended "
+"method to install the build utilities is via your distribution's package "
+"management system. The <command>bootstrap</command> should only be used if "
+"the build utilities are not provided by your distribution's package "
+"management system, for example on <systemitem class=\"osname\">Mac OS</"
+"systemitem>."
 msgstr ""
 
-#: C/jhbuild.xml:599(para)
+#: C/index.docbook:730(section/cmdsynopsis)
+#| msgid "jhbuild bootstrap"
+msgid "<command>jhbuild bootstrap</command>"
+msgstr "<command>jhbuild bootstrap</command>"
+
+#: C/index.docbook:733(section/para)
 msgid ""
 "The <command>bootstrap</command> command builds modules using the same "
 "method as the <command>build</command> command, but uses the "
 "<filename>bootstrap.modules</filename> moduleset."
 msgstr ""
 
-#: C/jhbuild.xml:603(para)
+#: C/index.docbook:737(section/para)
 msgid ""
 "See the <link linkend=\"command-reference-build\"><command>build</command></"
 "link> command documentation for available options."
 msgstr ""
 
-#: C/jhbuild.xml:610(title)
+#: C/index.docbook:743(section/title)
 msgid "build"
-msgstr ""
+msgstr "build"
 
-#: C/jhbuild.xml:612(para)
+#: C/index.docbook:745(section/para)
 msgid ""
 "The <command>build</command> command builds one or more packages, including "
 "their dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:619(arg) C/jhbuild.xml:663(option) C/jhbuild.xml:817(arg)
-msgid "--check"
-msgstr ""
-
-#: C/jhbuild.xml:620(arg)
-msgid "--dist"
-msgstr ""
-
-#: C/jhbuild.xml:621(arg) C/jhbuild.xml:679(option) C/jhbuild.xml:818(arg)
-msgid "--distcheck"
-msgstr ""
-
-#: C/jhbuild.xml:622(arg) C/jhbuild.xml:687(option) C/jhbuild.xml:988(arg)
-#: C/jhbuild.xml:1222(arg)
-msgid "--ignore-suggests"
-msgstr ""
-
-#: C/jhbuild.xml:623(arg) C/jhbuild.xml:819(arg) C/jhbuild.xml:1166(arg)
-msgid "--no-network"
-msgstr ""
-
-#: C/jhbuild.xml:626(replaceable) C/jhbuild.xml:987(replaceable)
-#: C/jhbuild.xml:1221(replaceable)
-msgid "tags"
-msgstr ""
-
-#: C/jhbuild.xml:626(arg) C/jhbuild.xml:987(arg) C/jhbuild.xml:1221(arg)
-msgid "--tags=<placeholder-1/>"
-msgstr ""
-
-#: C/jhbuild.xml:627(replaceable) C/jhbuild.xml:735(replaceable)
-#: C/jhbuild.xml:820(replaceable) C/jhbuild.xml:1170(replaceable)
-#: C/jhbuild.xml:1223(replaceable) C/jhbuild.xml:1244(replaceable)
-msgid "date"
-msgstr ""
-
-#: C/jhbuild.xml:627(arg) C/jhbuild.xml:820(arg) C/jhbuild.xml:1170(arg)
-#: C/jhbuild.xml:1223(arg) C/jhbuild.xml:1244(arg)
-msgid "-D <placeholder-1/>"
-msgstr ""
-
-#: C/jhbuild.xml:628(arg) C/jhbuild.xml:821(arg)
-msgid "--no-xvfb"
-msgstr ""
-
-#: C/jhbuild.xml:629(arg)
-msgid "--try-checkout"
-msgstr ""
-
-#: C/jhbuild.xml:630(arg)
-msgid "--no-poison"
-msgstr ""
-
-#: C/jhbuild.xml:631(arg) C/jhbuild.xml:822(arg)
-msgid "--force"
-msgstr ""
-
-#: C/jhbuild.xml:632(arg) C/jhbuild.xml:781(option)
-msgid "--build-optional-modules"
-msgstr ""
-
-#: C/jhbuild.xml:633(replaceable) C/jhbuild.xml:823(replaceable)
-msgid "time"
-msgstr ""
-
-#: C/jhbuild.xml:633(arg) C/jhbuild.xml:823(arg)
-msgid "--min-age=<placeholder-1/>"
+#: C/index.docbook:748(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild build</command> <arg>--autogen</arg> <arg>--clean</arg> "
+"<arg>--check</arg> <arg>--dist</arg> <arg>--distcheck</arg> <arg>--"
+"distclean</arg> <arg>--ignore-suggests</arg> <arg>--no-network</arg> <arg "
+"rep=\"repeat\">--skip=<replaceable>module</replaceable></arg> <arg>--start-"
+"at=<replaceable>module</replaceable></arg> <arg>--tags=<replaceable>tags</"
+"replaceable></arg> <arg>-D <replaceable>date</replaceable></arg> <arg>--no-"
+"xvfb</arg> <arg>--try-checkout</arg> <arg>--no-poison</arg> <arg>--force</"
+"arg> <arg>--build-optional-modules</arg> <arg>--min-age=<replaceable>time</"
+"replaceable></arg> <arg>--nodeps</arg> <arg rep=\"repeat\">module</arg>"
 msgstr ""
 
-#: C/jhbuild.xml:637(para) C/jhbuild.xml:879(para) C/jhbuild.xml:905(para)
-#: C/jhbuild.xml:993(para)
+#: C/index.docbook:771(section/para) C/index.docbook:1054(section/para)
+#: C/index.docbook:1078(section/para) C/index.docbook:1160(section/para)
 msgid ""
 "If no module names are provided on the command line, the <link linkend=\"cfg-"
 "modules\">modules</link> list from the configuration file will be used."
 msgstr ""
 
-#: C/jhbuild.xml:643(term)
-msgid "<option>-a</option>, <option>--autogen</option>"
-msgstr ""
-
-#: C/jhbuild.xml:645(simpara)
-msgid ""
-"Always run <command>autogen.sh</command> before building modules. By "
-"default, <command>autogen.sh</command> will only be called if the top-level "
-"makefile is missing. Otherwise, JHBuild relies on the package's makefiles to "
-"detect if configure needs to be rebuilt or rerun."
-msgstr ""
-
-#: C/jhbuild.xml:655(term)
+#: C/index.docbook:777(varlistentry/term)
 msgid "<option>-c</option>, <option>--clean</option>"
-msgstr ""
+msgstr "<option>-c</option>, <option>--clean</option>"
 
-#: C/jhbuild.xml:657(simpara)
+#: C/index.docbook:781(listitem/simpara)
 msgid "Run <command>make clean</command> before building modules."
 msgstr ""
 
-#: C/jhbuild.xml:665(simpara)
+#: C/index.docbook:786(varlistentry/term)
+msgid "<option>--check</option>"
+msgstr "<option>--check</option>"
+
+#: C/index.docbook:790(listitem/simpara)
 msgid "Run <command>make check</command> after building modules."
 msgstr ""
 
-#: C/jhbuild.xml:671(term)
+#: C/index.docbook:795(varlistentry/term)
 msgid "<option>-d</option>, <option>--dist</option>"
-msgstr ""
+msgstr "<option>-d</option>, <option>--dist</option>"
 
-#: C/jhbuild.xml:673(simpara)
+#: C/index.docbook:799(listitem/simpara)
 msgid "Run <command>make dist</command> after building modules."
 msgstr ""
 
-#: C/jhbuild.xml:681(simpara)
+#: C/index.docbook:804(varlistentry/term)
+msgid "<option>--distcheck</option>"
+msgstr "<option>--distcheck</option>"
+
+#: C/index.docbook:808(listitem/simpara)
 msgid "Run <command>make distcheck</command> after building modules."
 msgstr ""
 
-#: C/jhbuild.xml:689(simpara)
-msgid "Do not build soft dependencies."
+#: C/index.docbook:813(varlistentry/term)
+msgid "<option>--distclean</option>"
+msgstr "<option>--distclean</option>"
+
+#: C/index.docbook:817(listitem/simpara)
+msgid ""
+"For git modules, run <command>git clean -dfx</command> before building "
+"modules. For other modules, run <command>make distclean</command> before "
+"building modules."
 msgstr ""
 
-#: C/jhbuild.xml:694(term)
-msgid "<option>-n</option>, <option>--no-network</option>"
+#: C/index.docbook:822(note/simpara)
+msgid "This option will delete any uncommited changes."
 msgstr ""
 
-#: C/jhbuild.xml:696(simpara)
+#: C/index.docbook:828(varlistentry/term)
+msgid "<option>--ignore-suggests</option>"
+msgstr "<option>--ignore-suggests</option>"
+
+#: C/index.docbook:832(listitem/simpara)
+#, fuzzy
+msgid "Do not build soft dependencies."
+msgstr "ÎÎÏÎÏÎÎÏÎ ÎÎÎÎ ÏÏÏÎÏ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ ÏÏÎÎÏÎÏÎÎÏ."
+
+#: C/index.docbook:836(varlistentry/term)
+msgid "<option>-n</option>, <option>--no-network</option>"
+msgstr "<option>-n</option>, <option>--no-network</option>"
+
+#: C/index.docbook:840(listitem/simpara)
 msgid ""
 "Do not access the network when building modules. This will skip download or "
 "update stages in a build. If a module can't be built without network access, "
 "the module build will fail."
 msgstr ""
 
-#: C/jhbuild.xml:704(term)
+#: C/index.docbook:847(varlistentry/term)
 msgid ""
 "<option>-s</option>, <option>--skip</option>=<replaceable>module,...</"
 "replaceable>"
 msgstr ""
+"<option>-s</option>, <option>--skip</option>=<replaceable>module,...</"
+"replaceable>"
 
-#: C/jhbuild.xml:707(simpara)
+#: C/index.docbook:852(listitem/simpara)
 msgid ""
 "Do not build the listed modules. Used to skip the building of specified "
 "dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:713(term)
+#: C/index.docbook:857(varlistentry/term)
 msgid "<option>--tags</option>=<replaceable>tag,...</replaceable>"
-msgstr ""
+msgstr "<option>--tags</option>=<replaceable>tag,...</replaceable>"
 
-#: C/jhbuild.xml:716(simpara)
+#: C/index.docbook:861(listitem/simpara)
 msgid ""
 "Ignore modules that do not match <replaceable>tag</replaceable>. Modules are "
 "automatically attributed a tag matching the name of the module's module set."
 msgstr ""
 
-#: C/jhbuild.xml:724(term)
+#: C/index.docbook:868(varlistentry/term)
 msgid ""
 "<option>-t</option>, <option>--start-at</option>=<replaceable>module</"
 "replaceable>"
 msgstr ""
+"<option>-t</option>, <option>--start-at</option>=<replaceable>module</"
+"replaceable>"
 
-#: C/jhbuild.xml:727(simpara)
+#: C/index.docbook:873(listitem/simpara)
 msgid ""
 "Start at the named module rather than at the beginning of the list. This "
 "option is useful if the build was interrupted."
 msgstr ""
 
-#: C/jhbuild.xml:734(option)
-msgid "-D"
-msgstr ""
+#: C/index.docbook:879(varlistentry/term)
+msgid "<option>-D</option> <replaceable>date</replaceable>"
+msgstr "<option>-D</option> <replaceable>date</replaceable>"
 
-#: C/jhbuild.xml:737(simpara)
+#: C/index.docbook:883(listitem/simpara)
 msgid ""
 "If supported by the underlying version control system, update the source "
 "tree to the specified date before building. An ISO date format is required, "
 "e.g. <literal>\"2009-09-18 02:32Z\"</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:745(term)
+#: C/index.docbook:890(varlistentry/term)
 msgid "<option>-x</option>, <option>--no-xvfb</option>"
-msgstr ""
+msgstr "<option>-x</option>, <option>--no-xvfb</option>"
 
-#: C/jhbuild.xml:747(simpara)
+#: C/index.docbook:894(listitem/simpara)
 msgid ""
 "Run graphical tests on the actual X server rather than in a simulated Xvfb."
 msgstr ""
 
-#: C/jhbuild.xml:753(term)
+#: C/index.docbook:899(varlistentry/term)
 msgid "<option>-C</option>, <option>--try-checkout</option>"
-msgstr ""
+msgstr "<option>-C</option>, <option>--try-checkout</option>"
 
-#: C/jhbuild.xml:756(simpara)
+#: C/index.docbook:903(listitem/simpara)
 msgid ""
 "If the build fails, and if supported by the version control system, force a "
 "checkout and run <command>autogen.sh</command> before retrying the build."
 msgstr ""
 
-#: C/jhbuild.xml:764(term)
+#: C/index.docbook:909(varlistentry/term)
 msgid "<option>-N</option>, <option>--no-poison</option>"
-msgstr ""
+msgstr "<option>-N</option>, <option>--no-poison</option>"
 
-#: C/jhbuild.xml:766(simpara)
+#: C/index.docbook:913(listitem/simpara)
 msgid ""
 "If one or more of a module's dependencies failed, this option forces JHBuild "
 "to try to build the module anyway."
 msgstr ""
 
-#: C/jhbuild.xml:773(term)
+#: C/index.docbook:918(varlistentry/term)
 msgid "<option>-f</option>, <option>--force</option>"
-msgstr ""
+msgstr "<option>-f</option>, <option>--force</option>"
 
-#: C/jhbuild.xml:775(simpara)
+#: C/index.docbook:922(listitem/simpara)
 msgid "Build the modules even if policy states it is not required."
 msgstr ""
 
-#: C/jhbuild.xml:783(simpara)
+#: C/index.docbook:927(varlistentry/term)
+msgid "<option>--build-optional-modules</option>"
+msgstr "<option>--build-optional-modules</option>"
+
+#: C/index.docbook:931(listitem/simpara)
 msgid ""
 "Modules listed as optional dependencies, may not be required to build the "
 "module. This option forces JHBuild to build optional dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:790(term)
-msgid "<option>--min-time</option>=<replaceable>time</replaceable>"
-msgstr ""
+#: C/index.docbook:937(varlistentry/term)
+msgid "<option>--min-age</option>=<replaceable>time</replaceable>"
+msgstr "<option>--min-age</option>=<replaceable>time</replaceable>"
 
-#: C/jhbuild.xml:792(simpara)
+#: C/index.docbook:941(listitem/simpara)
 msgid ""
 "Skip modules installed more recently than the specified relative time. The "
 "<replaceable>time</replaceable> string format is a number followed by a "
 "unit. The following units are supported: seconds (s), minutes (m), hours (h) "
-"and days (d). For example, <option>--min-time=2h</option> will skip modules "
+"and days (d). For example, <option>--min-age=2h</option> will skip modules "
 "built less than two hours ago."
 msgstr ""
 
-#: C/jhbuild.xml:807(title)
-msgid "buildone"
+#: C/index.docbook:950(varlistentry/term)
+msgid "<option>--nodeps</option>"
+msgstr "<option>--nodeps</option>"
+
+#: C/index.docbook:954(listitem/simpara)
+msgid ""
+"Ignore missing system dependencies. To ignore a single system dependency add "
+"the module to <link linkend=\"cfg-skip\"><varname>skip</varname></link>."
+msgstr ""
+
+#: C/index.docbook:963(section/title)
+msgid "make"
+msgstr "make"
+
+#: C/index.docbook:965(section/para)
+msgid ""
+"The <command>make</command> command is for actively developing on a "
+"particular module. It requires the current directory be a source checkout, "
+"and does the equivalent of <command>buildone -nf $(basename $(pwd))</"
+"command>."
 msgstr ""
 
-#: C/jhbuild.xml:809(para)
+#: C/index.docbook:970(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild make</command> <arg>--clean</arg> <arg>--check</arg> <arg>--"
+"distcheck</arg> <arg>--quiet</arg>"
+msgstr ""
+"<command>jhbuild make</command> <arg>--clean</arg> <arg>--check</arg> <arg>--"
+"distcheck</arg> <arg>--quiet</arg>"
+
+#: C/index.docbook:977(section/para)
+msgid ""
+"The options are the same as those available for the <link linkend=\"command-"
+"reference-build\"><command>buildone</command></link> command."
+msgstr ""
+
+#: C/index.docbook:984(section/title)
+msgid "buildone"
+msgstr "buildone"
+
+#: C/index.docbook:986(section/para)
 msgid ""
 "The <command>buildone</command> command is similar to <command>build</"
 "command>, but it does not build the dependent modules. It is useful for "
 "rebuilding one or more modules."
 msgstr ""
 
-#: C/jhbuild.xml:814(command)
-msgid "jhbuild buildone"
+#: C/index.docbook:990(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild buildone</command> <arg>--clean</arg> <arg>--check</arg> "
+"<arg>--distcheck</arg> <arg>--distclean</arg> <arg>--no-network</arg> <arg>-"
+"D <replaceable>date</replaceable></arg> <arg>--no-xvfb</arg> <arg>--force</"
+"arg> <arg>--min-age=<replaceable>time</replaceable></arg> <arg>--nodeps</"
+"arg> <arg choice=\"plain\" rep=\"repeat\">module</arg>"
 msgstr ""
+"<command>jhbuild buildone</command> <arg>--clean</arg> <arg>--check</arg> "
+"<arg>--distcheck</arg> <arg>--distclean</arg> <arg>--no-network</arg> <arg>-"
+"D <replaceable>date</replaceable></arg> <arg>--no-xvfb</arg> <arg>--force</"
+"arg> <arg>--min-age=<replaceable>time</replaceable></arg> <arg>--nodeps</"
+"arg> <arg choice=\"plain\" rep=\"repeat\">module</arg>"
 
-#: C/jhbuild.xml:827(para)
+#: C/index.docbook:1004(section/para)
 msgid ""
-"The <option>--autogen</option>, <option>--check</option>, <option>--clean</"
-"option>, <option>-d</option>, <option>--distcheck</option>, <option>--no-"
-"network</option>, <option>-D</option> and <option>-x</option> options are "
-"processed as per the <link linkend=\"command-reference-build"
-"\"><command>build</command></link> command."
+"The <option>--check</option>, <option>--clean</option>, <option>-d</option>, "
+"<option>--distcheck</option>, <option>--distclean</option>, <option>--no-"
+"network</option>, <option>-D</option>, <option>-x</option> and <option>--"
+"nodeps</option> options are processed as per the <link linkend=\"command-"
+"reference-build\"><command>build</command></link> command."
 msgstr ""
 
-#: C/jhbuild.xml:835(para) C/jhbuild.xml:1252(para)
+#: C/index.docbook:1012(section/para) C/index.docbook:1499(section/para)
 msgid "At least one module must be listed on the command line."
 msgstr ""
 
-#: C/jhbuild.xml:841(title)
+#: C/index.docbook:1016(section/title)
 msgid "checkbranches"
-msgstr ""
+msgstr "checkbranches"
 
-#: C/jhbuild.xml:843(para)
+#: C/index.docbook:1018(section/para)
 msgid ""
 "The <command>checkbranches</command> checks the module's branches are "
 "defined correctly within the version control system and the branches are "
 "consistent with the module set."
 msgstr ""
 
-#: C/jhbuild.xml:848(command)
-msgid "jhbuild checkbranches"
-msgstr ""
-
-#: C/jhbuild.xml:849(replaceable)
-msgid "branch"
-msgstr ""
-
-#: C/jhbuild.xml:849(arg)
-msgid "--branch=<placeholder-1/>"
+#: C/index.docbook:1022(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild checkbranches</command> <arg rep=\"repeat\">--"
+"branch=<replaceable>branch</replaceable></arg>"
 msgstr ""
+"<command>jhbuild checkbranches</command> <arg rep=\"repeat\">--"
+"branch=<replaceable>branch</replaceable></arg>"
 
-#: C/jhbuild.xml:854(term)
+#: C/index.docbook:1028(varlistentry/term)
 msgid ""
 "<option>--branch</option>=<replaceable>branch</replaceable>, <option>-b</"
-"option><replaceable>branch</replaceable>"
+"option> <replaceable>branch</replaceable>"
 msgstr ""
+"<option>--branch</option>=<replaceable>branch</replaceable>, <option>-b</"
+"option> <replaceable>branch</replaceable>"
 
-#: C/jhbuild.xml:856(simpara)
+#: C/index.docbook:1033(listitem/simpara)
+#, fuzzy
 msgid "The branch to check."
-msgstr ""
-
-#: C/jhbuild.xml:861(userinput)
-#, no-wrap
-msgid "jhbuild -m gnome-2.20 checkbranches"
-msgstr ""
+msgstr "ÎÎÎÎÏÎÏ ÎÎÎ ÎÎÏÎÎÎÏÎ"
 
-#: C/jhbuild.xml:861(screen)
+#: C/index.docbook:1038(section/screen)
 #, no-wrap
 msgid ""
-"<placeholder-1/> <placeholder-2/>\n"
+"<prompt>$</prompt> <userinput>jhbuild -m gnome-2.20 checkbranches</userinput>\n"
 "libgnomecanvas is missing branch definition for gnome-2-20\n"
-"<placeholder-3/>"
+"<prompt>$</prompt>"
 msgstr ""
+"<prompt>$</prompt> <userinput>jhbuild -m gnome-2.20 checkbranches</userinput>\n"
+"libgnomecanvas is missing branch definition for gnome-2-20\n"
+"<prompt>$</prompt>"
 
-#: C/jhbuild.xml:868(title)
+#: C/index.docbook:1044(section/title)
 msgid "clean"
-msgstr ""
+msgstr "clean"
 
-#: C/jhbuild.xml:870(para)
+#: C/index.docbook:1046(section/para)
 msgid ""
 "The <command>clean</command> command cleans the build directories of one or "
 "more modules."
 msgstr ""
 
-#: C/jhbuild.xml:874(command)
-msgid "jhbuild clean"
+#: C/index.docbook:1049(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild clean</command> <arg rep=\"repeat\">--"
+"skip=<replaceable>module</replaceable></arg> <arg>--start-"
+"at=<replaceable>module</replaceable></arg>"
 msgstr ""
+"<command>jhbuild clean</command> <arg rep=\"repeat\">--"
+"skip=<replaceable>module</replaceable></arg> <arg>--start-"
+"at=<replaceable>module</replaceable></arg>"
 
-#: C/jhbuild.xml:883(para)
+#: C/index.docbook:1058(section/para)
 msgid ""
 "See the <link linkend=\"command-reference-build\"><command>build</command></"
 "link> command documentation for a description of available options."
 msgstr ""
 
-#: C/jhbuild.xml:890(title)
+#: C/index.docbook:1064(section/title)
 msgid "dot"
-msgstr ""
+msgstr "dot"
 
-#: C/jhbuild.xml:892(para)
+#: C/index.docbook:1066(section/para)
 msgid ""
 "The <command>dot</command> command generates a file describing the directed "
 "graph formed by the dependencies between a set of modules. This file can "
@@ -1436,19 +1696,15 @@ msgid ""
 "\">GraphViz</ulink> software to produce a diagram."
 msgstr ""
 
-#: C/jhbuild.xml:899(command)
-msgid "jhbuild dot"
-msgstr ""
-
-#: C/jhbuild.xml:900(arg)
-msgid "--soft-deps"
-msgstr ""
-
-#: C/jhbuild.xml:901(arg)
-msgid "--clusters"
+#: C/index.docbook:1072(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild dot</command> <arg>--soft-deps</arg> <arg>--clusters</arg> "
+"<arg rep=\"repeat\">module</arg>"
 msgstr ""
+"<command>jhbuild dot</command> <arg>--soft-deps</arg> <arg>--clusters</arg> "
+"<arg rep=\"repeat\">module</arg>"
 
-#: C/jhbuild.xml:909(para)
+#: C/index.docbook:1082(section/para)
 msgid ""
 "The <option>--soft-deps</option> option adds dotted lines from the modules "
 "to the soft dependencies. The <option>--clusters</option> option groups "
@@ -1456,105 +1712,104 @@ msgid ""
 "link> together."
 msgstr ""
 
-#: C/jhbuild.xml:915(para)
+#: C/index.docbook:1088(section/para)
 msgid ""
 "The output of the dot command can be piped to the dot utility to generate a "
 "PostScript file:"
 msgstr ""
 
-#: C/jhbuild.xml:918(userinput)
+#: C/index.docbook:1091(section/screen)
 #, no-wrap
-msgid "jhbuild dot <placeholder-1/> | dot -Tps &gt; dependencies.ps"
-msgstr ""
+msgid "<prompt>$</prompt> <userinput>jhbuild dot <replaceable>modules</replaceable> | dot -Tps &gt; dependencies.ps</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild dot <replaceable>modules</replaceable> | dot -Tps &gt; dependencies.ps</userinput>"
 
-#: C/jhbuild.xml:920(para)
+#: C/index.docbook:1093(section/para)
 msgid "Or a PNG image:"
-msgstr ""
+msgstr "Î ÎÎÎ ÎÎÎÏÎÎ PNG:"
 
-#: C/jhbuild.xml:922(userinput)
+#: C/index.docbook:1095(section/screen)
 #, no-wrap
-msgid "jhbuild dot <placeholder-1/> | dot -Tpng &gt; dependencies.png"
-msgstr ""
+msgid "<prompt>$</prompt> <userinput>jhbuild dot <replaceable>modules</replaceable> | dot -Tpng &gt; dependencies.png</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild dot <replaceable>modules</replaceable> | dot -Tpng &gt; dependencies.png</userinput>"
 
-#: C/jhbuild.xml:925(title)
+#: C/index.docbook:1098(figure/title)
+#, fuzzy
 msgid "Sample JHBuild dot output"
-msgstr ""
+msgstr "ÎÎÎÎÎÎ ÎÏÎÏÎÎÎÏÎÎÏÎÏ ÏÏÎÎÏÎÎÎÎÏÎÏ, ÎÎÏÎÎÏ ÎÎÎÏÎÎÎÏÎ"
 
-#: C/jhbuild.xml:938(title)
+#: C/index.docbook:1110(section/title)
 msgid "gui"
-msgstr ""
+msgstr "gui"
 
-#: C/jhbuild.xml:940(para)
+#: C/index.docbook:1112(section/para)
 msgid ""
 "The <command>gui</command> command starts a graphical interface to JHBuild "
 "which can be used to select modules to build and change some options."
 msgstr ""
 
-#: C/jhbuild.xml:945(command)
-msgid "jhbuild gui"
-msgstr ""
+#: C/index.docbook:1116(section/cmdsynopsis)
+msgid "<command>jhbuild gui</command>"
+msgstr "<command>jhbuild gui</command>"
 
-#: C/jhbuild.xml:948(para)
+#: C/index.docbook:1119(section/para)
 msgid ""
 "The graphical interface is rendered using GTK, so extra support libraries "
 "are required."
 msgstr ""
 
-#: C/jhbuild.xml:953(title)
+#: C/index.docbook:1124(section/title)
 msgid "info"
-msgstr ""
+msgstr "info"
 
-#: C/jhbuild.xml:955(para)
+#: C/index.docbook:1126(section/para)
 msgid ""
 "The <command>info</command> command displays information about one or more "
 "modules."
 msgstr ""
 
-#: C/jhbuild.xml:959(command)
-msgid "jhbuild info"
+#: C/index.docbook:1129(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild info</command> <arg choice=\"plain\" rep=\"repeat\">module</"
+"arg>"
 msgstr ""
 
-#: C/jhbuild.xml:963(para)
+#: C/index.docbook:1133(section/para)
 msgid ""
 "The command displays the module name, type, dependencies, dependent "
-"packages, and the time it was last installed with JHBuild. If available, "
-"information specific to the module type such as the CVS repository or "
-"download URL will also be displayed."
+"packages, the source directory, and the time it was last installed with "
+"JHBuild. If available, information specific to the module type such as the "
+"CVS repository or download URL will also be displayed."
 msgstr ""
 
-#: C/jhbuild.xml:969(para)
+#: C/index.docbook:1139(section/para)
 msgid ""
 "If there is no module specified the command will display information about "
 "all the modules defined in the module set."
 msgstr ""
 
-#: C/jhbuild.xml:975(title)
+#: C/index.docbook:1144(section/title)
 msgid "list"
-msgstr ""
+msgstr "list"
 
-#: C/jhbuild.xml:977(para)
+#: C/index.docbook:1146(section/para)
 msgid ""
 "The <command>list</command> command displays the expanded list of modules "
 "the <command>build</command> command would build."
 msgstr ""
 
-#: C/jhbuild.xml:983(arg)
-msgid "-a"
-msgstr ""
-
-#: C/jhbuild.xml:984(arg)
-msgid "-r"
-msgstr ""
-
-#: C/jhbuild.xml:985(arg)
-msgid "-s"
-msgstr ""
-
-#: C/jhbuild.xml:989(arg) C/jhbuild.xml:1024(option)
-msgid "--list-optional-modules"
+#: C/index.docbook:1149(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild list</command> <arg>-a</arg> <arg>-r</arg> <arg>-s</arg> "
+"<arg>--start-at=<replaceable>module</replaceable></arg> <arg>--"
+"tags=<replaceable>tags</replaceable></arg> <arg>--ignore-suggests</arg> "
+"<arg>--list-optional-modules</arg> <arg rep=\"repeat\">module</arg>"
 msgstr ""
+"<command>jhbuild list</command> <arg>-a</arg> <arg>-r</arg> <arg>-s</arg> "
+"<arg>--start-at=<replaceable>module</replaceable></arg> <arg>--"
+"tags=<replaceable>tags</replaceable></arg> <arg>--ignore-suggests</arg> "
+"<arg>--list-optional-modules</arg> <arg rep=\"repeat\">module</arg>"
 
-#: C/jhbuild.xml:997(para)
+#: C/index.docbook:1164(section/para)
 msgid ""
 "The <option>--skip</option>, <option>--start-at</option>, <option>--tags</"
 "option>, and <option>--ignore-suggests</option> options are processed as per "
@@ -1562,239 +1817,386 @@ msgid ""
 "link> command."
 msgstr ""
 
-#: C/jhbuild.xml:1006(term)
+#: C/index.docbook:1172(varlistentry/term)
 msgid "<option>-a</option>, <option>--all-modules</option>"
-msgstr ""
+msgstr "<option>-a</option>, <option>--all-modules</option>"
 
-#: C/jhbuild.xml:1009(simpara)
+#: C/index.docbook:1176(listitem/simpara)
 msgid ""
 "List all the modules from the module set regardless of the build "
 "dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:1015(term)
+#: C/index.docbook:1181(varlistentry/term)
 msgid "<option>-r</option>, <option>--show-revision</option>"
-msgstr ""
+msgstr "<option>-r</option>, <option>--show-revision</option>"
 
-#: C/jhbuild.xml:1018(simpara)
+#: C/index.docbook:1185(listitem/simpara)
 msgid ""
 "If a module is set to a branch, show the branch name with the module name."
 msgstr ""
 
-#: C/jhbuild.xml:1026(simpara)
+#: C/index.docbook:1190(varlistentry/term)
+msgid "<option>--list-optional-modules</option>"
+msgstr "<option>--list-optional-modules</option>"
+
+#: C/index.docbook:1194(listitem/simpara)
 msgid "This option forces JHBuild to list optional dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:1035(title)
+#: C/index.docbook:1202(section/title)
 msgid "rdepends"
-msgstr ""
+msgstr "rdepends"
 
-#: C/jhbuild.xml:1037(para)
+#: C/index.docbook:1204(section/para)
 msgid ""
 "The <command>rdepends</command> command displays the reverse dependencies of "
 "a module."
 msgstr ""
 
-#: C/jhbuild.xml:1041(command)
-msgid "jhbuild rdepends"
-msgstr ""
+#: C/index.docbook:1207(section/cmdsynopsis)
+msgid "<command>jhbuild rdepends</command> <arg>module</arg>"
+msgstr "<command>jhbuild rdepends</command> <arg>module</arg>"
 
-#: C/jhbuild.xml:1047(option)
-msgid "--dependencies"
-msgstr ""
+#: C/index.docbook:1213(varlistentry/term)
+msgid "<option>--dependencies</option>"
+msgstr "<option>--dependencies</option>"
 
-#: C/jhbuild.xml:1049(simpara)
+#: C/index.docbook:1217(listitem/simpara)
+#, fuzzy
 msgid "Show dependency path next to modules."
-msgstr ""
+msgstr "ÎÎÏÎÎÎÏÎ ÏÎÏ ÏÎÏÎÎÎÏÎÎÏ ÎÎÎÏÏÎÏÎÏÎ ÎÎÏÎÎ ÏÏÎÏ ÎÎÏÏÎÏÎÏ"
 
-#: C/jhbuild.xml:1054(option)
-msgid "--direct"
-msgstr ""
+#: C/index.docbook:1221(varlistentry/term)
+msgid "<option>--direct</option>"
+msgstr "<option>--direct</option>"
 
-#: C/jhbuild.xml:1056(simpara)
+#: C/index.docbook:1225(listitem/simpara)
+#, fuzzy
 msgid "Limit display to modules directly depending on specified module."
-msgstr ""
+msgstr "ÏÎÏÎÎÏÎÏÎÏÏ ÎÎÏÎÎÎÏÎÏ ÏÏÎ ÎÎÎÏÎÏÏÎ ÏÏÎÏÏÎÎ ÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎ ÎÎÏÏÎÏÎ"
 
-#: C/jhbuild.xml:1064(title)
+#: C/index.docbook:1233(section/title)
 msgid "run"
-msgstr ""
+msgstr "run"
 
-#: C/jhbuild.xml:1066(para)
+#: C/index.docbook:1235(section/para)
 msgid ""
 "The <command>run</command> command runs the specified command using the same "
 "environment that JHBuild uses when building modules."
 msgstr ""
 
-#: C/jhbuild.xml:1071(command)
-msgid "jhbuild run"
-msgstr ""
-
-#: C/jhbuild.xml:1072(arg)
-msgid "--in-builddir"
-msgstr ""
-
-#: C/jhbuild.xml:1073(arg)
-msgid "--in-checkoutdir"
-msgstr ""
-
-#: C/jhbuild.xml:1075(replaceable)
-msgid "argument"
+#: C/index.docbook:1239(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild run</command> <arg>--in-builddir</arg> <arg>--in-"
+"checkoutdir</arg> <arg choice=\"plain\"><replaceable>program</replaceable></"
+"arg> <arg rep=\"repeat\"><replaceable>argument</replaceable></arg>"
 msgstr ""
+"<command>jhbuild run</command> <arg>--in-builddir</arg> <arg>--in-"
+"checkoutdir</arg> <arg choice=\"plain\"><replaceable>program</replaceable></"
+"arg> <arg rep=\"repeat\"><replaceable>argument</replaceable></arg>"
 
-#: C/jhbuild.xml:1078(para)
+#: C/index.docbook:1246(section/para)
 msgid ""
 "If using JHBuild to build GNOME, this command can be useful in X startup "
 "scripts."
 msgstr ""
 
-#: C/jhbuild.xml:1083(term)
+#: C/index.docbook:1251(varlistentry/term)
 msgid "<option>--in-builddir</option>=<replaceable>module</replaceable>"
-msgstr ""
+msgstr "<option>--in-builddir</option>=<replaceable>module</replaceable>"
 
-#: C/jhbuild.xml:1085(simpara)
+#: C/index.docbook:1255(listitem/simpara)
+#, fuzzy
 msgid "Run the command in the build directory of the specified module."
-msgstr ""
+msgstr "ÎÎÏÎÎÎÏÎ ÎÎÏÎÎÎÏ ÏÏÎ ÏÎÎÎÎÎ ÎÎÎÎÎÏÎÎÏÎÏ ÏÎÏ ÎÎÎÎÎÎÎÎÏ ÎÎÏÏÎÏÎÏ"
 
-#: C/jhbuild.xml:1093(term)
+#: C/index.docbook:1263(varlistentry/term)
 msgid "<option>--in-checkoutdir</option>=<replaceable>module</replaceable>"
-msgstr ""
+msgstr "<option>--in-checkoutdir</option>=<replaceable>module</replaceable>"
 
-#: C/jhbuild.xml:1095(simpara)
+#: C/index.docbook:1267(listitem/simpara)
 msgid "Run the command in the source directory of the specified module."
 msgstr ""
 
-#: C/jhbuild.xml:1104(title)
+#: C/index.docbook:1275(section/title)
 msgid "sanitycheck"
-msgstr ""
+msgstr "sanitycheck"
 
-#: C/jhbuild.xml:1106(para)
+#: C/index.docbook:1277(section/para)
 msgid ""
 "The <command>sanitycheck</command> command performs a number of checks to "
 "verify the build environment is okay."
 msgstr ""
 
-#: C/jhbuild.xml:1113(para)
+#: C/index.docbook:1280(section/cmdsynopsis)
+#| msgid "jhbuild sanitycheck"
+msgid "<command>jhbuild sanitycheck</command>"
+msgstr "<command>jhbuild sanitycheck</command>"
+
+#: C/index.docbook:1283(section/para)
 msgid "Some of the checks include:"
 msgstr ""
 
-#: C/jhbuild.xml:1117(simpara)
+#: C/index.docbook:1287(listitem/simpara)
 msgid "The checkout and install prefixes are writable."
 msgstr ""
 
-#: C/jhbuild.xml:1121(simpara)
+#: C/index.docbook:1290(listitem/simpara)
 msgid "The required build tools are installed."
 msgstr ""
 
-#: C/jhbuild.xml:1124(simpara)
+#: C/index.docbook:1293(listitem/simpara)
 msgid ""
 "Some commonly used macros are available in the search paths of the "
 "<command>aclocal</command> commands associated with the various versions of "
 "<command>automake</command>."
 msgstr ""
 
-#: C/jhbuild.xml:1130(simpara)
+#: C/index.docbook:1298(listitem/simpara)
 msgid "The XML catalog contains the DocBook DTD and stylesheets."
 msgstr ""
 
-#: C/jhbuild.xml:1138(title)
+#: C/index.docbook:1305(section/title)
 msgid "shell"
-msgstr ""
+msgstr "shell"
 
-#: C/jhbuild.xml:1140(para)
+#: C/index.docbook:1307(section/para)
 msgid ""
 "The <command>shell</command> command starts the user's shell with the same "
 "environment as JHBuild uses when building modules."
 msgstr ""
 
-#: C/jhbuild.xml:1148(para)
+#: C/index.docbook:1310(section/cmdsynopsis)
+msgid "<command>jhbuild shell</command>"
+msgstr "<command>jhbuild shell</command>"
+
+#: C/index.docbook:1313(section/para)
 msgid "This command is equivalent to the following:"
 msgstr ""
 
-#: C/jhbuild.xml:1150(userinput)
+#: C/index.docbook:1315(section/screen)
 #, no-wrap
-msgid "jhbuild run $SHELL"
+msgid "<prompt>$</prompt> <userinput>jhbuild run $SHELL</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild run $SHELL</userinput>"
+
+#: C/index.docbook:1317(section/para)
+msgid ""
+"The <envar>UNDER_JHBUILD</envar> environment variable will be set to \"true"
+"\" when this shell is active. You can use the presence of that variable to "
+"customize your shell's prompt to indicate that you indeed are under a "
+"jhbuild-controlled shell. For example, you may want to put this in your "
+"<filename>.bashrc</filename>:"
 msgstr ""
 
-#: C/jhbuild.xml:1154(title)
-msgid "tinderbox"
+#: C/index.docbook:1323(section/screen)
+#, no-wrap
+msgid ""
+"\n"
+"\tif [ -n \"$UNDER_JHBUILD\" ]; then\n"
+"\t    PS1=\"[jhbuild] $PS1\"\n"
+"\tfi\n"
+"      "
 msgstr ""
+"\n"
+"\tif [ -n \"$UNDER_JHBUILD\" ]; then\n"
+"\t    PS1=\"[jhbuild] $PS1\"\n"
+"\tfi\n"
+"      "
 
-#: C/jhbuild.xml:1156(para)
+#: C/index.docbook:1329(section/para)
 msgid ""
-"The <command>tinderbox</command> command is similar to <command>build</"
-"command>, but writes all terminal output to HTML files suitable for "
-"publishing on a website. It can be used to set up systems similar to "
-"Mozilla's Tinderbox, or Debian's Buildd."
+"This will make your bash shell display <literal>[jhbuild]</literal> before "
+"your normal prompt, making it easier to see which shells are under a jhbuild "
+"environment."
 msgstr ""
 
-#: C/jhbuild.xml:1163(command)
-msgid "jhbuild tinderbox"
+#: C/index.docbook:1335(section/title)
+msgid "sysdeps"
+msgstr "sysdeps"
+
+#: C/index.docbook:1337(section/para)
+msgid "The <command>sysdeps</command> command displays:"
+msgstr "Î ÎÎÏÎÎÎ <command>sysdeps</command> ÎÎÏÎÎÎÎÎÎ:"
+
+#: C/index.docbook:1341(listitem/simpara)
+msgid ""
+"a list of installed system packages which will be used during the build. "
+"JHBuild will not build these modules and opt to use the system package "
+"instead."
 msgstr ""
 
-#: C/jhbuild.xml:1167(replaceable)
-msgid "directory"
+#: C/index.docbook:1346(listitem/simpara)
+msgid ""
+"a list of required packages. To begin a build the packages must be provided "
+"by your system."
 msgstr ""
 
-#: C/jhbuild.xml:1167(arg)
-msgid "--output=<placeholder-1/>"
+#: C/index.docbook:1350(listitem/simpara)
+msgid ""
+"a list of optional packages. The corresponding system package was not found "
+"or too old. JHBuild will build the module. Optional packages will not be "
+"displayed if <link linkend=\"cfg-partial-build\"><varname>partial_build</"
+"varname></link> is <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1171(arg)
-msgid "-C"
+#: C/index.docbook:1358(section/cmdsynopsis)
+msgid "<command>jhbuild sysdeps</command> <arg>--install</arg>"
+msgstr "<command>jhbuild sysdeps</command> <arg>--install</arg>"
+
+#: C/index.docbook:1364(varlistentry/term)
+msgid "<option>--install</option>"
+msgstr "<option>--install</option>"
+
+#: C/index.docbook:1368(listitem/simpara)
+msgid ""
+"This option installs system packages which are dependencies of the "
+"moduleset. The installation method depends on your distribution. System "
+"packages are installed using <application>PackageKit</application>, if "
+"available. For distributions using <application>APT</application> such as "
+"<systemitem class=\"osname\">Debian</systemitem> and <systemitem class="
+"\"osname\">Ubuntu</systemitem>, this option requires <application>apt-file</"
+"application> to be installed."
 msgstr ""
 
-#: C/jhbuild.xml:1172(arg)
-msgid "-N"
+#: C/index.docbook:1382(example/title)
+#, fuzzy
+msgid "<command>sysdeps</command> example"
+msgstr "ÎÎÏÎÎÎÎÎÎÎ ÎÎÎÎÏÎÎÏ ÏÏÎÎÎÎÏÎÏ"
+
+#: C/index.docbook:1383(example/screen)
+#, no-wrap
+msgid ""
+"<prompt>$</prompt> <userinput>jhbuild sysdeps</userinput>\n"
+"System installed packages which are new enough:\n"
+"  speex (speex.pc required=1.2rc1, installed=1.2rc1)\n"
+"  lcms2 (lcms2.pc required=2.2, installed=2.2)\n"
+"...\n"
+"Required packages:\n"
+"  System installed packages which are too old:\n"
+"    (none)\n"
+"  No matching system package installed:\n"
+"    zlib (zlib.pc required=1.2)\n"
+"Optional packages: (JHBuild will build the missing packages)\n"
+"  System installed packages which are too old:\n"
+"    WebKit (webkitgtk-3.0.pc required=1.5.1, installed=1.4.0)\n"
+"    ...\n"
+"  No matching system package installed:\n"
+"    pulseaudio (libpulse.pc required=2.0)\n"
+"    ..."
+msgstr ""
+"<prompt>$</prompt> <userinput>jhbuild sysdeps</userinput>\n"
+"System installed packages which are new enough:\n"
+"  speex (speex.pc required=1.2rc1, installed=1.2rc1)\n"
+"  lcms2 (lcms2.pc required=2.2, installed=2.2)\n"
+"...\n"
+"Required packages:\n"
+"  System installed packages which are too old:\n"
+"    (none)\n"
+"  No matching system package installed:\n"
+"    zlib (zlib.pc required=1.2)\n"
+"Optional packages: (JHBuild will build the missing packages)\n"
+"  System installed packages which are too old:\n"
+"    WebKit (webkitgtk-3.0.pc required=1.5.1, installed=1.4.0)\n"
+"    ...\n"
+"  No matching system package installed:\n"
+"    pulseaudio (libpulse.pc required=2.0)\n"
+"    ..."
+
+#: C/index.docbook:1404(section/title)
+msgid "tinderbox"
+msgstr "tinderbox"
+
+#: C/index.docbook:1406(section/para)
+msgid ""
+"The <command>tinderbox</command> command is similar to <command>build</"
+"command>, but writes all terminal output to HTML files suitable for "
+"publishing on a website. It can be used to set up systems similar to "
+"Mozilla's Tinderbox, or Debian's Buildd."
 msgstr ""
 
-#: C/jhbuild.xml:1173(arg)
-msgid "-f"
+#: C/index.docbook:1411(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild tinderbox</command> <arg>--clean</arg> <arg>--distclean</"
+"arg> <arg>--no-network</arg> <arg>--output=<replaceable>directory</"
+"replaceable></arg> <arg rep=\"repeat\">--skip=<replaceable>module</"
+"replaceable></arg> <arg>--start-at=<replaceable>module</replaceable></arg> "
+"<arg>-D <replaceable>date</replaceable></arg> <arg>-C</arg> <arg>-N</arg> "
+"<arg>-f</arg> <arg>--nodeps</arg> <arg rep=\"repeat\">module</arg>"
 msgstr ""
+"<command>jhbuild tinderbox</command> <arg>--clean</arg> <arg>--distclean</"
+"arg> <arg>--no-network</arg> <arg>--output=<replaceable>directory</"
+"replaceable></arg> <arg rep=\"repeat\">--skip=<replaceable>module</"
+"replaceable></arg> <arg>--start-at=<replaceable>module</replaceable></arg> "
+"<arg>-D <replaceable>date</replaceable></arg> <arg>-C</arg> <arg>-N</arg> "
+"<arg>-f</arg> <arg>--nodeps</arg> <arg rep=\"repeat\">module</arg>"
 
-#: C/jhbuild.xml:1177(para)
+#: C/index.docbook:1426(section/para)
 msgid ""
-"The <option>--autogen</option>, <option>--clean</option>, <option>--no-"
+"The <option>--clean</option>, <option>--distclean</option>, <option>--no-"
 "network</option>, <option>--skip</option>, <option>--start-at</option>, "
-"<option>-D</option>, <option>-C</option>, <option>-N</option> and <option>-"
-"f</option> options are processed as per the <link linkend=\"command-"
-"reference-build\"><command>build</command></link> command."
+"<option>-D</option>, <option>-C</option>, <option>-N</option>, <option>-f</"
+"option> and <option>--nodeps</option> options are processed as per the <link "
+"linkend=\"command-reference-build\"><command>build</command></link> command."
 msgstr ""
 
-#: C/jhbuild.xml:1187(term)
+#: C/index.docbook:1436(varlistentry/term)
 msgid ""
 "<option>-o</option>, <option>--output</option>=<replaceable>directory</"
 "replaceable>"
 msgstr ""
+"<option>-o</option>, <option>--output</option>=<replaceable>directory</"
+"replaceable>"
 
-#: C/jhbuild.xml:1190(simpara)
-msgid "The directory to write the HTML files."
+#: C/index.docbook:1441(listitem/simpara)
+msgid ""
+"The directory to write the HTML files. JHBuild will create an index "
+"(<filename>index.html</filename>) and a HTML file for each module."
 msgstr ""
 
-#: C/jhbuild.xml:1198(title)
+#: C/index.docbook:1450(section/title)
 msgid "uninstall"
-msgstr ""
+msgstr "uninstall"
 
-#: C/jhbuild.xml:1200(para)
+#: C/index.docbook:1452(section/para)
 msgid ""
 "The <command>uninstall</command> command uninstalls one or more modules."
 msgstr ""
 
-#: C/jhbuild.xml:1204(command)
-msgid "jhbuild uninstall"
+#: C/index.docbook:1455(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild uninstall</command> <arg choice=\"plain\" rep=\"repeat"
+"\">module</arg>"
 msgstr ""
+"<command>jhbuild uninstall</command> <arg choice=\"plain\" rep=\"repeat"
+"\">module</arg>"
 
-#: C/jhbuild.xml:1211(title)
+#: C/index.docbook:1461(section/title)
 msgid "update"
-msgstr ""
+msgstr "ÎÎÎÎÎÏÏÏÎ"
 
-#: C/jhbuild.xml:1213(para)
+#: C/index.docbook:1463(section/para)
 msgid ""
 "The <command>update</command> command is similar to <command>build</"
 "command>, but only performs the download or update stage for modules without "
 "building them."
 msgstr ""
 
-#: C/jhbuild.xml:1227(para)
+#: C/index.docbook:1467(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild update</command> <arg rep=\"repeat\">--"
+"skip=<replaceable>module</replaceable></arg> <arg>--start-"
+"at=<replaceable>module</replaceable></arg> <arg>--tags=<replaceable>tags</"
+"replaceable></arg> <arg>--ignore-suggests</arg> <arg>-D <replaceable>date</"
+"replaceable></arg> <arg rep=\"repeat\">module</arg>"
+msgstr ""
+"<command>jhbuild update</command> <arg rep=\"repeat\">--"
+"skip=<replaceable>module</replaceable></arg> <arg>--start-"
+"at=<replaceable>module</replaceable></arg> <arg>--tags=<replaceable>tags</"
+"replaceable></arg> <arg>--ignore-suggests</arg> <arg>-D <replaceable>date</"
+"replaceable></arg> <arg rep=\"repeat\">module</arg>"
+
+#: C/index.docbook:1476(section/para)
 msgid ""
 "The <option>--skip</option>, <option>--start-at</option>, <option>--tags</"
 "option>, <option>--ignore-suggests</option> and <option>-D</option> options "
@@ -1802,204 +2204,223 @@ msgid ""
 "\"><command>build</command></link> command."
 msgstr ""
 
-#: C/jhbuild.xml:1236(title)
+#: C/index.docbook:1484(section/title)
 msgid "updateone"
-msgstr ""
+msgstr "updateone"
 
-#: C/jhbuild.xml:1238(para)
+#: C/index.docbook:1486(section/para)
 msgid ""
 "The <command>updateone</command> command is similar to <command>update</"
 "command>, but it does not update the dependent modules. It is useful for "
 "updating one or more modules."
 msgstr ""
 
-#: C/jhbuild.xml:1243(command)
-msgid "jhbuild updateone"
+#: C/index.docbook:1490(section/cmdsynopsis)
+msgid ""
+"<command>jhbuild updateone</command> <arg>-D <replaceable>date</"
+"replaceable></arg> <arg choice=\"plain\" rep=\"repeat\">module</arg>"
 msgstr ""
+"<command>jhbuild updateone</command> <arg>-D <replaceable>date</"
+"replaceable></arg> <arg choice=\"plain\" rep=\"repeat\">module</arg>"
 
-#: C/jhbuild.xml:1248(para)
+#: C/index.docbook:1495(section/para)
 msgid ""
 "The <option>-D</option> option is processed as per the <link linkend="
 "\"command-reference-build\"><command>build</command></link> command."
 msgstr ""
 
-#: C/jhbuild.xml:1259(title)
+#: C/index.docbook:1504(section/title)
 msgid "Configuration File Reference"
 msgstr ""
 
-#: C/jhbuild.xml:1261(para)
+#: C/index.docbook:1506(section/para)
 msgid ""
-"The <filename>~/.jhbuildrc</filename> file uses standard Python syntax. The "
-"file is run, and the resulting variables defined in the namespace are used "
-"to control how JHBuild acts. A set of default values are inserted into the "
-"namespace before running the user's configuration file."
+"The <filename>~/.config/jhbuildrc</filename> file uses standard Python "
+"syntax. The file is run, and the resulting variables defined in the "
+"namespace are used to control how JHBuild acts. A set of default values are "
+"inserted into the namespace before running the user's configuration file."
 msgstr ""
 
-#: C/jhbuild.xml:1267(para)
+#: C/index.docbook:1512(section/para)
 msgid ""
 "Boolean configuration variables are set using syntax as demonstrated in the "
 "following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1269(programlisting)
+#: C/index.docbook:1515(section/programlisting)
 #, no-wrap
 msgid "use_local_modulesets = True"
-msgstr ""
+msgstr "use_local_modulesets = True"
 
-#: C/jhbuild.xml:1271(para)
+#: C/index.docbook:1517(section/para)
 msgid ""
 "String configuration variables are set using syntax as demonstrated in the "
 "following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1273(programlisting)
+#: C/index.docbook:1520(section/programlisting)
 #, no-wrap
 msgid "autogenargs = '--disable-static --disable-gtk-doc'"
-msgstr ""
+msgstr "autogenargs = '--disable-static --disable-gtk-doc'"
 
-#: C/jhbuild.xml:1275(para)
+#: C/index.docbook:1522(section/para)
 msgid ""
 "List configuration variables are set using syntax as demonstrated in the "
 "following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1277(programlisting)
+#: C/index.docbook:1525(section/programlisting)
 #, no-wrap
 msgid "skip = ['mozilla', 'pulseaudio']"
-msgstr ""
+msgstr "skip = ['mozilla', 'pulseaudio']"
 
-#: C/jhbuild.xml:1279(para)
+#: C/index.docbook:1527(section/para)
 msgid ""
 "Dictionary configuration variables are set using syntax as demonstrated in "
 "the following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1281(programlisting) C/jhbuild.xml:1707(programlisting)
+#: C/index.docbook:1530(section/programlisting)
+#: C/index.docbook:2070(listitem/programlisting)
 #, no-wrap
 msgid "repos['git.gnome.org'] = 'ssh://username git gnome org/git/'"
-msgstr ""
+msgstr "repos['git.gnome.org'] = 'ssh://username git gnome org/git/'"
 
-#: C/jhbuild.xml:1284(title)
+#: C/index.docbook:1533(section/title)
 msgid "Configuration Variables"
 msgstr ""
 
-#: C/jhbuild.xml:1289(varname)
-msgid "alwaysautogen"
-msgstr ""
-
-#: C/jhbuild.xml:1291(simpara)
-msgid ""
-"A boolean value if set to <constant>True</constant>, always run "
-"<command>autogen.sh</command> before <command>make</command>, even if a "
-"makefile exists. This is equivalent to passing <option>--always-autogen</"
-"option> option to JHBuild. Defaults to <constant>False</constant>."
-msgstr ""
+#: C/index.docbook:1538(varlistentry/term)
+msgid "<varname>autogenargs</varname>"
+msgstr "<varname>autogenargs</varname>"
 
-#: C/jhbuild.xml:1302(simpara)
+#: C/index.docbook:1542(listitem/simpara)
 msgid ""
 "A string containing arguments passed to the <command>autogen.sh</command> "
 "script of all modules. Can be overridden for particular modules using the "
 "<varname>module_autogenargs</varname> dictionary."
 msgstr ""
 
-#: C/jhbuild.xml:1310(varname)
-msgid "branches"
-msgstr ""
+#: C/index.docbook:1549(varlistentry/term)
+msgid "<varname>branches</varname>"
+msgstr "<varname>branches</varname>"
 
-#: C/jhbuild.xml:1312(simpara)
+#: C/index.docbook:1553(listitem/simpara)
 msgid ""
-"A dictionary that can be used to override the branch used for a particular "
-"module. This is useful if you are making some changes on a branch of a "
-"module and want JHBuild to build that branch instead of the one listed in "
-"the module set."
+"A dictionary specifying which branch to use for specific modules. This is "
+"useful if you are making some changes on a branch of a module and want "
+"JHBuild to build that branch instead of the one listed in the module set."
 msgstr ""
 
-#: C/jhbuild.xml:1317(simpara)
+#: C/index.docbook:1558(listitem/simpara)
 msgid "The definition of branches depends on the module VCS:"
 msgstr ""
 
-#: C/jhbuild.xml:1320(simpara)
+#: C/index.docbook:1563(listitem/simpara)
 msgid "CVS: revision. E.g. <literal>'BRANCH-PROJECT-0_8'</literal>"
 msgstr ""
 
-#: C/jhbuild.xml:1323(simpara)
+#: C/index.docbook:1567(listitem/simpara)
 msgid ""
 "Bazaar: URI of module branch. E.g. <literal>'http://bzr.example.net/project/";
 "gnome-2-28'</literal>"
 msgstr ""
 
-#: C/jhbuild.xml:1326(simpara)
+#: C/index.docbook:1572(listitem/simpara)
 msgid ""
 "Git: tuple, with first part being an optional repository (or the None value) "
 "and the second part the name of the branch. E.g. <literal>('git://git."
 "example.net/project', 'gnome-2-28')</literal>"
 msgstr ""
 
-#: C/jhbuild.xml:1331(simpara)
+#: C/index.docbook:1578(example/title)
+msgid "Simple example"
+msgstr "ÎÎÏÎÎÎÎÎÎÎ"
+
+#: C/index.docbook:1579(example/programlisting)
+#, no-wrap
+msgid "branches['modulename'] = (None, 'branchname')"
+msgstr "branches['modulename'] = (None, 'branchname')"
+
+#: C/index.docbook:1583(listitem/simpara)
 msgid ""
 "Subversion: URI of module branch E.g. <literal>'svn://svn.example.net/"
 "project/gnome-2-28'</literal>"
 msgstr ""
 
-#: C/jhbuild.xml:1338(varname)
-msgid "builddir_pattern"
-msgstr ""
+#: C/index.docbook:1591(varlistentry/term)
+msgid "<varname>builddir_pattern</varname>"
+msgstr "<varname>builddir_pattern</varname>"
 
-#: C/jhbuild.xml:1340(simpara)
+#: C/index.docbook:1595(listitem/simpara)
 msgid ""
 "A <function>printf</function> style formatting pattern used to generate "
 "build directory names. This is only used when using separate source and "
 "build trees. The <literal>%s</literal> in the format string will be replaced "
-"with the source directory name. Defaults to <literal>'%s'</literal>."
+"with <varname>checkoutdir</varname>. Defaults to <literal>'%s'</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1349(varname)
-msgid "buildroot"
-msgstr ""
+#: C/index.docbook:1604(varlistentry/term)
+msgid "<varname>buildroot</varname>"
+msgstr "<varname>buildroot</varname>"
 
-#: C/jhbuild.xml:1351(simpara)
+#: C/index.docbook:1608(listitem/simpara)
 msgid ""
 "A string specifying the parent directory to place build trees. Defaults to "
 "<constant>None</constant>, which causes builds to be performed within the "
 "source trees."
 msgstr ""
 
-#: C/jhbuild.xml:1358(varname)
-msgid "buildscript"
-msgstr ""
+#: C/index.docbook:1614(varlistentry/term)
+msgid "<varname>buildscript</varname>"
+msgstr "<varname>buildscript</varname>"
 
-#: C/jhbuild.xml:1360(simpara)
+#: C/index.docbook:1618(listitem/simpara)
 msgid ""
 "A string specifying which buildscript to use. The recommended setting is the "
 "default, <literal>terminal</literal>. In particular, do not set to "
 "<literal>gtk</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1367(varname)
-msgid "build_policy"
-msgstr ""
+#: C/index.docbook:1624(varlistentry/term)
+msgid "<varname>build_policy</varname>"
+msgstr "<varname>build_policy</varname>"
 
-#: C/jhbuild.xml:1369(simpara)
+#: C/index.docbook:1628(listitem/simpara)
 msgid ""
 "A string specifying which modules to build. The three possible options are "
 "<literal>all</literal>, to build all modules requested, <literal>updated</"
 "literal> to build only modules which have changed, or <literal>updated-deps</"
 "literal> to build modules which have changed or which have dependencies "
-"which have changed. Defaults to <literal>all</literal>."
+"which have changed. Defaults to <literal>updated-deps</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1381(simpara)
+#: C/index.docbook:1637(varlistentry/term)
+msgid "<varname>checkoutroot</varname>"
+msgstr "<varname>checkoutroot</varname>"
+
+#: C/index.docbook:1641(listitem/simpara)
+#, fuzzy
+#| msgid ""
+#| "A string specifying the directory to unpack source trees to. Unless <link "
+#| "linkend=\"cfg-buildroot\"><varname>buildroot</varname></link> is set, "
+#| "builds will occur in this directory too. Defaults to <filename>~/checkout/"
+#| "gnome2</filename>."
 msgid ""
 "A string specifying the directory to unpack source trees to. Unless "
 "<varname>buildroot</varname> is set, builds will occur in this directory "
-"too. Defaults to <filename>~/checkout/gnome2</filename>."
+"too. Defaults to <filename>~/checkout/gnome</filename>."
 msgstr ""
+"ÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ Î ÎÏÎÎÎ ÎÎÎÎÏÎÎÎÎ ÏÎ ÏÎÎÎÎÎ ÏÏÎÎ ÎÏÎÎÎ ÎÎ ÎÎÏÎÎÎÏÎÏÎÏÏÎÏÎ "
+"ÏÎ ÎÎÎÎÏÎ ÎÏÎÎÎÎ. ÎÎÏÏÏ ÎÎÎ ÎÎ ÎÎÎÎÎ ÎÏÎÏÎÎÎÎ Î <link linkend=\"cfg-buildroot"
+"\"><varname>buildroot</varname></link>, ÏÎ ÎÏÎÏÎÎÎÏÎ ÎÎ ÎÎÎÎÎÏÎÎ ÎÎÎ ÏÎ ÎÏÏÏ "
+"ÏÎ ÏÎÎÎÎÎ. Î ÏÏÎÎÏÎÎÎÎÎ ÎÎÎÎÎ <filename>~/checkout/gnome2</filename>."
 
-#: C/jhbuild.xml:1388(varname)
-msgid "checkout_mode"
-msgstr ""
+#: C/index.docbook:1648(varlistentry/term)
+msgid "<varname>checkout_mode</varname>"
+msgstr "<varname>checkout_mode</varname>"
 
-#: C/jhbuild.xml:1390(simpara)
+#: C/index.docbook:1652(listitem/simpara)
 msgid ""
 "A string specifying how the checkout is performed for directories in version "
 "control. Defaults to <literal>update</literal>. This can be set per module "
@@ -2011,32 +2432,58 @@ msgid ""
 "different from the one it will build)."
 msgstr ""
 
-#: C/jhbuild.xml:1404(varname)
-msgid "copy_dir"
-msgstr ""
+#: C/index.docbook:1665(varlistentry/term)
+msgid "<varname>copy_dir</varname>"
+msgstr "<varname>copy_dir</varname>"
 
-#: C/jhbuild.xml:1406(simpara)
+#: C/index.docbook:1669(listitem/simpara)
+#, fuzzy
+#| msgid ""
+#| "A string specifying the directory to unpack source trees to. Unless <link "
+#| "linkend=\"cfg-buildroot\"><varname>buildroot</varname></link> is set, "
+#| "builds will occur in this directory too. Defaults to <filename>~/checkout/"
+#| "gnome2</filename>."
 msgid ""
 "A string specifying the directory to copy to, if the copy <link linkend="
-"\"cfg-checkout-mode\"><varname>checkout_mode</varname></link> is in use. "
+"\"cfg-checkout-mode\"> <varname>checkout_mode</varname></link> is in use. "
 "Defaults to the checkout directory."
 msgstr ""
+"ÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ Î ÎÏÎÎÎ ÎÎÎÎÏÎÎÎÎ ÏÎ ÏÎÎÎÎÎ ÏÏÎÎ ÎÏÎÎÎ ÎÎ ÎÎÏÎÎÎÏÎÏÎÏÏÎÏÎ "
+"ÏÎ ÎÎÎÎÏÎ ÎÏÎÎÎÎ. ÎÎÏÏÏ ÎÎÎ ÎÎ ÎÎÎÎÎ ÎÏÎÏÎÎÎÎ Î <link linkend=\"cfg-buildroot"
+"\"><varname>buildroot</varname></link>, ÏÎ ÎÏÎÏÎÎÎÏÎ ÎÎ ÎÎÎÎÎÏÎÎ ÎÎÎ ÏÎ ÎÏÏÏ "
+"ÏÎ ÏÎÎÎÎÎ. Î ÏÏÎÎÏÎÎÎÎÎ ÎÎÎÎÎ <filename>~/checkout/gnome2</filename>."
 
-#: C/jhbuild.xml:1413(varname)
-msgid "cvs_program"
-msgstr ""
+#: C/index.docbook:1676(varlistentry/term)
+msgid "<varname>cvs_program</varname>"
+msgstr "<varname>cvs_program</varname>"
 
-#: C/jhbuild.xml:1415(simpara)
+#: C/index.docbook:1680(listitem/simpara)
 msgid ""
-"A string specifying which program to use for CVS support. Defaults to "
+"A string specifying which program to use for CVS support. This can be "
+"<literal>git-cvsimport</literal>, or <literal>cvs</literal>. Defaults to "
 "<literal>cvs</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1420(varname)
-msgid "installprog"
+#: C/index.docbook:1687(varlistentry/term)
+msgid "<varname>dvcs_mirror_dir</varname>"
+msgstr "<varname>dvcs_mirror_dir</varname>"
+
+#: C/index.docbook:1691(listitem/simpara)
+msgid ""
+"A string specifying a local mirror directory. JHBuild will create local "
+"mirrors of repositories at the specified directory. The mirrors can be "
+"shared by multiple repository groups, saving space and time because hard-"
+"links will be used for local clones. The commands <command>update</command> "
+"and <command>updateone</command> will create the mirrors and fetch new "
+"commits from the online repositories. This option is only supported by Git "
+"and Bazaar repositories."
 msgstr ""
 
-#: C/jhbuild.xml:1422(simpara)
+#: C/index.docbook:1702(varlistentry/term)
+msgid "<varname>installprog</varname>"
+msgstr "<varname>installprog</varname>"
+
+#: C/index.docbook:1706(listitem/simpara)
 msgid ""
 "A string specifying a program to use as replacement for <literal>/usr/bin/"
 "install</literal>. If available, defaults to the <literal>install-check</"
@@ -2044,85 +2491,89 @@ msgid ""
 "wrapper optimizes header installation to reduce the time taken for rebuilds."
 msgstr ""
 
-#: C/jhbuild.xml:1432(varname)
-msgid "ignore_suggests"
-msgstr ""
+#: C/index.docbook:1714(varlistentry/term)
+msgid "<varname>ignore_suggests</varname>"
+msgstr "<varname>ignore_suggests</varname>"
 
-#: C/jhbuild.xml:1434(simpara)
+#: C/index.docbook:1718(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to ignore soft dependencies when "
 "calculating the dependency tree. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1440(varname)
-msgid "interact"
-msgstr ""
+#: C/index.docbook:1724(varlistentry/term)
+msgid "<varname>interact</varname>"
+msgstr "<varname>interact</varname>"
 
-#: C/jhbuild.xml:1442(simpara)
+#: C/index.docbook:1728(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to interact with the user. Setting this "
 "value to <constant>False</constant> is equivalent to passing the <option>--"
 "no-interact</option> option. Defaults to <constant>True</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1458(varname)
-msgid "makecheck"
-msgstr ""
+#: C/index.docbook:1735(varlistentry/term)
+msgid "<varname>makeargs</varname>"
+msgstr "<varname>makeargs</varname>"
+
+#: C/index.docbook:1746(varlistentry/term)
+msgid "<varname>makecheck</varname>"
+msgstr "<varname>makecheck</varname>"
 
-#: C/jhbuild.xml:1460(simpara)
+#: C/index.docbook:1750(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to run <command>make check</command> "
 "after <command>make</command>. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1467(varname)
-msgid "makecheck_advisory"
-msgstr ""
+#: C/index.docbook:1756(varlistentry/term)
+msgid "<varname>makecheck_advisory</varname>"
+msgstr "<varname>makecheck_advisory</varname>"
 
-#: C/jhbuild.xml:1469(simpara)
+#: C/index.docbook:1760(listitem/simpara)
 msgid ""
 "A boolean value specifying whether failures when running <command>make "
 "check</command> should be advisory only and not cause a build failure. "
 "Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1475(varname)
-msgid "makeclean"
-msgstr ""
+#: C/index.docbook:1767(varlistentry/term)
+msgid "<varname>makeclean</varname>"
+msgstr "<varname>makeclean</varname>"
 
-#: C/jhbuild.xml:1477(simpara)
+#: C/index.docbook:1771(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to run <command>make clean</command> "
 "before <command>make</command>. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1484(varname)
-msgid "makedist"
-msgstr ""
+#: C/index.docbook:1777(varlistentry/term)
+msgid "<varname>makedist</varname>"
+msgstr "<varname>makedist</varname>"
 
-#: C/jhbuild.xml:1486(simpara)
+#: C/index.docbook:1781(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to run <command>make dist</command> after "
 "<command>make</command>. Defaults to <constant>False</constant>. This "
 "setting is equivalent to passing the <option>--dist</option> option."
 msgstr ""
 
-#: C/jhbuild.xml:1494(varname)
-msgid "makedistcheck"
-msgstr ""
+#: C/index.docbook:1788(varlistentry/term)
+msgid "<varname>makedistcheck</varname>"
+msgstr "<varname>makedistcheck</varname>"
 
-#: C/jhbuild.xml:1496(simpara)
+#: C/index.docbook:1792(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to run <command>make distcheck</command> "
 "after <command>make</command>. Defaults to <constant>False</constant>. This "
 "setting is equivalent to passing the <option>--distcheck</option> option."
 msgstr ""
 
-#: C/jhbuild.xml:1504(varname)
-msgid "module_autogenargs"
-msgstr ""
+#: C/index.docbook:1799(varlistentry/term)
+msgid "<varname>module_autogenargs</varname>"
+msgstr "<varname>module_autogenargs</varname>"
 
-#: C/jhbuild.xml:1506(simpara)
+#: C/index.docbook:1803(listitem/simpara)
 msgid ""
 "A dictionary mapping module names to strings specifying the arguments to be "
 "passed to <command>autogen.sh</command>. The setting in "
@@ -2131,21 +2582,21 @@ msgid ""
 "in the dictionary, the global <varname>autogenargs</varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1516(varname)
-msgid "module_checkout_mode"
-msgstr ""
+#: C/index.docbook:1812(varlistentry/term)
+msgid "<varname>module_checkout_mode</varname>"
+msgstr "<varname>module_checkout_mode</varname>"
 
-#: C/jhbuild.xml:1518(simpara)
+#: C/index.docbook:1816(listitem/simpara)
 msgid ""
 "A dictionary specifying which checkout mode to use for modules. This "
 "overrides the global <varname>checkout_mode</varname> setting."
 msgstr ""
 
-#: C/jhbuild.xml:1524(varname)
-msgid "module_makeargs"
-msgstr ""
+#: C/index.docbook:1822(varlistentry/term)
+msgid "<varname>module_makeargs</varname>"
+msgstr "<varname>module_makeargs</varname>"
 
-#: C/jhbuild.xml:1526(simpara)
+#: C/index.docbook:1826(listitem/simpara)
 msgid ""
 "A dictionary mapping module names to strings specifying the arguments to "
 "pass to <command>make</command>. The setting in <varname>module_makeargs</"
@@ -2154,11 +2605,11 @@ msgid ""
 "varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1536(varname)
-msgid "module_makecheck"
-msgstr ""
+#: C/index.docbook:1835(varlistentry/term)
+msgid "<varname>module_makecheck</varname>"
+msgstr "<varname>module_makecheck</varname>"
 
-#: C/jhbuild.xml:1538(simpara)
+#: C/index.docbook:1839(listitem/simpara)
 msgid ""
 "A dictionary mapping module names to boolean values specifying whether to "
 "run <command>make check</command> after <command>make</command>. The setting "
@@ -2167,11 +2618,11 @@ msgid ""
 "dictionary, the global <varname>makecheck</varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1549(varname)
-msgid "module_nopoison"
-msgstr ""
+#: C/index.docbook:1849(varlistentry/term)
+msgid "<varname>module_nopoison</varname>"
+msgstr "<varname>module_nopoison</varname>"
 
-#: C/jhbuild.xml:1551(simpara)
+#: C/index.docbook:1853(listitem/simpara)
 msgid ""
 "A dictionary mapping module names to boolean values. If a module is set to "
 "<constant>True</constant>, JHBuild will attempt to build dependent modules "
@@ -2181,42 +2632,62 @@ msgid ""
 "<varname>nopoison</varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1562(varname)
-msgid "module_extra_env"
-msgstr ""
+#: C/index.docbook:1863(varlistentry/term)
+msgid "<varname>module_extra_env</varname>"
+msgstr "<varname>module_extra_env</varname>"
 
-#: C/jhbuild.xml:1564(simpara)
+#: C/index.docbook:1867(listitem/simpara)
 msgid ""
 "A dictionary mapping module names to dictionaries with extra environment "
 "variables to pass when executing commands for the module."
 msgstr ""
 
-#: C/jhbuild.xml:1596(varname)
-msgid "modulesets_dir"
-msgstr ""
+#: C/index.docbook:1873(varlistentry/term)
+msgid "<varname>modules</varname>"
+msgstr "<varname>modules</varname>"
+
+#: C/index.docbook:1886(varlistentry/term)
+msgid "<varname>moduleset</varname>"
+msgstr "<varname>moduleset</varname>"
 
-#: C/jhbuild.xml:1598(simpara)
+#: C/index.docbook:1901(varlistentry/term)
+msgid "<varname>modulesets_dir</varname>"
+msgstr "<varname>modulesets_dir</varname>"
+
+#: C/index.docbook:1905(listitem/simpara)
 msgid ""
 "A string specifying the directory containing the modulesets to use. Defaults "
 "to the <filename>modulesets/</filename> directory in JHBuild sources."
 msgstr ""
 
-#: C/jhbuild.xml:1605(varname)
-msgid "nobuild"
+#: C/index.docbook:1912(varlistentry/term)
+msgid "<varname>nice_build</varname>"
+msgstr "<varname>nice_build</varname>"
+
+#: C/index.docbook:1916(listitem/simpara)
+msgid ""
+"Run builds under the <constant>SCHED_IDLE</constant> priority on Linux, "
+"<command>nice</command> on other Unix. This can dramatically improve desktop "
+"interactivity for parallel builds while having only a negligible impact on "
+"build throughput."
 msgstr ""
 
-#: C/jhbuild.xml:1607(simpara)
+#: C/index.docbook:1924(varlistentry/term)
+msgid "<varname>nobuild</varname>"
+msgstr "<varname>nobuild</varname>"
+
+#: C/index.docbook:1928(listitem/simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> JHBuild will not build "
 "modules, but just download and unpack the sources. The default vale is "
 "<constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1614(varname)
-msgid "nonetwork"
-msgstr ""
+#: C/index.docbook:1934(varlistentry/term)
+msgid "<varname>nonetwork</varname>"
+msgstr "<varname>nonetwork</varname>"
 
-#: C/jhbuild.xml:1616(simpara)
+#: C/index.docbook:1938(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to access the network. This affects "
 "checking out or updating CVS modules, downloading tarballs and updating "
@@ -2225,23 +2696,22 @@ msgid ""
 "<constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1625(varname)
-msgid "nonotify"
-msgstr ""
+#: C/index.docbook:1947(varlistentry/term)
+msgid "<varname>nonotify</varname>"
+msgstr "<varname>nonotify</varname>"
 
-#: C/jhbuild.xml:1627(simpara)
+#: C/index.docbook:1951(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to emit notifications using the "
-"notification daemon. If set to <constant>True</constant>, notifications are "
-"not emitted. Defaults to <constant>False</constant>, except on Win32 where "
-"it defaults to <constant>True</constant>."
+"notification daemon. If set to <constant>False</constant>, notifications are "
+"emitted. Defaults to <constant>True</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1635(varname)
-msgid "nopoison"
-msgstr ""
+#: C/index.docbook:1958(varlistentry/term)
+msgid "<varname>nopoison</varname>"
+msgstr "<varname>nopoison</varname>"
 
-#: C/jhbuild.xml:1637(simpara)
+#: C/index.docbook:1962(listitem/simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> JHBuild attempts to "
 "build modules even if one or more of the module's dependencies failed to "
@@ -2249,23 +2719,22 @@ msgid ""
 "argument. The default value is <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1645(varname)
-msgid "notrayicon"
-msgstr ""
+#: C/index.docbook:1970(varlistentry/term)
+msgid "<varname>notrayicon</varname>"
+msgstr "<varname>notrayicon</varname>"
 
-#: C/jhbuild.xml:1647(simpara)
+#: C/index.docbook:1974(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to show an icon in the system tray using "
-"Zenity. If set to <constant>True</constant>, notifications are not emitted. "
-"Defaults to <constant>False</constant> except from on Win32, where it "
-"defaults to <constant>True</constant>."
+"Zenity. If set to <constant>False</constant>, notifications are emitted. "
+"Defaults to <constant>True</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1655(varname)
-msgid "noxvfb"
-msgstr ""
+#: C/index.docbook:1981(varlistentry/term)
+msgid "<varname>noxvfb</varname>"
+msgstr "<varname>noxvfb</varname>"
 
-#: C/jhbuild.xml:1657(simpara)
+#: C/index.docbook:1985(listitem/simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> JHBuild will run any "
 "graphical tests on the real X server, rather than using <command>Xvfb</"
@@ -2273,39 +2742,70 @@ msgid ""
 "The default value is <constant>False</constant>"
 msgstr ""
 
-#: C/jhbuild.xml:1673(varname)
-msgid "pretty_print"
+#: C/index.docbook:1993(varlistentry/term)
+msgid "<varname>partial_build</varname>"
+msgstr "<varname>partial_build</varname>"
+
+#: C/index.docbook:1997(listitem/simpara)
+msgid ""
+"A boolean value, if set to <constant>True</constant> JHBuild will not build "
+"dependency modules if corresponding system packages are installed and "
+"sufficient version. Defaults to <constant>True</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1675(simpara)
+#: C/index.docbook:2004(varlistentry/term)
+msgid "<varname>prefix</varname>"
+msgstr "<varname>prefix</varname>"
+
+#: C/index.docbook:2015(varlistentry/term)
+msgid "<varname>pretty_print</varname>"
+msgstr "<varname>pretty_print</varname>"
+
+#: C/index.docbook:2019(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to pretty format the subprocess output. "
 "Only CVS output supports pretty printing. Disable if the pretty printing "
 "causes problems. Defaults to <literal>True</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1682(varname)
-msgid "progress_bar"
+#: C/index.docbook:2026(varlistentry/term)
+msgid "<varname>print_command_pattern</varname>"
+msgstr "<varname>print_command_pattern</varname>"
+
+#: C/index.docbook:2030(listitem/simpara)
+msgid ""
+"A string displayed before JHBuild executes a command. <varname>%(command)s</"
+"varname> in the string will be replaced with the command about to be "
+"executed. <varname>%(cwd)s</varname> in the string will be replaced with the "
+"current working directory. Defaults to <literal>'%(command)s'</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1684(simpara)
+#: C/index.docbook:2038(varlistentry/term)
+msgid "<varname>progress_bar</varname>"
+msgstr "<varname>progress_bar</varname>"
+
+#: C/index.docbook:2042(listitem/simpara)
 msgid ""
 "A boolean value specifying whether to display a progress bar during <link "
 "linkend=\"cfg-quiet-mode\">quiet mode </link>. Defaults to <literal>True</"
 "literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1690(varname)
-msgid "quiet_mode"
-msgstr ""
+#: C/index.docbook:2048(varlistentry/term)
+msgid "<varname>quiet_mode</varname>"
+msgstr "<varname>quiet_mode</varname>"
 
-#: C/jhbuild.xml:1692(simpara)
+#: C/index.docbook:2052(listitem/simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> disables the output of "
 "running commands. Defaults to <literal>False</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1700(simpara)
+#: C/index.docbook:2058(varlistentry/term)
+msgid "<varname>repos</varname>"
+msgstr "<varname>repos</varname>"
+
+#: C/index.docbook:2062(listitem/simpara)
 msgid ""
 "A dictionary specifying an alternative repository location for a particular "
 "repository. This configuration variable is useful to a module developer. By "
@@ -2314,21 +2814,21 @@ msgid ""
 "values are the alternative repository location strings. For example:"
 msgstr ""
 
-#: C/jhbuild.xml:1711(varname)
-msgid "skip"
-msgstr ""
+#: C/index.docbook:2074(varlistentry/term)
+msgid "<varname>skip</varname>"
+msgstr "<varname>skip</varname>"
 
-#: C/jhbuild.xml:1713(simpara)
+#: C/index.docbook:2078(listitem/simpara)
 msgid ""
 "A list of modules to skip. This <option>--skip</option> command line option "
 "extends the list. This list is empty by default."
 msgstr ""
 
-#: C/jhbuild.xml:1719(varname)
-msgid "sticky_date"
-msgstr ""
+#: C/index.docbook:2084(varlistentry/term)
+msgid "<varname>sticky_date</varname>"
+msgstr "<varname>sticky_date</varname>"
 
-#: C/jhbuild.xml:1721(simpara)
+#: C/index.docbook:2088(listitem/simpara)
 msgid ""
 "A string if set, and if supported by the underlying version control system, "
 "JHBuild will update the source tree to the specified date before building. "
@@ -2337,22 +2837,22 @@ msgid ""
 "literal>. Defaults to <constant>None</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1730(varname)
-msgid "svn_program"
-msgstr ""
+#: C/index.docbook:2097(varlistentry/term)
+msgid "<varname>svn_program</varname>"
+msgstr "<varname>svn_program</varname>"
 
-#: C/jhbuild.xml:1732(simpara)
+#: C/index.docbook:2101(listitem/simpara)
 msgid ""
 "A string specifying which program to use for subversion support. This can be "
-"<literal>svn</literal> or <literal>bzr</literal>. Defaults to <literal>svn</"
-"literal>."
+"<literal>svn</literal>, <literal>git-svn</literal> or <literal>bzr</"
+"literal>. Defaults to <literal>svn</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1739(varname)
-msgid "tarballdir"
-msgstr ""
+#: C/index.docbook:2108(varlistentry/term)
+msgid "<varname>tarballdir</varname>"
+msgstr "<varname>tarballdir</varname>"
 
-#: C/jhbuild.xml:1741(simpara)
+#: C/index.docbook:2112(listitem/simpara)
 msgid ""
 "A string if set, tarballs will be downloaded to the specified directory "
 "instead of <varname>checkoutroot</varname>. This is useful if you have "
@@ -2360,11 +2860,11 @@ msgid ""
 "varname> and want to reduce bandwidth usage."
 msgstr ""
 
-#: C/jhbuild.xml:1749(varname)
-msgid "tinderbox_outputdir"
-msgstr ""
+#: C/index.docbook:2120(varlistentry/term)
+msgid "<varname>tinderbox_outputdir</varname>"
+msgstr "<varname>tinderbox_outputdir</varname>"
 
-#: C/jhbuild.xml:1751(simpara)
+#: C/index.docbook:2124(listitem/simpara)
 msgid ""
 "A string specifying the directory to store <command>jhbuild tinderbox</"
 "command> output. This string can be overridden by the <option>--output</"
@@ -2373,11 +2873,11 @@ msgid ""
 "file."
 msgstr ""
 
-#: C/jhbuild.xml:1760(varname)
-msgid "trycheckout"
-msgstr ""
+#: C/index.docbook:2133(varlistentry/term)
+msgid "<varname>trycheckout</varname>"
+msgstr "<varname>trycheckout</varname>"
 
-#: C/jhbuild.xml:1762(simpara)
+#: C/index.docbook:2137(listitem/simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> JHBuild will "
 "automatically try to solve failures by 1) running <command>autogen.sh</"
@@ -2386,11 +2886,11 @@ msgid ""
 "option> option."
 msgstr ""
 
-#: C/jhbuild.xml:1771(varname)
-msgid "use_lib64"
-msgstr ""
+#: C/index.docbook:2146(varlistentry/term)
+msgid "<varname>use_lib64</varname>"
+msgstr "<varname>use_lib64</varname>"
 
-#: C/jhbuild.xml:1773(simpara)
+#: C/index.docbook:2150(listitem/simpara)
 msgid ""
 "A boolean value that specifies whether to install libraries to "
 "<filename>lib64</filename> directories. If set, <literal>--libdir=\\"
@@ -2400,66 +2900,69 @@ msgid ""
 "<constant>False</constant> on other systems."
 msgstr ""
 
-#: C/jhbuild.xml:1784(varname)
-msgid "use_local_modulesets"
-msgstr ""
+#: C/index.docbook:2160(varlistentry/term)
+msgid "<varname>use_local_modulesets</varname>"
+msgstr "<varname>use_local_modulesets</varname>"
 
-#: C/jhbuild.xml:1786(simpara)
+#: C/index.docbook:2164(listitem/simpara)
 msgid ""
 "A boolean value that specifies to use modulesets that were checked out along "
 "the JHBuild source code; instead of downloading them on-the-fly from GNOME "
 "version control system. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1794(varname)
-msgid "xvfbargs"
-msgstr ""
+#: C/index.docbook:2171(varlistentry/term)
+msgid "<varname>xvfbargs</varname>"
+msgstr "<varname>xvfbargs</varname>"
 
-#: C/jhbuild.xml:1796(simpara)
+#: C/index.docbook:2175(listitem/simpara)
 msgid ""
 "A string listing arguments to pass to <command>Xvfb</command> if running "
 "graphical tests."
 msgstr ""
 
-#: C/jhbuild.xml:1804(title)
+#: C/index.docbook:2183(section/title)
+#, fuzzy
 msgid "Other Configuration File Structures"
-msgstr ""
+msgstr "ÎÏÎÏÏÏÎ Î ÎÎÎÎÎÏÏÎ ÏÎÏ ÎÏÏÎÎÎÏ ÏÏÎÎÎÏÎÏÎ"
 
-#: C/jhbuild.xml:1806(para)
+#: C/index.docbook:2185(section/para)
 msgid ""
 "In addition to the above variables, there are other settings that can be set "
 "in the configuration file:"
 msgstr ""
 
-#: C/jhbuild.xml:1811(varname)
-msgid "os.environ"
-msgstr ""
+#: C/index.docbook:2190(varlistentry/term)
+msgid "<varname>os.environ</varname>"
+msgstr "<varname>os.environ</varname>"
 
-#: C/jhbuild.xml:1813(para)
+#: C/index.docbook:2194(listitem/para)
 msgid ""
 "A dictionary representing the environment. This environment is passed to "
 "processes that JHBuild spawns."
 msgstr ""
 
-#: C/jhbuild.xml:1815(para)
+#: C/index.docbook:2197(listitem/para)
 msgid ""
 "Some influential environment variables include <envar>CPPFLAGS</envar>, "
 "<envar>CFLAGS</envar>, <envar>INSTALL</envar> and <envar>LDFLAGS</envar>. "
 "For example:"
 msgstr ""
 
-#: C/jhbuild.xml:1819(programlisting)
+#: C/index.docbook:2202(listitem/programlisting)
 #, no-wrap
 msgid "os.environ['CFLAGS'] = '-O0 -g'"
-msgstr ""
+msgstr "os.environ['CFLAGS'] = '-O0 -g'"
 
-#: C/jhbuild.xml:1823(term)
+#: C/index.docbook:2206(varlistentry/term)
 msgid ""
 "<function>addpath</function>(<parameter>envvar</parameter>, "
 "<parameter>pathname</parameter>)"
 msgstr ""
+"<function>addpath</function>(<parameter>envvar</parameter>, "
+"<parameter>pathname</parameter>)"
 
-#: C/jhbuild.xml:1826(para)
+#: C/index.docbook:2211(listitem/para)
 msgid ""
 "This will add a directory to the <envar>PATH</envar> environment variable. "
 "<function>addpath</function> will correctly handle the case when the "
@@ -2468,38 +2971,41 @@ msgid ""
 "consequences)."
 msgstr ""
 
-#: C/jhbuild.xml:1832(para)
+#: C/index.docbook:2217(listitem/para)
 msgid ""
 "<function>addpath</function> has special handling for the "
 "<envar>ACLOCAL_FLAGS</envar> environment variable, which expects paths to be "
 "listed in the form <literal>-I <replaceable>pathname</replaceable></literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1839(term)
+#: C/index.docbook:2224(varlistentry/term)
 msgid ""
 "<function>prependpath</function>(<parameter>envvar</parameter>, "
 "<parameter>pathname</parameter>)"
 msgstr ""
+"<function>prependpath</function>(<parameter>envvar</parameter>, "
+"<parameter>pathname</parameter>)"
 
-#: C/jhbuild.xml:1842(para)
+#: C/index.docbook:2229(listitem/para)
 msgid ""
 "After processing the configuration file, JHBuild will alter some paths based "
 "on variables such as <varname>prefix</varname> (e.g. adding <literal>$prefix/"
 "bin</literal> to the start of <envar>PATH</envar>)."
 msgstr ""
 
-#: C/jhbuild.xml:1847(para)
+#: C/index.docbook:2234(listitem/para)
 msgid ""
 "The <function>prependpath</function> function works like <function>addpath</"
 "function>, except that the environment variable is modified after JHBuild "
 "has made its changes to the environment."
 msgstr ""
 
-#: C/jhbuild.xml:1858(title)
+#: C/index.docbook:2245(section/title)
+#, fuzzy
 msgid "Module Set File Syntax"
-msgstr ""
+msgstr "ÎÏÎÏÏÎ ÎÎÎ ÎÎÎÏÏÎÏÎ ÎÏÏÎÎÎÏ ÎÎÎ LOCATION."
 
-#: C/jhbuild.xml:1860(para)
+#: C/index.docbook:2247(section/para)
 msgid ""
 "JHBuild uses XML files to describe the dependencies between modules. A RELAX-"
 "NG schema and Document Type Definition are included with JHBuild in the "
@@ -2507,7 +3013,7 @@ msgid ""
 "to edit module set files using <literal>nxml-mode</literal> in Emacs."
 msgstr ""
 
-#: C/jhbuild.xml:1866(para)
+#: C/index.docbook:2253(section/para)
 msgid ""
 "The top-level element in a module set file is <sgmltag class=\"element"
 "\">moduleset</sgmltag> element. No XML namespace is used. The elements below "
@@ -2515,11 +3021,12 @@ msgid ""
 "module definitions."
 msgstr ""
 
-#: C/jhbuild.xml:1872(title) C/jhbuild.xml:2495(title)
+#: C/index.docbook:2259(section/title) C/index.docbook:3028(section/title)
+#, fuzzy
 msgid "Module Sources"
-msgstr ""
+msgstr "ÎÎÎÎÏ ÏÎÏÎÎÎÏÎÎÏ:"
 
-#: C/jhbuild.xml:1874(para)
+#: C/index.docbook:2261(section/para)
 msgid ""
 "Rather than listing the full location of every module, a number of \"module "
 "sources\" are listed in the module set, and then referenced by name in the "
@@ -2529,13 +3036,15 @@ msgid ""
 "developers and users to use different repository access methods)."
 msgstr ""
 
-#: C/jhbuild.xml:1883(para)
+#: C/index.docbook:2269(section/para)
 msgid ""
 "The <sgmltag class=\"element\">repository</sgmltag> element is used to "
-"describe all types of repository."
+"describe all types of repository. The <sgmltag class=\"element\">branch</"
+"sgmltag> element is used inside module definition to specify additional "
+"settings."
 msgstr ""
 
-#: C/jhbuild.xml:1886(programlisting)
+#: C/index.docbook:2274(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2549,204 +3058,414 @@ msgid ""
 "  [ server=\"<replaceable>server</replaceable>\" ]\n"
 "  [ database=\"<replaceable>database</replaceable>\" ]\n"
 "  [ defbranch=\"<replaceable>defbranch</replaceable>\" ]\n"
+"  [ trunk-template=\"<replaceable>trunk-template</replaceable>\" ]\n"
+"  [ branches-template=\"<replaceable>branches-template</replaceable>\" ]\n"
+"  [ tags-template=\"<replaceable>tags-template</replaceable>\" ]\n"
 "  [ developer-href-example=\"<replaceable>developer-href-example</replaceable>\" ] /&gt;\n"
 msgstr ""
+"\n"
+"&lt;repository name=\"<replaceable>name</replaceable>\"\n"
+"  type=\"<replaceable>type</replaceable>\"\n"
+"  [ default=\"<replaceable>default</replaceable>\" ]\n"
+"  [ password=\"<replaceable>password</replaceable>\" ]\n"
+"  [ cvsroot=\"<replaceable>cvsroot</replaceable>\" ]\n"
+"  [ archive=\"<replaceable>archive</replaceable>\" ]\n"
+"  [ href=\"<replaceable>href</replaceable>\" ]\n"
+"  [ server=\"<replaceable>server</replaceable>\" ]\n"
+"  [ database=\"<replaceable>database</replaceable>\" ]\n"
+"  [ defbranch=\"<replaceable>defbranch</replaceable>\" ]\n"
+"  [ trunk-template=\"<replaceable>trunk-template</replaceable>\" ]\n"
+"  [ branches-template=\"<replaceable>branches-template</replaceable>\" ]\n"
+"  [ tags-template=\"<replaceable>tags-template</replaceable>\" ]\n"
+"  [ developer-href-example=\"<replaceable>developer-href-example</replaceable>\" ] /&gt;\n"
 
-#: C/jhbuild.xml:1900(para)
+#: C/index.docbook:2291(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute is a unique "
 "identifier for the repository."
 msgstr ""
 
-#: C/jhbuild.xml:1903(para)
+#: C/index.docbook:2294(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">default</sgmltag> attribute specifies "
 "whether this repository is the default source for this module set."
 msgstr ""
 
-#: C/jhbuild.xml:1907(para)
+#: C/index.docbook:2298(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">type</sgmltag> attribute specifies the type "
-"of repository. It can be one of: <literal>arch</literal>, <literal>bzr</"
-"literal>, <literal>cvs</literal>, <literal>darcs</literal>, <literal>git</"
-"literal>, <literal>hg</literal>, <literal>mtr</literal>, <literal>svn</"
-"literal>, <literal>tarball</literal>. Other attributes depends on the "
+"of repository. It can be one of: <literal>bzr</literal>, <literal>cvs</"
+"literal>, <literal>darcs</literal>, <literal>fossil</literal>, <literal>git</"
+"literal>, <literal>hg</literal>, <literal>mnt</literal>, <literal>svn</"
+"literal>, <literal>tarball</literal>. Other attributes depend on the "
 "<sgmltag class=\"attribute\">type</sgmltag>, as well as the <sgmltag class="
 "\"element\">branch</sgmltag> used inside module definitions. Those are "
-"described below."
+"described below in the repository type sub-sections."
 msgstr ""
 
-#: C/jhbuild.xml:1918(para)
+#: C/index.docbook:2310(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">developer-href-example</sgmltag> attribute "
 "is used to specify the format of the URL for the repository used by "
 "developers. This is informational only."
 msgstr ""
 
-#: C/jhbuild.xml:1923(title)
-msgid "Arch"
+#: C/index.docbook:2314(section/para)
+msgid ""
+"The <sgmltag class=\"element\">branch</sgmltag> element is used inside "
+"module definitions."
+msgstr ""
+
+#: C/index.docbook:2317(section/programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;branch\n"
+"  [ repo=\"<replaceable>repository</replaceable>\" ]\n"
+"  [ module=\"<replaceable>module name</replaceable>\" ]\n"
+"  [ checkoutdir=\"<replaceable>checkoutdir</replaceable>\" ]\n"
+"  [ revision=\"<replaceable>revision</replaceable>\" ]\n"
+"  [ tag=\"<replaceable>tag</replaceable>\" ]\n"
+"  [ update-new-dirs=\"<replaceable>update-new-dirs</replaceable>\" ]\n"
+"  [ override-checkoutdir=\"<replaceable>override-checkoutdir</replaceable>\" ]\n"
+"  [ subdir=\"<replaceable>subdir</replaceable>\" ]\n"
+"  [ branch=\"<replaceable>branch</replaceable>\" ]\n"
+"  [ version=\"<replaceable>version</replaceable>\" ]\n"
+"  [ size=\"<replaceable>size</replaceable>\" ]\n"
+"  [ source-subdir=\"<replaceable>source-subdir</replaceable>\" ]\n"
+"  [ hash=\"<replaceable>hash</replaceable>\" ]/&gt;\n"
+msgstr ""
+"\n"
+"&lt;branch\n"
+"  [ repo=\"<replaceable>repository</replaceable>\" ]\n"
+"  [ module=\"<replaceable>module name</replaceable>\" ]\n"
+"  [ checkoutdir=\"<replaceable>checkoutdir</replaceable>\" ]\n"
+"  [ revision=\"<replaceable>revision</replaceable>\" ]\n"
+"  [ tag=\"<replaceable>tag</replaceable>\" ]\n"
+"  [ update-new-dirs=\"<replaceable>update-new-dirs</replaceable>\" ]\n"
+"  [ override-checkoutdir=\"<replaceable>override-checkoutdir</replaceable>\" ]\n"
+"  [ subdir=\"<replaceable>subdir</replaceable>\" ]\n"
+"  [ branch=\"<replaceable>branch</replaceable>\" ]\n"
+"  [ version=\"<replaceable>version</replaceable>\" ]\n"
+"  [ size=\"<replaceable>size</replaceable>\" ]\n"
+"  [ source-subdir=\"<replaceable>source-subdir</replaceable>\" ]\n"
+"  [ hash=\"<replaceable>hash</replaceable>\" ]/&gt;\n"
+
+#: C/index.docbook:2334(section/para)
+msgid ""
+"All atributes have sensible defaults and depend on the module and repository "
+"definitions. Common attributes are described here."
+msgstr ""
+
+#: C/index.docbook:2337(section/para)
+msgid ""
+"The <sgmltag class=\"attribute\">repo</sgmltag> attribute is used to specify "
+"non-default repository name."
 msgstr ""
 
-#: C/jhbuild.xml:1925(para)
-msgid "This repository type is used to define a Arch repository."
+#: C/index.docbook:2340(section/para)
+msgid ""
+"The <sgmltag class=\"attribute\">module</sgmltag> attribute is used to "
+"specify module name to checkout from the repository. Defaults to module id."
 msgstr ""
 
-#: C/jhbuild.xml:1927(para)
+#: C/index.docbook:2344(section/para)
 msgid ""
-"The <sgmltag class=\"attribute\">archive</sgmltag> attribute is used to "
-"specify the archive to use."
+"The <sgmltag class=\"attribute\">checkoutdir</sgmltag> attribute is used to "
+"specify the checkout directory name. Defaults to module id."
+msgstr ""
+
+#: C/index.docbook:2348(section/para)
+msgid "Other attributes are described below"
 msgstr ""
 
-#: C/jhbuild.xml:1930(para)
+#: C/index.docbook:2351(section/title)
+msgid "Bazaar"
+msgstr "Bazaar"
+
+#: C/index.docbook:2353(section/para)
 msgid ""
-"The <sgmltag class=\"attribute\">href</sgmltag> attribute is used to specify "
-"the URL of the repository."
+"This repository type is used to define a Bazaar repository. It is "
+"recommended to have Bazaar 1.16 or higher."
 msgstr ""
 
-#: C/jhbuild.xml:1933(programlisting)
+#: C/index.docbook:2356(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
-"&lt;repository type=\"arch\" name=\"rhythmbox\"\n"
-"    archive=\"rhythmbox-devel gnome org--2004\"\n"
-"    href=\"http://web.rhythmbox.org/arch/2004\"/&gt;\n";
+"&lt;repository type=\"bzr\" name=\"launchpad.net\"\n"
+"      href=\"lp:\"/&gt;\n"
+"        "
+msgstr ""
+"\n"
+"&lt;repository type=\"bzr\" name=\"launchpad.net\"\n"
+"      href=\"lp:\"/&gt;\n"
+"        "
+
+#: C/index.docbook:2361(section/para)
+msgid ""
+"Additional attributes are: <sgmltag class=\"attribute\">trunk-template</"
+"sgmltag> (defaults to <literal>\"%(module)s\"</literal>) and <sgmltag class="
+"\"attribute\">branches-template</sgmltag> (defaults to <literal>\"%(module)s/"
+"%(branch)s</literal>\"). These attributes are used to specify templates for "
+"constructing URL. A <sgmltag class=\"element\">branch</sgmltag> element in "
+"the module definitions can specify <sgmltag class=\"attribute\">branch</"
+"sgmltag> and <sgmltag class=\"attribute\">user</sgmltag> attributes. These "
+"values will be substitued in the templates. If either of those are defined "
+"<sgmltag class=\"attribute\">branches-template</sgmltag> is used, otherwise "
+"<sgmltag class=\"attribute\">trunk-template</sgmltag> is used. This way you "
+"can ovveride repository to build modules from your personal branch or build "
+"many modules fron a repository with non-standard layout."
 msgstr ""
 
-#: C/jhbuild.xml:1942(title)
-msgid "Bazaar"
+#: C/index.docbook:2377(section/para)
+msgid ""
+"An addition <sgmltag class=\"element\">branch</sgmltag> element accepts "
+"<sgmltag class=\"attribute\">revspec</sgmltag> attibute to anchor on a "
+"particular revision. Any valid <literal>bzr revspec</literal> is accepted, "
+"for example <literal>date:yesterday, -5, tag:0.1</literal> to get first "
+"revision since yesterday, 5 commits behind the tip or tag \"0.1\". See "
+"<literal>bzr help revisionspec</literal> for all possible values."
 msgstr ""
 
-#: C/jhbuild.xml:1943(para)
-msgid "This repository type is used to define a Bazaar repository."
+#: C/index.docbook:2385(section/para)
+msgid ""
+"For example repository with <sgmltag class=\"attribute\">template</sgmltag> "
+"attributes defined:"
 msgstr ""
 
-#: C/jhbuild.xml:1945(programlisting)
+#: C/index.docbook:2389(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"bzr\" name=\"launchpad.net\"\n"
-"      href=\"http://bazaar.launchpad.net/\"/&gt;\n";
+"      href=\"lp:\"\n"
+"      trunk-template=\"~bzr-pqm/%(module)s/bzr.dev\"\n"
+"      branches-template=\"~bzr-pqm/%(module)s/%(branch)s\"/&gt;\n"
+"        "
+msgstr ""
+"\n"
+"&lt;repository type=\"bzr\" name=\"launchpad.net\"\n"
+"      href=\"lp:\"\n"
+"      trunk-template=\"~bzr-pqm/%(module)s/bzr.dev\"\n"
+"      branches-template=\"~bzr-pqm/%(module)s/%(branch)s\"/&gt;\n"
+"        "
+
+#: C/index.docbook:2396(section/para)
+msgid ""
+"Example <sgmltag class=\"element\">branch</sgmltag> elements for the above "
+"repository:"
 msgstr ""
 
-#: C/jhbuild.xml:1952(title)
-msgid "CVS"
+#: C/index.docbook:2399(section/programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;branch repo=\"launchpad.net\"\n"
+"      module=\"bzr\"\n"
+"      checkoutdir=\"bzr-next\"/&gt;\n"
+"        "
+msgstr ""
+"\n"
+"&lt;branch repo=\"launchpad.net\"\n"
+"      module=\"bzr\"\n"
+"      checkoutdir=\"bzr-next\"/&gt;\n"
+"        "
+
+#: C/index.docbook:2405(section/programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;branch repo=\"launchpad.net\"\n"
+"      module=\"bzr\"\n"
+"      branch=\"2.2\"\n"
+"      checkoutdir=\"bzr-beta\"/&gt;\n"
+"        "
 msgstr ""
+"\n"
+"&lt;branch repo=\"launchpad.net\"\n"
+"      module=\"bzr\"\n"
+"      branch=\"2.2\"\n"
+"      checkoutdir=\"bzr-beta\"/&gt;\n"
+"        "
+
+#: C/index.docbook:2414(section/title)
+msgid "CVS"
+msgstr "CVS"
 
-#: C/jhbuild.xml:1953(para)
+#: C/index.docbook:2416(section/para)
 msgid "This repository type is used to define a CVS repository."
 msgstr ""
 
-#: C/jhbuild.xml:1955(para)
+#: C/index.docbook:2418(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">password</sgmltag> attribute is used to "
 "specify the password to the repository."
 msgstr ""
 
-#: C/jhbuild.xml:1959(para)
+#: C/index.docbook:2421(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">cvsroot</sgmltag> attribute is used to "
 "specify the root of the repository."
 msgstr ""
 
-#: C/jhbuild.xml:1963(programlisting)
+#: C/index.docbook:2424(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"cvs\" name=\"tango.freedesktop.org\"\n"
 "    cvsroot=\":pserver:anoncvs anoncvs freedesktop org:/cvs/tango\"\n"
 "    password=\"\"/&gt;\n"
+"        "
+msgstr ""
+"\n"
+"&lt;repository type=\"cvs\" name=\"tango.freedesktop.org\"\n"
+"    cvsroot=\":pserver:anoncvs anoncvs freedesktop org:/cvs/tango\"\n"
+"    password=\"\"/&gt;\n"
+"        "
+
+#: C/index.docbook:2432(section/para)
+msgid ""
+"Additional attributes are: <sgmltag class=\"attribute\">revision</sgmltag>, "
+"<sgmltag class=\"attribute\">update-new-dirs</sgmltag> and <sgmltag class="
+"\"attribute\">override-checkoutdir</sgmltag>."
 msgstr ""
 
-#: C/jhbuild.xml:1972(title)
+#: C/index.docbook:2439(section/title)
 msgid "Darcs"
-msgstr ""
+msgstr "Darcs"
 
-#: C/jhbuild.xml:1973(para)
+#: C/index.docbook:2441(section/para)
 msgid "This repository type is used to define a Darcs repository."
 msgstr ""
 
-#: C/jhbuild.xml:1975(programlisting)
+#: C/index.docbook:2444(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"darcs\" name=\"telepathy.freedesktop.org\"\n"
 "      href=\"http://projects.collabora.co.uk/darcs/telepathy/\"/&gt;\n";
 msgstr ""
+"\n"
+"&lt;repository type=\"darcs\" name=\"telepathy.freedesktop.org\"\n"
+"      href=\"http://projects.collabora.co.uk/darcs/telepathy/\"/&gt;\n";
 
-#: C/jhbuild.xml:1982(title)
+#: C/index.docbook:2451(section/title)
 msgid "Git"
-msgstr ""
+msgstr "Git"
 
-#: C/jhbuild.xml:1983(para)
+#: C/index.docbook:2453(section/para)
 msgid "This repository type is used to define a Git repository."
 msgstr ""
 
-#: C/jhbuild.xml:1985(programlisting)
+#: C/index.docbook:2455(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"git\" name=\"git.freedesktop.org\"\n"
 "    href=\"git://anongit.freedesktop.org/git/\"/&gt;\n"
+"        "
+msgstr ""
+"\n"
+"&lt;repository type=\"git\" name=\"git.freedesktop.org\"\n"
+"    href=\"git://anongit.freedesktop.org/git/\"/&gt;\n"
+"        "
+
+#: C/index.docbook:2460(section/para) C/index.docbook:2582(section/para)
+msgid ""
+"It allows the following attributes on the <sgmltag class=\"element\">branch</"
+"sgmltag> element:"
 msgstr ""
 
-#: C/jhbuild.xml:1990(programlisting)
+#: C/index.docbook:2464(section/para)
+msgid ""
+"The <sgmltag class=\"attribute\">revision</sgmltag> attribute is used to "
+"specify a local or remote-tracking branch to switch to in the update phase. "
+"It defaults to 'master'. It is possible to override this attribute with the "
+"<varname>branches</varname> configuration variable. The switch will only be "
+"performed, if the current branch is tracking a remote branch, to not disturb "
+"your own work."
+msgstr ""
+
+#: C/index.docbook:2471(section/para)
+msgid ""
+"The <sgmltag class=\"attribute\">tag</sgmltag> attribute is used to specify "
+"a revision to unconditionally check out in the update phase. It overrides "
+"the <sgmltag class=\"attribute\">revision</sgmltag> attribute."
+msgstr ""
+
+#: C/index.docbook:2481(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;branch repo=\"git.freedesktop.org\" module=\"swfdec/swfdec\"\n"
-"    checkoutdir=\"swfdec\"/&gt;\n"
+"        checkoutdir=\"swfdec\"\n"
+"        revision=\"<replaceable>local-or-remote-branch</replaceable>\"\n"
+"        tag=\"<replaceable>tree-ish</replaceable>\"/&gt;\n"
+"        "
 msgstr ""
+"\n"
+"&lt;branch repo=\"git.freedesktop.org\" module=\"swfdec/swfdec\"\n"
+"        checkoutdir=\"swfdec\"\n"
+"        revision=\"<replaceable>local-or-remote-branch</replaceable>\"\n"
+"        tag=\"<replaceable>tree-ish</replaceable>\"/&gt;\n"
+"        "
 
-#: C/jhbuild.xml:1999(title)
+#: C/index.docbook:2490(section/title)
 msgid "Mercurial"
-msgstr ""
+msgstr "Mercurial"
 
-#: C/jhbuild.xml:2000(para)
+#: C/index.docbook:2492(section/para)
 msgid "This repository type is used to define a Mercurial repository."
 msgstr ""
 
-#: C/jhbuild.xml:2002(programlisting)
+#: C/index.docbook:2495(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"hg\" name=\"hg.gtk-vnc\"\n"
 "    href=\"http://gtk-vnc.codemonkey.ws/hg/\"; /&gt;\n"
 msgstr ""
+"\n"
+"&lt;repository type=\"hg\" name=\"hg.gtk-vnc\"\n"
+"    href=\"http://gtk-vnc.codemonkey.ws/hg/\"; /&gt;\n"
 
-#: C/jhbuild.xml:2007(programlisting)
+#: C/index.docbook:2500(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;branch repo=\"hg.gtk-vnc\" module=\"outgoing.hg\" checkoutdir=\"gtk-vnc\"/&gt;\n"
 msgstr ""
+"\n"
+"&lt;branch repo=\"hg.gtk-vnc\" module=\"outgoing.hg\" checkoutdir=\"gtk-vnc\"/&gt;\n"
 
-#: C/jhbuild.xml:2014(title)
+#: C/index.docbook:2506(section/title)
 msgid "Monotone"
 msgstr ""
 
-#: C/jhbuild.xml:2015(para)
+#: C/index.docbook:2508(section/para)
 msgid "This repository type is used to define a Monotone repository."
 msgstr ""
 
-#: C/jhbuild.xml:2017(para)
+#: C/index.docbook:2511(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">server</sgmltag> attribute is used to "
 "specify the repository server."
 msgstr ""
 
-#: C/jhbuild.xml:2020(para)
+#: C/index.docbook:2514(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">database</sgmltag> attribute is used to "
 "specify the database to use for the repository."
 msgstr ""
 
-#: C/jhbuild.xml:2024(para)
+#: C/index.docbook:2517(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">defbranch</sgmltag> attribute is used "
 "specify the branch of the repository to use."
 msgstr ""
 
-#: C/jhbuild.xml:2028(programlisting)
+#: C/index.docbook:2520(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2754,67 +3473,107 @@ msgid ""
 "    server=\"pidgin.im\" database=\"pidgin.im.mtn\"\n"
 "    defbranch=\"im.pidgin.pidgin\"/&gt;\n"
 msgstr ""
+"\n"
+"&lt;repository type=\"mtn\" name=\"pidgin.im\"\n"
+"    server=\"pidgin.im\" database=\"pidgin.im.mtn\"\n"
+"    defbranch=\"im.pidgin.pidgin\"/&gt;\n"
 
-#: C/jhbuild.xml:2037(title)
+#: C/index.docbook:2528(section/title)
 msgid "Subversion"
-msgstr ""
+msgstr "Subversion"
 
-#: C/jhbuild.xml:2038(para)
+#: C/index.docbook:2530(section/para)
 msgid "This repository type is used to define a Subversion repository."
 msgstr ""
 
-#: C/jhbuild.xml:2040(programlisting)
+#: C/index.docbook:2533(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"svn\" name=\"svn.gnome.org\" default=\"yes\"\n"
 "    href=\"http://svn.gnome.org/svn/\"/&gt;\n";
+"        "
 msgstr ""
+"\n"
+"&lt;repository type=\"svn\" name=\"svn.gnome.org\" default=\"yes\"\n"
+"    href=\"http://svn.gnome.org/svn/\"/&gt;\n";
+"        "
 
-#: C/jhbuild.xml:2045(para)
+#: C/index.docbook:2540(section/para)
 msgid ""
 "It allows a <sgmltag class=\"attribute\">revision</sgmltag> on the <sgmltag "
 "class=\"element\">branch</sgmltag> element. This attribute defines the "
 "branch to checkout or, if it is a number, a specific revision to checkout."
 msgstr ""
 
-#: C/jhbuild.xml:2050(programlisting)
+#: C/index.docbook:2545(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;branch revision=\"gnome-2-20\"/&gt;\n"
+"        "
+msgstr ""
+"\n"
+"&lt;branch revision=\"gnome-2-20\"/&gt;\n"
+"        "
+
+#: C/index.docbook:2549(section/para)
+msgid ""
+"It is possible to specify custom <literal>svn</literal> layout using "
+"<sgmltag class=\"attribute\">trunk-template</sgmltag> (defaults to "
+"\"%(module)s/trunk\"), <sgmltag class=\"attribute\">branches-template</"
+"sgmltag> (defaults to \"%(module)s/branches/%(branch)s\") and <sgmltag class="
+"\"attribute\">tags-template</sgmltag> (defaults to \"%(module)s/tags/%(tag)s"
+"\")"
+msgstr ""
+
+#: C/index.docbook:2559(section/title)
+msgid "System"
+msgstr "ÎÏÏÏÎÎÎ"
+
+#: C/index.docbook:2561(section/para)
+msgid ""
+"This repository type is used to define a fake system repository. A system "
+"repository is required to create <link linkend=\"moduleset-syntax-defs-"
+"systemmodule\"><sgmltag class=\"element\">systemmodules</sgmltag></link>."
+msgstr ""
+
+#: C/index.docbook:2566(section/programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;repository type=\"system\" name=\"system\"/&gt;\n"
 msgstr ""
+"\n"
+"&lt;repository type=\"system\" name=\"system\"/&gt;\n"
 
-#: C/jhbuild.xml:2057(title)
+#: C/index.docbook:2572(section/title)
 msgid "Tarballs"
 msgstr ""
 
-#: C/jhbuild.xml:2058(para)
+#: C/index.docbook:2574(section/para)
 msgid "This repository type is used to define a tarball repository."
 msgstr ""
 
-#: C/jhbuild.xml:2060(programlisting)
+#: C/index.docbook:2577(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"tarball\" name=\"dbus/dbus-python\"\n"
 "    href=\"http://dbus.freedesktop.org/releases/dbus-python/\"/&gt;\n";
 msgstr ""
+"\n"
+"&lt;repository type=\"tarball\" name=\"dbus/dbus-python\"\n"
+"    href=\"http://dbus.freedesktop.org/releases/dbus-python/\"/&gt;\n";
 
-#: C/jhbuild.xml:2065(para)
-msgid ""
-"It allows the following attributes on the <sgmltag class=\"element\">branch</"
-"sgmltag> element:"
-msgstr ""
-
-#: C/jhbuild.xml:2068(para)
+#: C/index.docbook:2586(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">module</sgmltag> attribute specifies the "
 "file to download and compile, the <sgmltag class=\"attribute\">version</"
 "sgmltag> attribute specifies the module version."
 msgstr ""
 
-#: C/jhbuild.xml:2073(para)
+#: C/index.docbook:2592(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">size</sgmltag> and <sgmltag class="
 "\"attribute\">hash</sgmltag>, as well as the obsolete <sgmltag class="
@@ -2823,16 +3582,17 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: C/jhbuild.xml:2079(para) C/jhbuild.xml:2651(para)
+#: C/index.docbook:2598(section/para)
 msgid ""
-"The <sgmltag class=\"element\">patches</sgmltag> element is used to specify "
-"one or more patches to apply to the source tree after unpacking, the "
+"Any number of <sgmltag class=\"element\">patch</sgmltag> elements may be "
+"nested inside the <sgmltag class=\"element\">branch</sgmltag> element. These "
+"patches are applied, in order, to the source tree after unpacking. The "
 "<sgmltag class=\"attribute\">file</sgmltag> attribute gives the patch "
 "filename, and the <sgmltag class=\"attribute\">strip</sgmltag> attribute "
 "says how many levels of directories to prune when applying the patch."
 msgstr ""
 
-#: C/jhbuild.xml:2087(para) C/jhbuild.xml:2659(para)
+#: C/index.docbook:2606(section/para) C/index.docbook:3160(section/para)
 msgid ""
 "For module sets shipped with JHBuild, the patch files are looked up in the "
 "<filename>jhbuild/patches/</filename> directory; for module sets referred by "
@@ -2842,62 +3602,76 @@ msgid ""
 "specify a URI, in which case it will be downloaded from that location."
 msgstr ""
 
-#: C/jhbuild.xml:2096(programlisting)
+#: C/index.docbook:2614(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;branch module=\"dbus-python-0.80.2.tar.gz\" version=\"0.80.2\"\n"
 "    repo=\"dbus/dbus-python\"\n"
 "    hash=\"md5:2807bc85215c995bd595e01edd9d2077\" size=\"453499\"&gt;\n"
-"  &lt;patches&gt;\n"
-"    &lt;patch file=\"dbus-glib-build.patch\" strip=\"1\" /&gt;\n"
-"  &lt;/patches&gt;\n"
-"&lt;branch&gt;\n"
+"  &lt;patch file=\"dbus-glib-build.patch\" strip=\"1\" /&gt;\n"
+"&lt;/branch&gt;\n"
+msgstr ""
+"\n"
+"&lt;branch module=\"dbus-python-0.80.2.tar.gz\" version=\"0.80.2\"\n"
+"    repo=\"dbus/dbus-python\"\n"
+"    hash=\"md5:2807bc85215c995bd595e01edd9d2077\" size=\"453499\"&gt;\n"
+"  &lt;patch file=\"dbus-glib-build.patch\" strip=\"1\" /&gt;\n"
+"&lt;/branch&gt;\n"
+
+#: C/index.docbook:2622(section/para)
+msgid ""
+"A tarball <sgmltag class=\"element\">branch</sgmltag> element may also "
+"contain <sgmltag class=\"element\">quilt</sgmltag> elements which specify "
+"nested <sgmltag class=\"element\">branch</sgmltag> to import."
 msgstr ""
 
-#: C/jhbuild.xml:2111(title)
+#: C/index.docbook:2630(section/title)
 msgid "Including Other Module Sets"
 msgstr ""
 
-#: C/jhbuild.xml:2113(para)
+#: C/index.docbook:2632(section/para)
 msgid ""
 "JHBuild allows one module set to include the contents of another by "
 "reference using the <sgmltag class=\"element\">include</sgmltag> element."
 msgstr ""
 
-#: C/jhbuild.xml:2117(programlisting)
+#: C/index.docbook:2636(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;include href=\"<replaceable>uri</replaceable>\"/&gt;\n"
 msgstr ""
+"\n"
+"&lt;include href=\"<replaceable>uri</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2121(para)
+#: C/index.docbook:2640(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">href</sgmltag> is a URI reference to the "
 "module set to be included, relative to the file containing the <sgmltag "
 "class=\"element\">include</sgmltag> element."
 msgstr ""
 
-#: C/jhbuild.xml:2126(para)
+#: C/index.docbook:2644(section/para)
 msgid ""
 "Only module definitions are imported from the referenced module set - module "
 "sources are not. Multiple levels of includes are allowed, but include loops "
 "are not (there isn't any code to handle loops at the moment)."
 msgstr ""
 
-#: C/jhbuild.xml:2133(title)
+#: C/index.docbook:2651(section/title)
+#, fuzzy
 msgid "Module Definitions"
-msgstr ""
+msgstr "ÎÏÎÏÎÎÎ ÎÎÎ %s"
 
-#: C/jhbuild.xml:2135(para)
+#: C/index.docbook:2653(section/para)
 msgid ""
 "There are various types of module definitions that can be used in a module "
 "set file, and the list can easily be extended. Only the most common ones "
 "will be mentioned here."
 msgstr ""
 
-#: C/jhbuild.xml:2139(para)
+#: C/index.docbook:2657(section/para)
 msgid ""
 "They are all basically composed of a <sgmltag class=\"element\">branch</"
 "sgmltag> element describing how to get the module and <sgmltag class="
@@ -2906,7 +3680,7 @@ msgid ""
 "the dependencies of the module."
 msgstr ""
 
-#: C/jhbuild.xml:2146(para)
+#: C/index.docbook:2664(section/para)
 msgid ""
 "Any modules listed in the <sgmltag class=\"element\">dependencies</sgmltag> "
 "element will be added to the module list for <command>jhbuild build</"
@@ -2914,7 +3688,7 @@ msgid ""
 "are built first."
 msgstr ""
 
-#: C/jhbuild.xml:2152(para)
+#: C/index.docbook:2669(section/para)
 msgid ""
 "After generating the modules list, the modules listed in the <sgmltag class="
 "\"element\">suggests</sgmltag> element will be used to further sort the "
@@ -2923,17 +3697,17 @@ msgid ""
 "module."
 msgstr ""
 
-#: C/jhbuild.xml:2160(title)
+#: C/index.docbook:2676(section/title)
 msgid "autotools"
-msgstr ""
+msgstr "autotools"
 
-#: C/jhbuild.xml:2162(para)
+#: C/index.docbook:2678(section/para)
 msgid ""
 "The <sgmltag class=\"element\">autotools</sgmltag> element is used to define "
 "a module which is compiled using the GNU Autotools build system."
 msgstr ""
 
-#: C/jhbuild.xml:2166(programlisting)
+#: C/index.docbook:2682(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2944,6 +3718,7 @@ msgid ""
 "\t      [ autogen-sh=\"<replaceable>autogen-sh</replaceable>\" ]\n"
 "\t      [ makefile=\"<replaceable>makefile</replaceable>\" ]\n"
 "\t      [ skip-autogen=\"<replaceable>skip-autogen</replaceable>\" ]\n"
+"\t      [ skip-install=\"<replaceable>skip-install</replaceable>\" ]\n"
 "\t      [ autogen-template=\"<replaceable>autogen-template</replaceable>\" ]\n"
 "\t      [ check-target=\"<replaceable>check-target</replaceable>\" ]\n"
 "\t      [ supports-non-srcdir-builds=\"<replaceable>supports-non-srcdir-builds</replaceable>\" ]&gt;\n"
@@ -2963,8 +3738,35 @@ msgid ""
 "\n"
 "&lt;/autotools&gt;\n"
 msgstr ""
+"\n"
+"&lt;autotools id=\"<replaceable>id</replaceable>\"\n"
+"\t      [ autogenargs=\"<replaceable>autogenargs</replaceable>\" ]\n"
+"\t      [ makeargs=\"<replaceable>makeargs</replaceable>\" ]\n"
+"\t      [ makeinstallargs=\"<replaceable>makeinstallargs</replaceable>\" ]\n"
+"\t      [ autogen-sh=\"<replaceable>autogen-sh</replaceable>\" ]\n"
+"\t      [ makefile=\"<replaceable>makefile</replaceable>\" ]\n"
+"\t      [ skip-autogen=\"<replaceable>skip-autogen</replaceable>\" ]\n"
+"\t      [ skip-install=\"<replaceable>skip-install</replaceable>\" ]\n"
+"\t      [ autogen-template=\"<replaceable>autogen-template</replaceable>\" ]\n"
+"\t      [ check-target=\"<replaceable>check-target</replaceable>\" ]\n"
+"\t      [ supports-non-srcdir-builds=\"<replaceable>supports-non-srcdir-builds</replaceable>\" ]&gt;\n"
+"\n"
+"  &lt;branch [ ... ] &gt;\n"
+"    [...]\n"
+"  &lt;/branch&gt;\n"
+"\n"
+"  &lt;dependencies&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/dependencies&gt;\n"
+"  &lt;after&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/after&gt;\n"
+"\n"
+"&lt;/autotools&gt;\n"
 
-#: C/jhbuild.xml:2194(para)
+#: C/index.docbook:2711(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">autogenargs</sgmltag> and <sgmltag class="
 "\"attribute\">makeargs</sgmltag> and <sgmltag class=\"attribute"
@@ -2973,7 +3775,7 @@ msgid ""
 "and <command>make install</command> respectively."
 msgstr ""
 
-#: C/jhbuild.xml:2201(para)
+#: C/index.docbook:2718(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies "
 "the name of the autogen.sh script to run. The value <literal>autoreconf</"
@@ -2983,18 +3785,20 @@ msgid ""
 "class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run "
 "autogen.sh, it is a boolean with an extra <literal>never</literal> value to "
 "tell JHBuild to never skip running <command>autogen.sh</command>. <sgmltag "
-"class=\"attribute\">makefile</sgmltag> specifies the filename of the "
-"makefile to use."
+"class=\"attribute\">skip-install</sgmltag> is a boolean attribute specifying "
+"whether to skip <command>make install</command> command on the module. "
+"<sgmltag class=\"attribute\">makefile</sgmltag> specifies the filename of "
+"the makefile to use."
 msgstr ""
 
-#: C/jhbuild.xml:2216(para)
+#: C/index.docbook:2733(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">supports-non-srcdir-builds</sgmltag> "
 "attribute is used to mark modules that can't be cleanly built using a "
 "separate source directory."
 msgstr ""
 
-#: C/jhbuild.xml:2221(para)
+#: C/index.docbook:2738(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">autogen-template</sgmltag> attribute can be "
 "used if you need finer control over the autogen command line. It is a python "
@@ -3004,31 +3808,33 @@ msgid ""
 "example, here is the default autogen-template:"
 msgstr ""
 
-#: C/jhbuild.xml:2230(programlisting)
+#: C/index.docbook:2746(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "%(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s\n"
 msgstr ""
+"\n"
+"%(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s\n"
 
-#: C/jhbuild.xml:2234(para)
+#: C/index.docbook:2750(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">check-target</sgmltag> attribute must be "
 "specified (with false as value) for modules that do not have a <command>make "
 "check</command> target."
 msgstr ""
 
-#: C/jhbuild.xml:2241(title)
+#: C/index.docbook:2756(section/title)
 msgid "cmake"
-msgstr ""
+msgstr "cmake"
 
-#: C/jhbuild.xml:2243(para)
+#: C/index.docbook:2758(section/para)
 msgid ""
 "The <sgmltag class=\"element\">cmake</sgmltag> element is used to define a "
 "module which is built using the CMake build system."
 msgstr ""
 
-#: C/jhbuild.xml:2246(programlisting)
+#: C/index.docbook:2761(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3047,18 +3853,33 @@ msgid ""
 "  &lt;/after&gt;\n"
 "&lt;/cmake&gt;\n"
 msgstr ""
+"\n"
+"&lt;cmake id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;branch [ ... ] &gt;\n"
+"    [...]\n"
+"  &lt;/branch&gt;\n"
+"\n"
+"  &lt;dependencies&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/dependencies&gt;\n"
+"  &lt;after&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/after&gt;\n"
+"&lt;/cmake&gt;\n"
 
-#: C/jhbuild.xml:2266(title)
+#: C/index.docbook:2780(section/title)
 msgid "distutils"
-msgstr ""
+msgstr "distutils"
 
-#: C/jhbuild.xml:2268(para)
+#: C/index.docbook:2782(section/para)
 msgid ""
 "The <sgmltag class=\"element\">distutils</sgmltag> element is used to define "
 "a module which is built using python's distutils"
 msgstr ""
 
-#: C/jhbuild.xml:2272(programlisting)
+#: C/index.docbook:2785(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3078,19 +3899,35 @@ msgid ""
 "  &lt;/after&gt;\n"
 "&lt;/distutils&gt;\n"
 msgstr ""
+"\n"
+"&lt;distutils id=\"<replaceable>modulename</replaceable>\"\n"
+"            [ supports-non-srcdir-builds=\"<replaceable>yes|no</replaceable>\" ]&gt;\n"
+"  &lt;branch [ ... ] &gt;\n"
+"    [...]\n"
+"  &lt;/branch&gt;\n"
+"\n"
+"  &lt;dependencies&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/dependencies&gt;\n"
+"  &lt;after&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/after&gt;\n"
+"&lt;/distutils&gt;\n"
 
-#: C/jhbuild.xml:2293(title)
+#: C/index.docbook:2805(section/title)
 msgid "linux"
-msgstr ""
+msgstr "linux"
 
-#: C/jhbuild.xml:2295(para)
+#: C/index.docbook:2807(section/para)
 msgid ""
 "The <sgmltag class=\"element\">linux</sgmltag> element defines a module used "
 "to build a linux kernel. In addition, a separate kernel configuration can be "
 "chosen using the <sgmltag class=\"element\">kconfig</sgmltag> subelement."
 msgstr ""
 
-#: C/jhbuild.xml:2301(programlisting)
+#: C/index.docbook:2812(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3117,24 +3954,47 @@ msgid ""
 "\n"
 "&lt;/linux&gt;\n"
 msgstr ""
+"\n"
+"&lt;linux id=\"<replaceable>id</replaceable>\"\n"
+"\t  [ makeargs=\"<replaceable>makeargs</replaceable>\" ]&gt;\n"
+"\n"
+"  &lt;branch [ ... ] &gt;\n"
+"    [...]\n"
+"  &lt;/branch&gt;\n"
+"\n"
+"  &lt;dependencies&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/dependencies&gt;\n"
+"  &lt;after&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/after&gt;\n"
+"\n"
+"  &lt;kconfig [ repo=\"<replaceable>repo</replaceable>\" ]\n"
+"\t    version=\"<replaceable>version</replaceable>\"\n"
+"\t    [ module=\"<replaceable>module</replaceable>\" ]\n"
+"\t    [ config=\"<replaceable>config</replaceable>\" ] /&gt;\n"
+"\n"
+"&lt;/linux&gt;\n"
 
-#: C/jhbuild.xml:2329(title)
+#: C/index.docbook:2839(section/title)
 msgid "perl"
-msgstr ""
+msgstr "perl"
 
-#: C/jhbuild.xml:2331(para)
+#: C/index.docbook:2841(section/para)
 msgid ""
 "The <sgmltag class=\"element\">perl</sgmltag> element is used to build perl "
 "modules."
 msgstr ""
 
-#: C/jhbuild.xml:2334(para)
+#: C/index.docbook:2844(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">makeargs</sgmltag> attribute is used to "
 "specify additional arguments to pass to <command>make</command>."
 msgstr ""
 
-#: C/jhbuild.xml:2338(programlisting)
+#: C/index.docbook:2848(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3156,29 +4016,10 @@ msgid ""
 "\n"
 "&lt;/perl&gt;\n"
 msgstr ""
-
-#: C/jhbuild.xml:2360(title)
-msgid "waf"
-msgstr ""
-
-#: C/jhbuild.xml:2362(para)
-msgid ""
-"The <sgmltag class=\"element\">waf</sgmltag> element is used to define a "
-"module which is built using the Waf build system."
-msgstr ""
-
-#: C/jhbuild.xml:2365(para)
-msgid ""
-"The <sgmltag class=\"attribute\">waf-command</sgmltag> attribute is used to "
-"specify the waf command script to use; it defaults to <command>waf</command>."
-msgstr ""
-
-#: C/jhbuild.xml:2369(programlisting)
-#, no-wrap
-msgid ""
 "\n"
-"&lt;waf id=\"<replaceable>modulename</replaceable>\"&gt;\n"
-"\t [ waf-command=\"<replaceable>waf-command</replaceable>\" ]&gt;\n"
+"&lt;perl id=\"<replaceable>modulename</replaceable>\"\n"
+"\t [ makeargs=\"<replaceable>makeargs</replaceable>\" ]&gt;\n"
+"\n"
 "  &lt;branch [ ... ] &gt;\n"
 "    [...]\n"
 "  &lt;/branch&gt;\n"
@@ -3191,24 +4032,118 @@ msgid ""
 "    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
 "    ...\n"
 "  &lt;/after&gt;\n"
-"&lt;/waf&gt;\n"
+"\n"
+"&lt;/perl&gt;\n"
+
+#: C/index.docbook:2870(section/title)
+#| msgid "modules"
+msgid "systemmodule"
+msgstr "systemmodule"
+
+#: C/index.docbook:2872(section/para)
+msgid ""
+"The <sgmltag class=\"element\">systemmodule</sgmltag> element is used to "
+"specify modules that must be provided by the system. The module should be "
+"installed by your distributions package management system."
+msgstr ""
+
+#: C/index.docbook:2877(section/programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;systemmodule id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;pkg-config&gt;<replaceable>pkg-config</replaceable>.pc&lt;/pkg-config&gt;\n"
+"\n"
+"  &lt;branch repo=\"<replaceable>system</replaceable>\" version=\"<replaceable>version</replaceable>\" /&gt;\n"
+"&lt;/systemmodule&gt;\n"
+msgstr ""
+"\n"
+"&lt;systemmodule id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;pkg-config&gt;<replaceable>pkg-config</replaceable>.pc&lt;/pkg-config&gt;\n"
+"\n"
+"  &lt;branch repo=\"<replaceable>system</replaceable>\" version=\"<replaceable>version</replaceable>\" /&gt;\n"
+"&lt;/systemmodule&gt;\n"
+
+#: C/index.docbook:2885(section/para)
+msgid ""
+"If the system module does not provide a pkg-config file, <sgmltag class="
+"\"element\">systemdependencies</sgmltag> tag can be used to identify the "
+"dependencies. Two values are supported by the <sgmltag class=\"attribute"
+"\">type</sgmltag> attribute of the <sgmltag class=\"element\">dep</sgmltag> "
+"tag:"
+msgstr ""
+
+#: C/index.docbook:2893(listitem/simpara)
+msgid ""
+"<sgmltag class=\"attvalue\">path</sgmltag> value. The path is searched for "
+"the matching program name."
+msgstr ""
+
+#: C/index.docbook:2897(listitem/simpara)
+msgid ""
+"<sgmltag class=\"attvalue\">c_include</sgmltag> value. The C include path is "
+"searched for the matching header name. <sgmltag class=\"attribute\">name</"
+"sgmltag> may include a sub-directory. The C include search path can modified "
+"by setting <varname>CPPFLAGS</varname> within the configuration variables "
+"<varname>cflags</varname> or <link linkend=\"cfg-module-autogenargs"
+"\"><varname>module_autogenargs</varname></link>."
+msgstr ""
+
+#: C/index.docbook:2908(section/programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;systemmodule id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;branch repo=\"<replaceable>system</replaceable>\" version=\"<replaceable>version</replaceable>\" /&gt;\n"
+"  &lt;systemdependencies&gt;\n"
+"    &lt;dep type=\"path\" name=\"<replaceable>executable-name</replaceable>\" /&gt;\n"
+"  &lt;/systemdependencies&gt;\n"
+"&lt;/systemmodule&gt;\n"
+"\n"
+"&lt;systemmodule id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;branch repo=\"<replaceable>system</replaceable>\" version=\"<replaceable>version</replaceable>\" /&gt;\n"
+"  &lt;systemdependencies&gt;\n"
+"    &lt;dep type=\"c_include\" name=\"<replaceable>header-name</replaceable>\" /&gt;\n"
+"  &lt;/systemdependencies&gt;\n"
+"&lt;/systemmodule&gt;\n"
 msgstr ""
+"\n"
+"&lt;systemmodule id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;branch repo=\"<replaceable>system</replaceable>\" version=\"<replaceable>version</replaceable>\" /&gt;\n"
+"  &lt;systemdependencies&gt;\n"
+"    &lt;dep type=\"path\" name=\"<replaceable>executable-name</replaceable>\" /&gt;\n"
+"  &lt;/systemdependencies&gt;\n"
+"&lt;/systemmodule&gt;\n"
+"\n"
+"&lt;systemmodule id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;branch repo=\"<replaceable>system</replaceable>\" version=\"<replaceable>version</replaceable>\" /&gt;\n"
+"  &lt;systemdependencies&gt;\n"
+"    &lt;dep type=\"c_include\" name=\"<replaceable>header-name</replaceable>\" /&gt;\n"
+"  &lt;/systemdependencies&gt;\n"
+"&lt;/systemmodule&gt;\n"
+
+#: C/index.docbook:2926(section/title)
+msgid "waf"
+msgstr "waf"
 
-#: C/jhbuild.xml:2390(title)
-msgid "Ant"
+#: C/index.docbook:2928(section/para)
+msgid ""
+"The <sgmltag class=\"element\">waf</sgmltag> element is used to define a "
+"module which is built using the Waf build system."
 msgstr ""
 
-#: C/jhbuild.xml:2392(para)
+#: C/index.docbook:2931(section/para)
 msgid ""
-"The <sgmltag class=\"element\">ant</sgmltag> element is used to define a "
-"module which is built using Ant, the Java based build tool."
+"The <sgmltag class=\"attribute\">waf-command</sgmltag> attribute is used to "
+"specify the waf command script to use; it defaults to <command>waf</command>."
 msgstr ""
 
-#: C/jhbuild.xml:2395(programlisting)
+#: C/index.docbook:2935(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
-"&lt;ant id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"&lt;waf id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"\t [ waf-command=\"<replaceable>waf-command</replaceable>\" ]&gt;\n"
 "  &lt;branch [ ... ] &gt;\n"
 "    [...]\n"
 "  &lt;/branch&gt;\n"
@@ -3221,24 +4156,36 @@ msgid ""
 "    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
 "    ...\n"
 "  &lt;/after&gt;\n"
-"&lt;/ant&gt;\n"
-msgstr ""
-
-#: C/jhbuild.xml:2413(title)
-msgid "Example of a module built with ant"
+"&lt;/waf&gt;\n"
 msgstr ""
+"\n"
+"&lt;waf id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"\t [ waf-command=\"<replaceable>waf-command</replaceable>\" ]&gt;\n"
+"  &lt;branch [ ... ] &gt;\n"
+"    [...]\n"
+"  &lt;/branch&gt;\n"
+"\n"
+"  &lt;dependencies&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/dependencies&gt;\n"
+"  &lt;after&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/after&gt;\n"
+"&lt;/waf&gt;\n"
 
-#: C/jhbuild.xml:2427(title)
+#: C/index.docbook:2955(section/title)
 msgid "testmodule"
-msgstr ""
+msgstr "testmodule"
 
-#: C/jhbuild.xml:2429(para)
+#: C/index.docbook:2957(section/para)
 msgid ""
 "The <sgmltag class=\"element\">testmodule</sgmltag> element is used to "
 "create a module which runs a suite of tests using LDTP or Dogtail."
 msgstr ""
 
-#: C/jhbuild.xml:2433(programlisting)
+#: C/index.docbook:2961(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3264,26 +4211,61 @@ msgid ""
 "\n"
 "&lt;/testmodule&gt;\n"
 msgstr ""
+"\n"
+"&lt;testmodule id=\"<replaceable>id</replaceable>\"\n"
+"\t       type=\"<replaceable>type</replaceable>\"&gt;\n"
+"\n"
+"  &lt;branch [ ... ] &gt;\n"
+"    [...]\n"
+"  &lt;/branch&gt;\n"
+"\n"
+"  &lt;dependencies&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/dependencies&gt;\n"
+"  &lt;after&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/after&gt;\n"
+"\n"
+"  &lt;testedmodules&gt;\n"
+"    &lt;tested package=\"<replaceable>package</replaceable>\" /&gt;\n"
+"  &lt;/testedmodules&gt;\n"
+"\n"
+"&lt;/testmodule&gt;\n"
+
+#: C/index.docbook:2985(section/para)
+msgid ""
+"The <sgmltag class=\"attribute\">type</sgmltag> attribute gives the type of "
+"tests to be run in the module. 'dogtail' uses python to invoke all .py "
+"files. 'ldtp' invokes 'ldtprunner run.xml'."
+msgstr ""
 
-#: C/jhbuild.xml:2460(title)
-msgid "metamodule"
+#: C/index.docbook:2989(section/para)
+msgid ""
+"Unless the noxvfb configuration option is set, an Xvfb server is started to "
+"run the tests in"
 msgstr ""
 
-#: C/jhbuild.xml:2462(para)
+#: C/index.docbook:2994(section/title)
+msgid "metamodule"
+msgstr "metamodule"
+
+#: C/index.docbook:2996(section/para)
 msgid ""
 "The <sgmltag class=\"element\">metamodule</sgmltag> element defines a module "
 "that doesn't actually do anything. The only purpose of a module of this type "
 "is its dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:2467(para)
+#: C/index.docbook:3000(section/para)
 msgid ""
 "For example, meta-gnome-desktop depends on all the key components of the "
 "GNOME desktop, therefore telling JHBuild to install it actually installs the "
 "full desktop."
 msgstr ""
 
-#: C/jhbuild.xml:2471(programlisting)
+#: C/index.docbook:3004(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3298,8 +4280,19 @@ msgid ""
 "  &lt;/suggests&gt;\n"
 "&lt;/metamodule&gt;\n"
 msgstr ""
+"\n"
+"&lt;metamodule id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;dependencies&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/dependencies&gt;\n"
+"  &lt;suggests&gt;\n"
+"    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"    ...\n"
+"  &lt;/suggests&gt;\n"
+"&lt;/metamodule&gt;\n"
 
-#: C/jhbuild.xml:2483(para)
+#: C/index.docbook:3017(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">id</sgmltag> attribute gives the name of "
 "the module. The child elements are handled as for <link linkend=\"moduleset-"
@@ -3307,28 +4300,29 @@ msgid ""
 "link>."
 msgstr ""
 
-#: C/jhbuild.xml:2492(title)
+#: C/index.docbook:3025(section/title)
+#, fuzzy
 msgid "Deprecated Elements"
-msgstr ""
+msgstr "ÎÏÎÎÏÎÎÎ ÎÎÎÏÎÏ"
 
-#: C/jhbuild.xml:2498(title)
+#: C/index.docbook:3031(section/title)
 msgid "cvsroot"
-msgstr ""
+msgstr "cvsroot"
 
-#: C/jhbuild.xml:2500(para)
+#: C/index.docbook:3033(section/para)
 msgid ""
 "The <sgmltag class=\"element\">cvsroot</sgmltag> element is now deprecated - "
 "the <sgmltag class=\"element\">repository</sgmltag> element should be used "
 "instead."
 msgstr ""
 
-#: C/jhbuild.xml:2505(para)
+#: C/index.docbook:3037(section/para)
 msgid ""
 "The <sgmltag class=\"element\">cvsroot</sgmltag> element is used to describe "
 "a CVS repository."
 msgstr ""
 
-#: C/jhbuild.xml:2508(programlisting)
+#: C/index.docbook:3040(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3337,20 +4331,25 @@ msgid ""
 "           root=\"<replaceable>anon-cvsroot</replaceable>\"\n"
 "           password=\"<replaceable>anon-password</replaceable>\"/&gt;\n"
 msgstr ""
+"\n"
+"  &lt;cvsroot name=\"<replaceable>rootname</replaceable>\"\n"
+"           [ default=\"<replaceable>yes|no</replaceable>\" ]\n"
+"           root=\"<replaceable>anon-cvsroot</replaceable>\"\n"
+"           password=\"<replaceable>anon-password</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2515(para)
+#: C/index.docbook:3047(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute should be a unique "
 "identifier for the CVS repository."
 msgstr ""
 
-#: C/jhbuild.xml:2518(para)
+#: C/index.docbook:3050(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">default</sgmltag> attribute says whether "
 "this is the default module source for this module set file."
 msgstr ""
 
-#: C/jhbuild.xml:2522(para)
+#: C/index.docbook:3054(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">root</sgmltag> attribute lists the CVS root "
 "used for anonymous access to this repository, and the <sgmltag class="
@@ -3358,24 +4357,24 @@ msgid ""
 "anonymous access."
 msgstr ""
 
-#: C/jhbuild.xml:2530(title)
+#: C/index.docbook:3061(section/title)
 msgid "svnroot"
-msgstr ""
+msgstr "svnroot"
 
-#: C/jhbuild.xml:2532(para)
+#: C/index.docbook:3063(section/para)
 msgid ""
 "The <sgmltag class=\"element\">svnroot</sgmltag> element is now deprecated - "
 "the <sgmltag class=\"element\">repository</sgmltag> element should be used "
 "instead."
 msgstr ""
 
-#: C/jhbuild.xml:2537(para)
+#: C/index.docbook:3067(section/para)
 msgid ""
 "The <sgmltag class=\"element\">svnroot</sgmltag> element is used to describe "
 "a Subversion repository."
 msgstr ""
 
-#: C/jhbuild.xml:2540(programlisting)
+#: C/index.docbook:3070(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3383,92 +4382,61 @@ msgid ""
 "           [ default=\"<replaceable>yes|no</replaceable>\" ]\n"
 "           href=\"<replaceable>anon-svnroot</replaceable>\"/&gt;\n"
 msgstr ""
+"\n"
+"  &lt;svnroot name=\"<replaceable>rootname</replaceable>\"\n"
+"           [ default=\"<replaceable>yes|no</replaceable>\" ]\n"
+"           href=\"<replaceable>anon-svnroot</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2546(para)
+#: C/index.docbook:3076(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute should be a unique "
 "identifier for the Subversion repository."
 msgstr ""
 
-#: C/jhbuild.xml:2550(para) C/jhbuild.xml:2580(para)
+#: C/index.docbook:3079(section/para)
 msgid ""
 "If <sgmltag class=\"attribute\">default</sgmltag> attribute says whether "
 "this is the default module source for this module set file."
 msgstr ""
 
-#: C/jhbuild.xml:2554(para)
+#: C/index.docbook:3083(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">href</sgmltag> attribute lists the base URL "
 "for the repository. This will probably be either a <literal>http</literal>, "
 "<literal>https</literal> or <literal>svn</literal> URL."
 msgstr ""
 
-#: C/jhbuild.xml:2561(title)
-msgid "arch-archive"
-msgstr ""
-
-#: C/jhbuild.xml:2563(para)
-msgid ""
-"The <sgmltag class=\"element\">arch-archive</sgmltag> element is now "
-"deprecated - the <sgmltag class=\"element\">repository</sgmltag> element "
-"should be used instead."
-msgstr ""
-
-#: C/jhbuild.xml:2568(para)
-msgid ""
-"The <sgmltag class=\"element\">arch-archive</sgmltag> element is used to "
-"describe a GNU Arch archive."
-msgstr ""
-
-#: C/jhbuild.xml:2571(programlisting)
-#, no-wrap
-msgid ""
-"\n"
-"  &lt;arch-archive name=\"<replaceable>archivename</replaceable>\"\n"
-"                [ default=\"<replaceable>yes|no</replaceable>\" ]\n"
-"                href=\"<replaceable>mirror-url</replaceable>\"/&gt;\n"
-msgstr ""
-
-#: C/jhbuild.xml:2577(para)
-msgid ""
-"The <sgmltag class=\"attribute\">name</sgmltag> attribute should be the Arch "
-"archive name."
-msgstr ""
-
-#: C/jhbuild.xml:2584(para)
-msgid ""
-"The <sgmltag class=\"attribute\">href</sgmltag> attribute lists a public "
-"mirror URL for the archive."
-msgstr ""
-
-#: C/jhbuild.xml:2590(title)
+#: C/index.docbook:3093(section/title)
+#, fuzzy
 msgid "Deprecated Module Types"
-msgstr ""
+msgstr "ÎÎÎÎ ÎÎ ÏÏÎÏÏÎÏÎÎÏÎÎÎÎÎ ÏÏÏÎÎ"
 
-#: C/jhbuild.xml:2593(para)
+#: C/index.docbook:3096(warning/para)
 msgid ""
 "This section describes deprecated elements, they may still be used in "
 "existing module sets but it is advised not to use them anymore."
 msgstr ""
 
-#: C/jhbuild.xml:2599(title)
+#: C/index.docbook:3102(section/title)
 msgid "tarball"
-msgstr ""
+msgstr "tarball"
 
-#: C/jhbuild.xml:2602(para)
+#: C/index.docbook:3105(important/para)
 msgid ""
 "This deprecated element is just a thin wrapper around both <sgmltag class="
 "\"element\">autotools</sgmltag> module type and <sgmltag class=\"element"
 "\">tarball</sgmltag> repository type."
 msgstr ""
 
-#: C/jhbuild.xml:2608(para)
+#: C/index.docbook:3110(section/para)
 msgid ""
 "The <sgmltag class=\"element\">tarball</sgmltag> element is used to define a "
 "module that is to be built from a tarball."
 msgstr ""
+"The <sgmltag class=\"element\">tarball</sgmltag> element is used to define a "
+"module that is to be built from a tarball."
 
-#: C/jhbuild.xml:2612(programlisting)
+#: C/index.docbook:3113(section/programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3497,14 +4465,39 @@ msgid ""
 "    &lt;/suggests&gt;\n"
 "  &lt;/tarball&gt;\n"
 msgstr ""
+"\n"
+"  &lt;tarball id=\"<replaceable>modulename</replaceable>\"\n"
+"              [ version=\"<replaceable>version</replaceable>\" ]\n"
+"              [ checkourdir=\"<replaceable>checkoutdir</replaceable>\" ]\n"
+"              [ autogenargs=\"<replaceable>autogenargs</replaceable>\" ]\n"
+"              [ makeargs=\"<replaceable>makeargs</replaceable>\" ]\n"
+"              [ autogen-sh=\"<replaceable>autogen-sh</replaceable>\" ]\n"
+"              [ supports-non-srcdir-builds=\"<replaceable>yes|no</replaceable>\" ]&gt;\n"
+"    &lt;source href=\"<replaceable>source-url</replaceable>\"\n"
+"            [ size=\"<replaceable>source-size</replaceable>\" ]\n"
+"            [ hash=\"<replaceable>source-algo:source-hash</replaceable>\" ]\n"
+"            [ md5sum=\"<replaceable>source-md5sum</replaceable>\" ]/&gt;\n"
+"    &lt;patches&gt;\n"
+"      &lt;patch file=\"<replaceable>filename</replaceable>\" strip=\"<replaceable>level</replaceable>\"/&gt;\n"
+"      ...\n"
+"    &lt;/patches&gt;\n"
+"    &lt;dependencies&gt;\n"
+"      &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"      ...\n"
+"    &lt;/dependencies&gt;\n"
+"    &lt;suggests&gt;\n"
+"      &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
+"      ...\n"
+"    &lt;/suggests&gt;\n"
+"  &lt;/tarball&gt;\n"
 
-#: C/jhbuild.xml:2638(para)
+#: C/index.docbook:3140(section/para)
 msgid ""
 "The <sgmltag class=\"attribute\">id</sgmltag> and <sgmltag class=\"attribute"
 "\">version</sgmltag> attributes are used to identify the module."
 msgstr ""
 
-#: C/jhbuild.xml:2642(para)
+#: C/index.docbook:3144(section/para)
 msgid ""
 "The <sgmltag class=\"element\">source</sgmltag> element specifies the file "
 "to download and compile. The <sgmltag class=\"attribute\">href</sgmltag> "
@@ -3515,7 +4508,16 @@ msgid ""
 "that the source package was downloaded correctly."
 msgstr ""
 
-#: C/jhbuild.xml:2669(para)
+#: C/index.docbook:3153(section/para)
+msgid ""
+"The <sgmltag class=\"element\">patches</sgmltag> element is used to specify "
+"one or more patches to apply to the source tree after unpacking, the "
+"<sgmltag class=\"attribute\">file</sgmltag> attribute gives the patch "
+"filename, and the <sgmltag class=\"attribute\">strip</sgmltag> attribute "
+"says how many levels of directories to prune when applying the patch."
+msgstr ""
+
+#: C/index.docbook:3168(section/para)
 msgid ""
 "The other attributes and the <sgmltag class=\"element\">dependencies</"
 "sgmltag>, <sgmltag class=\"element\">suggests</sgmltag> and <sgmltag class="
@@ -3523,351 +4525,239 @@ msgid ""
 "\"moduleset-syntax-defs-autotools\">autotools</link>."
 msgstr ""
 
-#: C/jhbuild.xml:2681(title)
-msgid "Frequently Asked Questions"
-msgstr ""
+#~ msgid "James"
+#~ msgstr "James"
 
-#: C/jhbuild.xml:2685(title)
-msgid "General JHBuild Questions"
-msgstr ""
+#~ msgid "Henstridge"
+#~ msgstr "Henstridge"
 
-#: C/jhbuild.xml:2688(simpara)
-msgid ""
-"The <command>wget</command> command can't download any tarballs. How do I "
-"get it to work with my firewall?"
-msgstr ""
+#~ msgid "C.J."
+#~ msgstr "C.J."
 
-#: C/jhbuild.xml:2693(para)
-msgid ""
-"Create <filename>~/.wgetrc</filename> file. If an HTTP proxy is used to "
-"access FTP sites, add a line like the following to the file:"
-msgstr ""
+#~ msgid "Adams-Collier"
+#~ msgstr "Adams-Collier"
 
-#: C/jhbuild.xml:2696(programlisting)
-#, no-wrap
-msgid "ftp_proxy = http://<replaceable>hostname</replaceable>:<replaceable>port</replaceable>/"
-msgstr ""
+#~ msgid "Frederic"
+#~ msgstr "Frederic"
 
-#: C/jhbuild.xml:2697(para)
-msgid ""
-"If passive FTP connections are required (sometimes needed with NAT "
-"firewalls), add the following line:"
-msgstr ""
+#~ msgid "Peters"
+#~ msgstr "Peters"
 
-#: C/jhbuild.xml:2700(programlisting)
-#, no-wrap
-msgid "passive_ftp = on"
-msgstr ""
+#~ msgid "David"
+#~ msgstr "David"
 
-#: C/jhbuild.xml:2705(simpara)
-msgid "Building is slow. Is there any way I can speed it up?"
-msgstr ""
+#~ msgid "Turner"
+#~ msgstr "Turner"
 
-#: C/jhbuild.xml:2709(para)
-msgid ""
-"<ulink url=\"http://ccache.samba.org/\";>CCache</ulink> can speed up "
-"compilations, as it caches compilation results. <command>CCache</command> is "
-"available with most distributions."
-msgstr ""
+#~ msgid "2004, 2008"
+#~ msgstr "2004, 2008"
 
-#: C/jhbuild.xml:2713(para)
-msgid "Set the cache size with the following command:"
-msgstr ""
+#~ msgid "James Henstridge"
+#~ msgstr "James Henstridge"
 
-#: C/jhbuild.xml:2714(programlisting)
-#, no-wrap
-msgid "ccache -M 2G"
-msgstr ""
+#~ msgid "JHBuild Manual v0.5"
+#~ msgstr "ÎÎÏÎÎÏÎÎÎÎ JHBuild, ÎÎÎÎÏÎ 0.5"
 
-#: C/jhbuild.xml:2715(para)
-msgid ""
-"(where <literal>2G</literal> is the size the cache). Create symlinks to "
-"<command>CCache</command> for the compiler in <filename>~/bin</filename>:"
-msgstr ""
+#~ msgid "January 2008"
+#~ msgstr "ÎÎÎÎÏÎÏÎÎÏ 2008"
 
-#: C/jhbuild.xml:2718(programlisting)
-#, no-wrap
-msgid ""
-"cd ~/bin\n"
-"for cmd in cc gcc c++ g++; do\n"
-"  ln -s /usr/bin/ccache $cmd\n"
-"done"
-msgstr ""
+#~ msgid "JHBuild Manual v0.1"
+#~ msgstr "ÎÎÏÎÎÏÎÎÎÎ JHBuild v0.1"
 
-#: C/jhbuild.xml:2722(para)
-msgid ""
-"It is possible to check the status of the cache including cache hit rates "
-"with the following command:"
-msgstr ""
+#~ msgid "August 2007"
+#~ msgstr "ÎÏÎÎÏÏÏÎÏ 2007"
 
-#: C/jhbuild.xml:2724(programlisting)
-#, no-wrap
-msgid "ccache -s"
-msgstr ""
+#~ msgid ""
+#~ "Before downloading JHBuild, verify a copy of Python &gt;= 2.0 is "
+#~ "installed. It is essential that the Expat XML parser extension is "
+#~ "installed. Expat XML is supplied with Python &gt;= 2.3. To verify Expat "
+#~ "XML is installed run the following commands:"
+#~ msgstr ""
+#~ "ÎÏÎÏÎÏ ÎÎÏÎÎÎÏÎÏÎ ÏÎ JHBuild, ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÏÏÎÏÏÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÎÎ "
+#~ "ÎÎÎÎÏÎ ÎÎÏÏÎÏÎ ÏÎÏ Python 2.0. ÎÎÎÎÎ ÏÎÎÎÎÏÎÎÏ ÎÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ Î "
+#~ "ÎÏÎÎÏÎÏÎ Expat XML. Î Expat XML ÏÎÏÎÏÎÏÎÎ ÎÎ ÏÎÎ Python 2.3 Î ÎÎÏÏÎÏÎ. "
+#~ "ÎÎÎ ÎÎ ÎÏÎÎÎÎÎÎÏÏÎÏÎ ÏÏÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ Î Expat XML ÏÏÎÎÏÎ ÏÎÏ "
+#~ "ÎÎÏÎÎÏÎÎÏ ÎÎÏÎÎÎÏ:"
 
-#: C/jhbuild.xml:2729(simpara)
-msgid ""
-"Is there a better way to monitor the status of the build than looking at "
-"terminal window?"
-msgstr ""
+#~ msgid "#"
+#~ msgstr "#"
 
-#: C/jhbuild.xml:2733(para)
-msgid ""
-"If Zenity &gt;= 2.9 is installed on your system, JHBuild will display an "
-"icon in the system tray. The icon will display the current build stage, and "
-"the tooltip will show the last message from JHBuild."
-msgstr ""
+#~ msgid "python"
+#~ msgstr "python"
 
-#: C/jhbuild.xml:2737(para)
-msgid "The icon will also pop up a balloon on error."
-msgstr ""
+#~ msgid "&gt;&gt;&gt;"
+#~ msgstr "&gt;&gt;&gt;"
 
-#: C/jhbuild.xml:2742(title)
-msgid "Building GNOME"
-msgstr ""
+#~ msgid "import xml.parsers.expat"
+#~ msgstr "import xml.parsers.expat"
 
-#: C/jhbuild.xml:2745(simpara)
-msgid "What other prerequisites are needed to build GNOME with JHBuild?"
-msgstr ""
+#~ msgid ""
+#~ "<placeholder-1/> <placeholder-2/>\n"
+#~ "Python 2.6.2+ (release26-maint, Sep 13 2009, 21:26:06) \n"
+#~ "[GCC 4.4.1] on linux2\n"
+#~ "Type \"help\", \"copyright\", \"credits\" or \"license\" for more "
+#~ "information.\n"
+#~ "<placeholder-3/> <placeholder-4/>\n"
+#~ "<placeholder-5/>"
+#~ msgstr ""
+#~ "<placeholder-1/> <placeholder-2/>\n"
+#~ "Python 2.6.2+ (release26-maint, Sep 13 2009, 21:26:06) \n"
+#~ "[GCC 4.4.1] on linux2\n"
+#~ "Type \"help\", \"copyright\", \"credits\" or \"license\" for more "
+#~ "information.\n"
+#~ "<placeholder-3/> <placeholder-4/>\n"
+#~ "<placeholder-5/>"
+
+#~ msgid ""
+#~ "If the above completes without an exception, then Expat XML is installed "
+#~ "correctly."
+#~ msgstr ""
+#~ "ÎÎ ÏÎ ÏÎÎ ÏÎÎÏ ÎÎÎÎÎÎÏÏÎÎÎ ÏÏÏÎÏ ÎÎÎÎÏÎÏÎ, ÏÏÏÎ Î Expat XML ÎÎÎÎÎ ÏÏÏÏÎ "
+#~ "ÎÎÎÎÏÎÏÏÎÎÎÎÎ."
+
+#~ msgid "$"
+#~ msgstr "$"
+
+#~ msgid "git clone git://git.gnome.org/jhbuild"
+#~ msgstr "git clone git://git.gnome.org/jhbuild"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "cd jhbuild"
+#~ msgstr "cd jhbuild"
+
+#~ msgid "./autogen.sh"
+#~ msgstr "./autogen.sh"
+
+#~ msgid "make install"
+#~ msgstr "make install"
+
+#~ msgid ""
+#~ "Alternatively, if autotools or gnome-doc-utils is not installed, install "
+#~ "JHBuild as follows:"
+#~ msgstr ""
+#~ "ÎÎÎÎÎÎÎÏÎÎÎ, ÎÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÏÎ autotools Î gnome-doc-utils, "
+#~ "ÎÎÎÎÏÎÏÏÎÏÏÎ ÏÎ JHBuild ÏÏ ÎÎÎÏ:"
+
+#~ msgid "make -f Makefile.plain"
+#~ msgstr "make -f Makefile.plain"
+
+#~ msgid "make -f Makefile.plain install"
+#~ msgstr "make -f Makefile.plain install"
+
+#~ msgid "PATH=$PATH:~/.local/bin"
+#~ msgstr "PATH=$PATH:~/.local/bin"
+
+#~ msgid "repos"
+#~ msgstr "ÎÏÎÎÎÏÎÏÎÎ"
+
+#~ msgid "moduleset"
+#~ msgstr "moduleset"
+
+#~ msgid "checkoutroot"
+#~ msgstr "checkoutroot"
+
+#~ msgid "prefix"
+#~ msgstr "prefix"
+
+#~ msgid "autogenargs"
+#~ msgstr "autogenargs"
+
+#~ msgid "makeargs"
+#~ msgstr "makeargs"
+
+#~ msgid ""
+#~ "If this command displays any messages, the errors can be fixed in one of "
+#~ "two ways:"
+#~ msgstr ""
+#~ "ÎÎ ÎÏÏÎ Î ÎÎÏÎÎÎ ÎÎÏÎÎÎÏÎÎ ÎÏÎÎÎÎÎÏÎÏÎ ÎÎÎÏÎÎÏÎ, ÏÎ ÏÏÎÎÎÎÏÎ ÎÏÎÏÎÏÎ ÎÎ "
+#~ "ÎÎÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎ ÎÏÏ ÏÎÏÏ ÎÎÎÏ ÎÏÎ ÏÏÏÏÎÏÏ:"
+
+#~ msgid ""
+#~ "Run the <command>bootstrap</command> command to download, build and "
+#~ "install the build prerequisites:"
+#~ msgstr ""
+#~ "ÎÎÏÎÎÎÏÏÎ ÏÎÎ ÎÎÏÎÎÎ <command>bootstrap</command> ÎÎÎ ÎÎ ÎÎÏÎÎÎÏÎÏÎ, ÎÎ "
+#~ "ÎÏÎÏÎÏÎ ÎÎÎ ÎÎ ÎÎÎÎÏÎÏÏÎÏÎÏÎ ÏÎ ÏÏÎÎÏÎÎÏÎÏÎÎÎÎ ÎÎÎ ÏÎ ÎÏÎÏÎÎÎ:"
+
+#~ msgid ""
+#~ "When complete, run the <command>sanitycheck</command> command to verify "
+#~ "the required tools are present."
+#~ msgstr ""
+#~ "ÎÏÎÎ ÎÎÎÎÎÎÏÏÎÎÎ, ÎÎÏÎÎÎÏÏÎ ÏÎÎ ÎÎÏÎÎÎ <command>sanitycheck</command> ÎÎÎ "
+#~ "ÎÎ ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÏÎ ÎÏÎÏÎÎÏÎÏÎ ÎÏÎÎÎÎÎÎ ÎÎÎÎÎ ÏÎÏÏÎÏÎ."
+
+#~ msgid ""
+#~ "The <command>bootstrap</command> command does not build all the package "
+#~ "dependencies required by the build tools. If your distribution does not "
+#~ "provide the required packages, they will need to be built outside of the "
+#~ "JHBuild environment."
+#~ msgstr ""
+#~ "Î ÎÎÏÎÎÎ <command>bootstrap</command> ÎÎ ÎÏÎÎÎÎ ÏÎÎÏ ÏÎÏ ÎÎÎÏÏÎÏÎÎÏ "
+#~ "ÏÎÎÎÏÏÎ ÏÎÏ ÎÏÎÎÏÎÏÎÏÎÎ ÎÏÏ ÏÎ ÎÏÎÎÎÎÎÎ ÎÏÎÏÎÎÎÏÎÏ. ÎÎ Î ÎÎÎÎÎÎÎ ÏÎÏ ÎÎÎ "
+#~ "ÏÎÏÎÏÎÎ ÏÎ ÎÏÎÏÎÎÏÎÏÎ ÏÎÎÎÏÎ, ÎÎ ÏÏÎÏÎÎ ÎÎ ÎÏÎÏÏÎÏÎ ÎÎÏ ÎÏÏ ÏÎ ÏÎÏÎÎÎÎÎÎÎ "
+#~ "ÏÎÏ JHBuild."
 
-#: C/jhbuild.xml:2749(para)
-msgid "Some of the packages required include:"
-msgstr ""
+#~ msgid ""
+#~ "The build tools dependencies include <application>m4</application>, "
+#~ "<application>perl</application> and a C compiler (for example, "
+#~ "<application>gcc</application>)."
+#~ msgstr ""
+#~ "ÎÎ ÎÎÎÏÏÎÏÎÎÏ ÏÏÎ ÎÏÎÎÎÎÎÏÎ ÎÏÎÏÎÎÎÏÎÏ ÏÎÏÎÎÎÎÎÎÎÎÏÎ ÏÎ <application>m4</"
+#~ "application>, <application>perl</application> ÎÎÎ ÎÎÎÎ ÎÎÏÎÎÎÏÏÏÎÏÏÎ C "
+#~ "(ÎÎÎ ÏÎÏÎÎÎÎÎÎÎ ÏÎÎ <application>gcc</application>)."
 
-#: C/jhbuild.xml:2752(simpara)
-msgid ""
-"DocBook XML DTD and XSLT stylesheets. These need to be registered in the XML "
-"catalog (<filename>/etc/xml/catalog</filename>)."
-msgstr ""
+#~ msgid "jhbuild build"
+#~ msgstr "jhbuild build"
 
-#: C/jhbuild.xml:2757(simpara)
-msgid "X libraries"
-msgstr ""
+#~ msgid "choice:"
+#~ msgstr "ÎÏÎÎÎÎÎ:"
 
-#: C/jhbuild.xml:2760(simpara)
-msgid "fam or gamin (used by gnome-vfs for file monitoring)."
-msgstr ""
+#~ msgid "jhbuild build gtk+"
+#~ msgstr "jhbuild build gtk+"
 
-#: C/jhbuild.xml:2764(simpara)
-msgid ""
-"<filename>libsmbclient</filename> from Samba (used for browsing Windows "
-"networks)."
-msgstr ""
+#~ msgid "jhbuild build --start-at=pango"
+#~ msgstr "jhbuild build --start-at=pango"
 
-#: C/jhbuild.xml:2768(simpara)
-msgid "<filename>libbz2</filename> from bzip2."
-msgstr ""
+#~ msgid "jhbuild buildone gtk+"
+#~ msgstr "jhbuild buildone gtk+"
 
-#: C/jhbuild.xml:2772(simpara)
-msgid ""
-"<filename>libpng</filename>, <filename>libjpeg</filename> and "
-"<filename>libtiff</filename> (used for image loading)."
-msgstr ""
+#~ msgid "jhbuild list"
+#~ msgstr "jhbuild list"
 
-#: C/jhbuild.xml:2778(para)
-msgid ""
-"If installing distribution packages, and if applicable for your "
-"distribution, install the corresponding <quote>dev</quote> or <quote>devel</"
-"quote> packages. A list of <ulink url=\"http://live.gnome.org/";
-"JhbuildDependencies\">package names</ulink> for different distributions is "
-"maintained on the GNOME wiki."
-msgstr ""
+#~ msgid "jhbuild info gtk+"
+#~ msgstr "jhbuild info gtk+"
 
-#: C/jhbuild.xml:2788(simpara)
-msgid "I've built GNOME with JHBuild. How do I run it?"
-msgstr ""
+#~ msgid "jhbuild update"
+#~ msgstr "jhbuild update"
 
-#: C/jhbuild.xml:2792(para)
-msgid "Two options:"
-msgstr ""
+#~ msgid "jhbuild build --no-network"
+#~ msgstr "jhbuild build --no-network"
 
-#: C/jhbuild.xml:2795(para)
-msgid ""
-"Without JHBuild <application>HAL</application> and <application>D-Bus</"
-"application>. This method requires support from the display manager (e.g. "
-"<application>GDM</application>, <application>KDM</application>, "
-"<application>XDM</application>). Create a <filename>~/.xsession</filename> "
-"file, with the following contents:"
-msgstr ""
+#~ msgid "jhbuild run <placeholder-1/>"
+#~ msgstr "jhbuild run <placeholder-1/>"
 
-#: C/jhbuild.xml:2803(programlisting)
-#, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"exec jhbuild run gnome-session"
-msgstr ""
+#~ msgid "jhbuild shell"
+#~ msgstr "jhbuild shell"
 
-#: C/jhbuild.xml:2805(para)
-msgid ""
-"Set the <filename>~/.xsession</filename> file to be executable. At log in, "
-"set the session to <guilabel>custom</guilabel>. If the display manager does "
-"not have a <guilabel>custom</guilabel> option, refer to answer <xref linkend="
-"\"faq-built-hal\"/> below."
-msgstr ""
-
-#: C/jhbuild.xml:2814(para)
-msgid ""
-"With JHBuild <application>HAL</application> and <application>D-Bus</"
-"application>. <application>HAL</application> and <application>D-Bus</"
-"application> are daemons provided with your distribution. They are most "
-"likely already running, but may be unusable by the GNOME development version "
-"as they are too old or incompatible."
-msgstr ""
+#~ msgid "jhbuild bot --setup"
+#~ msgstr "jhbuild bot --setup"
 
-#: C/jhbuild.xml:2822(para)
-msgid ""
-"Create a session script that is run when you log in using a display manager "
-"(e.g. <application>GDM</application>, <application>KDM</application>, "
-"<application>XDM</application>). The session script starts <command>hal</"
-"command> and <command>d-bus</command> from the JHBuild installation in "
-"addition to the system-wide versions."
-msgstr ""
-
-#: C/jhbuild.xml:2831(programlisting)
-#, no-wrap
-msgid ""
-"\n"
-"GNOME=/opt/gnome2\n"
-" \n"
-"GDK_USE_XFT=1\n"
-"#XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME/share\n"
-"#XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOME/etc/xdg\n"
-"\n"
-"DBUS_LAUNCH=\"$GNOME/bin/dbus-launch --exit-with-session\"\n"
-" \n"
-"sudo su -c \"$GNOME/bin/dbus-daemon --system; \\\n"
-"                   $GNOME/sbin/hald\"\n"
-" \n"
-"jhbuild run $DBUS_LAUNCH gnome-session"
-msgstr ""
+#~ msgid "jhbuild"
+#~ msgstr "jhbuild"
 
-#: C/jhbuild.xml:2844(para)
-msgid ""
-"Adjust the variable <varname>GNOME</varname> to your local settings. "
-"Uncomment the <varname>XDG_</varname> lines for system-wide program menus in "
-"addition to the menus from the JHBuild GNOME. Save the script as <filename>/"
-"usr/bin/gnome-jhbuild-session</filename> or any other name of your choosing. "
-"Set the file to be executable."
-msgstr ""
+#~ msgid "global-options"
+#~ msgstr "global-options"
 
-#: C/jhbuild.xml:2852(para)
-msgid ""
-"As the script starts system daemons, root privileges are required obtained "
-"via <command>sudo</command>. The script requires <command>sudo</command> to "
-"be configured so it doesn't prompt for a password. Run <command>visudo</"
-"command> as root and enter the following, changing username and paths as "
-"appropriate:"
-msgstr ""
+#~ msgid "command"
+#~ msgstr "command"
 
-#: C/jhbuild.xml:2859(programlisting)
-#, no-wrap
-msgid ""
-"\n"
-"# Cmnd alias specification\n"
-"Cmnd_Alias  GNOME =  /opt/gnome2/bin/dbus-daemon, \\\n"
-"                     /opt/gnome2/sbin/hald\n"
-"\n"
-"# User privilege specification\n"
-"gnometester  ALL = NOPASSWD: GNOME"
-msgstr ""
+#~ msgid "command-arguments"
+#~ msgstr "command-arguments"
 
-#: C/jhbuild.xml:2866(para)
-msgid ""
-"To add a new session entry in the display manager, create <filename>/usr/"
-"share/xsessions/gnome-jhbuild.desktop</filename> and enter:"
-msgstr ""
+#~ msgid "jhbuild autobuild"
+#~ msgstr "jhbuild autobuild"
 
-#: C/jhbuild.xml:2870(programlisting)
-#, no-wrap
-msgid ""
-"\n"
-"[Desktop Entry]\n"
-"Name=GNOME (JHBuild)\n"
-"Comment=This session logs you into GNOME testing session\n"
-"TryExec=/usr/bin/gnome-jhbuild-session\n"
-"Exec=/usr/bin/gnome-jhbuild-session\n"
-"Icon=\n"
-"Type=Application"
-msgstr ""
-
-#: C/jhbuild.xml:2878(para)
-msgid ""
-"Restart <command>gdm</command> and log into your JHBuild GNOME. Select the "
-"JHBuild session before entering the login credentials. Using separate user "
-"account is recommended for testing."
-msgstr ""
-
-#: C/jhbuild.xml:2888(simpara)
-msgid ""
-"I built GNOME using JHBuild with <varname>prefix</varname> set to <filename>/"
-"usr</filename>, and now my system is broken. What should I do?"
-msgstr ""
-
-#: C/jhbuild.xml:2893(para)
-msgid "Don't set <varname>prefix</varname> to <filename>/usr</filename>."
-msgstr ""
-
-#: C/jhbuild.xml:2899(simpara)
-msgid ""
-"How do I get <command>gnome-volume-manager</command> to work when running "
-"JHBuild GNOME?"
-msgstr ""
-
-#: C/jhbuild.xml:2904(para)
-msgid ""
-"The <command>gnome-volume-manager</command> program reacts to messages from "
-"<command>hald</command> over the system message bus, which must be running "
-"as root. Assuming that your distribution comes with <acronym>HAL</acronym>, "
-"the main problem is getting <command>gnome-volume-manager</command> to talk "
-"to the system message bus."
-msgstr ""
-
-#: C/jhbuild.xml:2911(para)
-msgid ""
-"As communication is over a UNIX domain socket, the easiest way is to create "
-"a symlink from <filename>/var/run/dbus</filename> to <filename>$prefix/var/"
-"run/dbus</filename>:"
-msgstr ""
-
-#: C/jhbuild.xml:2915(programlisting)
-#, no-wrap
-msgid ""
-"mkdir -p $prefix/var/run\n"
-"cd $prefix/var/run\n"
-"ln -s /var/run/dbus dbus"
-msgstr ""
-
-#: C/jhbuild.xml:2918(para)
-msgid ""
-"You may also have trouble building HAL with JHBuild, since it tries to "
-"install some things outside of its build root. Running <userinput>make -k "
-"install</userinput> in the hal directory might help here."
-msgstr ""
-
-#: C/jhbuild.xml:2926(simpara)
-msgid "Why doesn't Foobar (activatable D-Bus service) start?"
-msgstr ""
-
-#: C/jhbuild.xml:2930(para)
-msgid ""
-"In order to activate a D-Bus service installed within the JHBuild root, "
-"while using the system D-Bus, you have to modify the <filename>/etc/dbus-1/"
-"session.conf</filename> file by adding the following line:"
-msgstr ""
-
-#: C/jhbuild.xml:2937(para)
-msgid ""
-"Where @PREFIX@ is the prefix used by JHBuild -- the user's home directory by "
-"default."
-msgstr ""
-
-#: C/jhbuild.xml:2942(para)
-msgid ""
-"You will have to restart D-Bus, which usually means logging out or a "
-"complete reboot."
-msgstr ""
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/jhbuild.xml:0(None)
-msgid "translator-credits"
-msgstr ""
+#~ msgid "--autogen"
+#~ msgstr "--autogen"
diff --git a/po/el.po b/po/el.po
index 50f88fd..0d37d88 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: jhbuild master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=jhbuild&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2012-06-26 13:30+0000\n"
-"PO-Revision-Date: 2012-07-05 18:26+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=jhbuild&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-12 12:57+0000\n"
+"PO-Revision-Date: 2012-09-16 01:31+0200\n"
 "Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
 "Language-Team: Greek Translation Team\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.0\n"
 "X-Project-Style: gnome\n"
@@ -24,8 +25,7 @@ msgstr ""
 msgid "Configuring $PKG_NAME without autotools"
 msgstr "ÎÏÎÎÎÏÎ ÏÎÏ $PKG_NAME ÏÏÏÎÏ ÎÏÏÎÎÎÏÎÏÎÎÎÏÎÎÏ"
 
-#: ../autogen.sh:115
-#: ../autogen.sh:120
+#: ../autogen.sh:115 ../autogen.sh:120
 #, sh-format
 msgid "Unable to create file $srcdir/Makefile.inc"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÏ $srcdir/Makefile.inc"
@@ -42,8 +42,12 @@ msgstr "ÎÏÏÎ ÏÎÎÎÏÏÎÎÎÎÎÏÏÎ 'make' ÎÎÎ ÏÎÎ ÎÎÏÎÎÎ
 
 #: ../autogen.sh:181
 #, sh-format
-msgid "**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME directory"
-msgstr "**ÎÏÎÎÎÎ**: Î ÎÎÏÎÎÎÎÎÏ `$srcdir' ÎÎÎ ÎÎÎÎÎÎÎ ÎÎ ÏÎÎ ÏÏÎÎÎÏ ÎÏÎÏÎÎÎÏ ÎÎÏÎÎÎÎÎ $PKG_NAME"
+msgid ""
+"**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME "
+"directory"
+msgstr ""
+"**ÎÏÎÎÎÎ**: Î ÎÎÏÎÎÎÎÎÏ `$srcdir' ÎÎÎ ÎÎÎÎÎÎÎ ÎÎ ÏÎÎ ÏÏÎÎÎÏ ÎÏÎÏÎÎÎÏ "
+"ÎÎÏÎÎÎÎÎ $PKG_NAME"
 
 #: ../autogen.sh:205
 msgid "gnome-autogen.sh not available"
@@ -53,302 +57,284 @@ msgstr "ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ ÏÎ gnome-autogen.sh "
 msgid "yelp-tools not available"
 msgstr "ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ ÏÎ yelp-tools"
 
-#: ../jhbuild/commands/autobuild.py:27
+#: ../jhbuild/commands/autobuild.py:28
 msgid "Build modules non-interactively and upload results to JhAutobuild"
-msgstr "ÎÎÎÎÎÏÏÎÎÎ ÎÎÎÏÎÏÏÎ ÎÎ ÎÎÎÎÏÎÏÏÎÎÎ ÎÎÎ ÎÏÎÏÏÎÎÎ ÏÏÎ ÎÏÎÏÎÎÎÏÎÎÏÏÎ ÏÏÎ JhAutobuild"
-
-#: ../jhbuild/commands/autobuild.py:35
-#: ../jhbuild/commands/make.py:42
-#: ../jhbuild/commands/tinderbox.py:37
-msgid "always run autogen.sh"
-msgstr "ÎÎÏÎÎÎÏÎ ÏÎÎÏÎÏÎ ÏÎÏ autogen.sh"
+msgstr ""
+"ÎÎÎÎÎÏÏÎÎÎ ÎÎÎÏÎÏÏÎ ÎÎ ÎÎÎÎÏÎÏÏÎÎÎ ÎÎÎ ÎÏÎÏÏÎÎÎ ÏÏÎ ÎÏÎÏÎÎÎÏÎÎÏÏÎ ÏÏÎ "
+"JhAutobuild"
 
-#: ../jhbuild/commands/autobuild.py:38
-#: ../jhbuild/commands/base.py:167
-#: ../jhbuild/commands/base.py:275
-#: ../jhbuild/commands/make.py:45
-#: ../jhbuild/commands/tinderbox.py:40
+#: ../jhbuild/commands/autobuild.py:39 ../jhbuild/commands/base.py:178
+#: ../jhbuild/commands/base.py:286 ../jhbuild/commands/make.py:45
+#: ../jhbuild/commands/tinderbox.py:44
 msgid "run make clean before make"
 msgstr "ÎÎÏÎÎÎÏÏÎ make clean ÏÏÎÎ ÏÎ make"
 
-#: ../jhbuild/commands/autobuild.py:41
-#: ../jhbuild/commands/base.py:176
-#: ../jhbuild/commands/base.py:284
+#: ../jhbuild/commands/autobuild.py:42 ../jhbuild/commands/base.py:187
+#: ../jhbuild/commands/base.py:298
 msgid "run make distcheck after building"
 msgstr "ÎÎÏÎÎÎÏÏÎ make distcheck ÎÎÏÎ ÏÎÎ ÎÎÎÎÎÏÎÎÏÎ"
 
-#: ../jhbuild/commands/autobuild.py:44
-#: ../jhbuild/commands/base.py:46
-#: ../jhbuild/commands/base.py:188
-#: ../jhbuild/commands/base.py:436
-#: ../jhbuild/commands/clean.py:38
-#: ../jhbuild/commands/tinderbox.py:49
+#: ../jhbuild/commands/autobuild.py:45 ../jhbuild/commands/base.py:47
+#: ../jhbuild/commands/base.py:199 ../jhbuild/commands/base.py:450
+#: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:53
 msgid "treat the given modules as up to date"
 msgstr "ÎÎÏÎÏÎÎÏÎÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ ÏÎÏ ÎÎÎÎÎÏÎÎ ÏÏ ÎÎÎÎÎÏÏÎÎÎÎÏ"
 
-#: ../jhbuild/commands/autobuild.py:47
-#: ../jhbuild/commands/base.py:49
-#: ../jhbuild/commands/base.py:191
-#: ../jhbuild/commands/clean.py:41
-#: ../jhbuild/commands/tinderbox.py:52
+#: ../jhbuild/commands/autobuild.py:48 ../jhbuild/commands/base.py:202
+#: ../jhbuild/commands/clean.py:41 ../jhbuild/commands/tinderbox.py:56
 msgid "start building at the given module"
-msgstr "ÎÎÎÏÎÎ ÎÎÎÎÎÏÎÎÏÎÏ ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎÎ ÎÏÏÎÎÎÎ ÎÎÏÏÎÏÎ"
+msgstr "ÎÎÎÏÎÎ ÎÎÎÎÎÏÎÎÏÎÏ ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎÎ ÎÎÏÎÎÎÎ ÎÎÏÏÎÏÎ"
 
-#: ../jhbuild/commands/autobuild.py:50
+#: ../jhbuild/commands/autobuild.py:51
 msgid "jhautobuild report URL"
 msgstr "jhautobuild ÎÎÎÏÎÏÎÎ ÏÎ URL"
 
-#: ../jhbuild/commands/autobuild.py:53
+#: ../jhbuild/commands/autobuild.py:54
 msgid "verbose mode"
 msgstr "ÎÎÎÎÏÏÎÎÎ ÎÎÎÏÎÏÏÎÎÎ"
 
-#: ../jhbuild/commands/autobuild.py:70
+#: ../jhbuild/commands/autobuild.py:71
 msgid "report url for autobuild not specified"
 msgstr "ÎÎÎ ÎÏÎÎ ÎÏÎÏÏÎÎ ÎÎÎÏÎÏÎ url ÎÎÎ ÏÎÎ ÎÏÏÏÎÎÏÎ ÎÎÎÎÎÏÎÎÏÎ"
 
-#: ../jhbuild/commands/autobuild.py:81
-#: ../jhbuild/commands/base.py:72
-#: ../jhbuild/commands/base.py:238
-#: ../jhbuild/commands/base.py:476
-#: ../jhbuild/commands/clean.py:55
-#: ../jhbuild/commands/tinderbox.py:90
+#: ../jhbuild/commands/autobuild.py:82 ../jhbuild/commands/base.py:73
+#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/base.py:488
+#: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:94
 #, python-format
 msgid "%s not in module list"
 msgstr "ÏÎ %s ÎÎÎ ÏÎÏÎÎÎÎÎÎÎÎÏÎÎ ÏÏÎÎ ÎÎÏÎÎÎÎÎ ÎÎÎÏÎÏÏÎ"
 
-#: ../jhbuild/commands/base.py:37
+#: ../jhbuild/commands/base.py:38
 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:158
-#: ../jhbuild/commands/base.py:266
-#: ../jhbuild/commands/base.py:427
-#: ../jhbuild/commands/tinderbox.py:31
+#: ../jhbuild/commands/base.py:41 ../jhbuild/commands/base.py:89
+#: ../jhbuild/commands/base.py:123 ../jhbuild/commands/base.py:166
+#: ../jhbuild/commands/base.py:277 ../jhbuild/commands/base.py:441
+#: ../jhbuild/commands/tinderbox.py:32
 msgid "[ options ... ] [ modules ... ]"
 msgstr "[ ÎÏÎÎÎÎÎÏ ... ] [ ÎÎÏÏÎÏÎÏ ... ]"
 
-#: ../jhbuild/commands/base.py:52
-#: ../jhbuild/commands/base.py:194
-#: ../jhbuild/commands/base.py:442
-msgid "build only modules with the given tags"
-msgstr "ÎÎÎÎÎÏÎÎÏÎ ÎÏÎÎ ÏÏÎ ÎÎÎÏÎÏÏÎ ÎÎ ÏÎÏ ÎÎÎÎÎÎÎÎÏ ÎÏÎÎÎÏÎÏ"
+#: ../jhbuild/commands/base.py:50
+#| msgid "start building at the given module"
+msgid "start updating at the given module"
+msgstr "ÎÎÎÏÎÎ ÎÎÎÎÎÏÏÏÎÏ ÏÏÎ ÎÎÏÎÎÎÎ ÎÎÏÏÎÏÎ"
+
+#: ../jhbuild/commands/base.py:53
+#| msgid "build only modules with the given tags"
+msgid "update only modules with the given tags"
+msgstr "ÎÎÎÎÎÏÏÏÎ ÎÏÎÎ ÏÏÎ ÎÎÎÏÎÏÏÎ ÎÎ ÏÎÏ ÎÎÎÎÎÎÎÎÏ ÎÏÎÎÎÏÎÏ"
 
-#: ../jhbuild/commands/base.py:55
-#: ../jhbuild/commands/base.py:94
-#: ../jhbuild/commands/base.py:197
-#: ../jhbuild/commands/base.py:293
-#: ../jhbuild/commands/tinderbox.py:55
+#: ../jhbuild/commands/base.py:56 ../jhbuild/commands/base.py:95
+#: ../jhbuild/commands/base.py:208 ../jhbuild/commands/base.py:307
+#: ../jhbuild/commands/tinderbox.py:59
 msgid "set a sticky date when checking out modules"
 msgstr "ÎÏÎÏÎÏÎ ÎÎÎ ÎÎÎÎÏÎÎ (sticky) ÎÎÎÏÎÎÎÎÎÎ ÎÎÏÎ ÏÎÎ ÎÎÎÎÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ"
 
-#: ../jhbuild/commands/base.py:58
-#: ../jhbuild/commands/base.py:179
-#: ../jhbuild/commands/base.py:445
+#: ../jhbuild/commands/base.py:59 ../jhbuild/commands/base.py:190
+#: ../jhbuild/commands/base.py:459
 msgid "ignore all soft-dependencies"
 msgstr "ÎÎÎÏÎÏÎ ÏÎÏÎ ÏÏÎ ÎÏÎÎÏÎ-ÎÎÎÏÏÎÏÎÏÎ"
 
-#: ../jhbuild/commands/base.py:85
+#: ../jhbuild/commands/base.py:86
 msgid "Update one or more modules from version control"
 msgstr "ÎÎÎÎÎÎÎÎÏÎ ÎÎÏÏ Î ÏÎÏÎÏÏÎÏÎÏÏÎ ÎÎÎÏÎÏÏÎ ÎÎÏÏ ÏÎÏ ÎÎÎÎÏÎÏ ÎÎÎÎÏÎÏ"
 
-#: ../jhbuild/commands/base.py:103
-#: ../jhbuild/commands/base.py:138
-#: ../jhbuild/commands/base.py:368
-#: ../jhbuild/commands/base.py:385
-#: ../jhbuild/commands/rdepends.py:52
+#: ../jhbuild/commands/base.py:104 ../jhbuild/commands/base.py:142
+#: ../jhbuild/commands/base.py:382 ../jhbuild/commands/base.py:399
+#: ../jhbuild/commands/rdepends.py:52 ../jhbuild/moduleset.py:164
 #, 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:325
-#: ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/base.py:107 ../jhbuild/commands/base.py:145
+#: ../jhbuild/commands/base.py:339 ../jhbuild/commands/rdepends.py:47
 #: ../jhbuild/commands/uninstall.py:46
 msgid "This command requires a module parameter."
 msgstr "ÎÏÏÎ Î ÎÎÏÎÎÎ ÎÏÎÎÏÎÎ ÎÎÎ ÏÎÏÎÎÎÏÏÎ ÎÎÏÏÎÏÎÏ."
 
-#: ../jhbuild/commands/base.py:119
+#: ../jhbuild/commands/base.py:120
 msgid "Clean one or more modules"
 msgstr "ÎÎÎÎÏÎÏÎÏÏ ÎÎÎÏ Î ÏÎÏÎÏÏÎÏÎÏÏÎ ÎÎoÏÎÏÏÎ"
 
-#: ../jhbuild/commands/base.py:128
+#: ../jhbuild/commands/base.py:129
 msgid "honour the makeclean setting in config file"
 msgstr "ÎÎÏÎÎÏÏÏÎ ÏÎÏ makeclean ÏÏÎÎÎÏÎÏ ÏÏÎ ÎÏÏÎÎÎ ÏÏÎÎÎÏÎÏÎ"
 
-#: ../jhbuild/commands/base.py:145
+#: ../jhbuild/commands/base.py:132 ../jhbuild/commands/base.py:175
+#: ../jhbuild/commands/base.py:289 ../jhbuild/commands/tinderbox.py:41
+msgid "completely clean source tree"
+msgstr "ÎÏÎÎÏÏÏÏ ÎÎÎÎÏÏ ÎÎÎÏÏÎ ÎÏÎÎÎÎ"
+
+#: ../jhbuild/commands/base.py:149
 msgid "clean command called while makeclean is set to False, skipped."
-msgstr "ÎÏÎÎ ÎÎÎÎÎÎ Î ÎÎÏÎÎÎ clean ÎÎÏ Î makeclean ÎÏÎÎ ÎÏÎÏÏÎÎ ÏÏ ÎÎÏÎÎÏ, ÏÎÏÎÎÎÎÏÎ."
+msgstr ""
+"ÎÏÎÎ ÎÎÎÎÎÎ Î ÎÎÏÎÎÎ clean ÎÎÏ Î makeclean ÎÏÎÎ ÎÏÎÏÏÎÎ ÏÏ ÎÎÏÎÎÏ, ÏÎÏÎÎÎÎÏÎ."
 
-#: ../jhbuild/commands/base.py:155
+#: ../jhbuild/commands/base.py:163
 msgid "Update and compile all modules (the default)"
 msgstr "ÎÎÎÎÎÎÎÎÏÎ ÎÎÎ ÎÎÏÎÎÎÏÏÏÎÏÎ ÏÎÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ (ÏÏÎÎÏÎÎÎÎÎ)"
 
-#: ../jhbuild/commands/base.py:164
-#: ../jhbuild/commands/base.py:272
-msgid "This option does nothing anymore"
-msgstr "ÎÏÏÎ Î ÎÏÎÎÎÎÎ ÎÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎÎ ÏÎÎÎÎ"
-
-#: ../jhbuild/commands/base.py:170
-#: ../jhbuild/commands/base.py:278
+#: ../jhbuild/commands/base.py:181 ../jhbuild/commands/base.py:292
 #: ../jhbuild/commands/make.py:48
 msgid "run make check after building"
 msgstr "ÎÎÏÎÎÎÏÏÎ make check ÎÎÏÎ ÏÎÎ ÎÎÎÎÎÏÎÎÏÎ"
 
-#: ../jhbuild/commands/base.py:173
-#: ../jhbuild/commands/base.py:281
+#: ../jhbuild/commands/base.py:184 ../jhbuild/commands/base.py:295
 msgid "run make dist after building"
 msgstr "ÎÎÏÎÎÎÏÏÎ make dist ÎÎÏÎ ÏÎÎ ÎÎÎÎÎÏÎÎÏÎ"
 
-#: ../jhbuild/commands/base.py:182
-#: ../jhbuild/commands/base.py:287
-#: ../jhbuild/commands/tinderbox.py:43
+#: ../jhbuild/commands/base.py:193 ../jhbuild/commands/base.py:301
+#: ../jhbuild/commands/tinderbox.py:47
 msgid "skip version control update"
 msgstr "ÏÎÏÎÎÎÎÏÎ ÎÎÎÎÎÏÏÏÎÏ ÎÎÎÎÏÎÏ ÎÎÎÏÏÎÏÎ"
 
-#: ../jhbuild/commands/base.py:185
-#: ../jhbuild/commands/base.py:290
+#: ../jhbuild/commands/base.py:196 ../jhbuild/commands/base.py:304
 #: ../jhbuild/commands/make.py:51
 msgid "quiet (no output)"
 msgstr "ÎÏÏÏÎ (ÏÏÏÎÏ ÎÎÎÎÎ)"
 
-#: ../jhbuild/commands/base.py:200
-#: ../jhbuild/commands/base.py:296
+#: ../jhbuild/commands/base.py:205 ../jhbuild/commands/base.py:456
+msgid "build only modules with the given tags"
+msgstr "ÎÎÎÎÎÏÎÎÏÎ ÎÏÎÎ ÏÏÎ ÎÎÎÏÎÏÏÎ ÎÎ ÏÎÏ ÎÎÎÎÎÎÎÎÏ ÎÏÎÎÎÏÎÏ"
+
+#: ../jhbuild/commands/base.py:211 ../jhbuild/commands/base.py:310
 msgid "run tests in real X and not in Xvfb"
 msgstr "ÎÎÏÎÎÎÏÎ ÎÎÎÎÎÏÎ ÏÏÎ ÏÏÎÎÎÎÏÎÎÏ ÏÎÏÎÎÎÎÎÎÎ X ÎÎÎ ÏÏÎ ÏÏÎ Xvfb"
 
-#: ../jhbuild/commands/base.py:203
-#: ../jhbuild/commands/tinderbox.py:58
+#: ../jhbuild/commands/base.py:214 ../jhbuild/commands/tinderbox.py:62
 msgid "try to force checkout and autogen on failure"
 msgstr "ÏÏÎÏÏÎÎÎÎÎ ÎÎÎ force checkout ÎÎÎ autogen ÏÎ ÏÎÏÎÏÏÏÏÎ ÎÏÎÏÏÏÎÎÏ"
 
-#: ../jhbuild/commands/base.py:206
-#: ../jhbuild/commands/tinderbox.py:61
+#: ../jhbuild/commands/base.py:217 ../jhbuild/commands/tinderbox.py:65
 msgid "don't poison modules on failure"
 msgstr "ÎÎ ÎÎÎ ÎÎÎÎÏÎÏÎÎÏÎÎ ÏÎÏ ÎÎÏÏÎÏÎÏ ÏÎ ÏÎÏÎÏÏÏÏÎ ÎÏÎÏÏÏÎÎÏ"
 
-#: ../jhbuild/commands/base.py:209
-#: ../jhbuild/commands/base.py:299
-#: ../jhbuild/commands/tinderbox.py:64
+#: ../jhbuild/commands/base.py:220 ../jhbuild/commands/base.py:313
+#: ../jhbuild/commands/tinderbox.py:68
 msgid "build even if policy says not to"
 msgstr "ÎÎÎÎÎÏÎÎÏÎ ÎÎÏÎÎ ÎÎ ÎÎÎ Î ÏÎÎÎÏÎÎÎ ÏÎ ÎÏÎÎÎÏÎÏÎÎ"
 
-#: ../jhbuild/commands/base.py:212
+#: ../jhbuild/commands/base.py:223
 msgid "also build soft-dependencies that could be skipped"
 msgstr "ÎÏÎÏÎÏ ÎÎÎÎÎÏÎÎÏÎ ÏÏÎ ÎÏÎÎÏÎ-ÎÎÎÏÏÎÏÎÏÎ ÏÎÏ ÎÏÎÏÎÏÎ ÎÎ ÏÎÏÎÎÎÏÎÎÏÎ"
 
-#: ../jhbuild/commands/base.py:215
-#: ../jhbuild/commands/base.py:302
+#: ../jhbuild/commands/base.py:226 ../jhbuild/commands/base.py:316
 msgid "skip modules installed less than the given time ago"
 msgstr "ÏÎÏÎÎÎÏÎ ÎÎÎÏÎÏÏÎ ÏÎÏ ÎÎÎÎÏÎÏÏÎÎÎÎÎÎ ÏÏÎÎ ÎÏÏ ÏÎ ÎÎÎÎÎÎÎÎ ÏÏÎÎÎÎÎÎÎÎ"
 
-#: ../jhbuild/commands/base.py:218
-#: ../jhbuild/commands/tinderbox.py:67
-#| msgid "ignore all soft-dependencies"
+#: ../jhbuild/commands/base.py:229 ../jhbuild/commands/tinderbox.py:71
 msgid "ignore missing system dependencies"
 msgstr "ÎÎÎÏÎÏÎ ÎÎÎÏÏÎÏÎÏÎ ÏÎÏ ÎÎÎÏÎÏÎ ÎÏÏ ÏÎ ÏÏÏÏÎÎÎ"
 
-#: ../jhbuild/commands/base.py:242
+#: ../jhbuild/commands/base.py:253
 msgid "requested module is in the ignore list, nothing to do."
 msgstr "Î ÎÎÏÏÎÏÎ ÎÎÎÎÎ ÏÏÎ ÎÎÏÏÎ ÎÎÎÏÎÏÎÏ, ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎ ÎÎÎÏÎÎÎÎ."
 
-#: ../jhbuild/commands/base.py:249
-#: ../jhbuild/commands/tinderbox.py:96
+#: ../jhbuild/commands/base.py:260 ../jhbuild/commands/tinderbox.py:100
 #, python-format
-msgid "Required system dependencies not installed. Install using the command %(cmd)s or to ignore system dependencies use command-line option %(opt)s"
-msgstr "ÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎÎ ÎÎ ÎÏÎÎÏÎÏÎÎÎÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÎÏ ÏÏÏÏÎÎÎÏÎÏ. ÎÎÎÏÎ ÎÎÎÎÏÎÏÏÎÏÎ ÎÎ ÏÎÎ ÎÎÏÎÎÎ %(cmd)s Î ÎÎÎ ÎÎ ÏÎÏ ÎÎÎÎÎÏÎÏÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÏÎ ÏÎÎ ÎÏÎÎÎÎÎ ÏÎÏ ÎÏÎÎÎÎÏ ÎÎÏÎÎÏÎ %(opt)s"
+msgid ""
+"Required system dependencies not installed. Install using the command "
+"%(cmd)s or to ignore system dependencies use command-line option %(opt)s"
+msgstr ""
+"ÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎÎ ÎÎ ÎÏÎÎÏÎÏÎÎÎÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÎÏ ÏÏÏÏÎÎÎÏÎÏ. ÎÎÎÏÎ "
+"ÎÎÎÎÏÎÏÏÎÏÎ ÎÎ ÏÎÎ ÎÎÏÎÎÎ %(cmd)s Î ÎÎÎ ÎÎ ÏÎÏ ÎÎÎÎÎÏÎÏÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÏÎ ÏÎÎ "
+"ÎÏÎÎÎÎÎ ÏÎÏ ÎÏÎÎÎÎÏ ÎÎÏÎÎÏÎ %(opt)s"
 
-#: ../jhbuild/commands/base.py:263
+#: ../jhbuild/commands/base.py:274
 msgid "Update and compile one or more modules"
 msgstr "ÎÎÎÎÎÎÎÎÏÎ ÎÎÎ ÎÎÏÎÎÎÏÏÏÎÏÎ ÎÎÎÏ Î ÏÎÏÎÏÏÎÏÎÏÏÎ ÎÎÎÏÎÏÏÎ"
 
-#: ../jhbuild/commands/base.py:320
-#: ../jhbuild/commands/make.py:96
+#: ../jhbuild/commands/base.py:334 ../jhbuild/commands/make.py:95
 #, python-format
-msgid "module \"%s\" does not exist, created automatically using repository \"%s\""
-msgstr "ÎÎÎ ÏÏÎÏÏÎÎ Î ÎÎÏÏÎÏÎ \"%s\", ÎÎÎÎÎÏÏÎÎÎÎÎÎ ÎÏÏÏÎÎÏÎ ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ ÎÏÎÎÎÏÎÏÎÎ \"%s\""
+#| msgid ""
+#| "module \"%s\" does not exist, created automatically using repository \"%s"
+#| "\""
+msgid ""
+"module \"%(modname)s\" does not exist, created automatically using "
+"repository \"%(reponame)s\""
+msgstr ""
+"ÎÎÎ ÏÏÎÏÏÎÎ Î ÎÎÏÏÎÏÎ \"%(modname)s\", ÎÎÎÎÎÏÏÎÎÎÎÎÎ ÎÏÏÏÎÎÏÎ "
+"ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ ÎÏÎÎÎÏÎÏÎÎ \"%(reponame)s\""
 
-#: ../jhbuild/commands/base.py:333
+#: ../jhbuild/commands/base.py:347
 msgid "Run a command under the JHBuild environment"
 msgstr "ÎÎÏÎÎÎÏÎ ÎÎÏÎÎÎÏ ÏÏÏ ÏÎÏ ÏÎÏÎÎÎÎÎÎÎÏÎÏ JHBuild"
 
-#: ../jhbuild/commands/base.py:336
+#: ../jhbuild/commands/base.py:350
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr "[ ÎÏÎÎÎÎÎÏ ... ] ÏÏÏÎÏÎÎÎÎ [ ÏÎÏÎÎÎÏÏÎÎ ... ]"
 
-#: ../jhbuild/commands/base.py:342
+#: ../jhbuild/commands/base.py:356
 msgid "run command in build dir of the given module"
 msgstr "ÎÎÏÎÎÎÏÎ ÎÎÏÎÎÎÏ ÏÏÎ ÏÎÎÎÎÎ ÎÎÎÎÎÏÎÎÏÎÏ ÏÎÏ ÎÎÎÎÎÎÎÎÏ ÎÎÏÏÎÏÎÏ"
 
-#: ../jhbuild/commands/base.py:345
+#: ../jhbuild/commands/base.py:359
 msgid "run command in checkout dir of the given module"
 msgstr "ÎÎÏÎÎÎÏÎ ÎÎÏÎÎÎÏ ÏÏÎ ÏÎÎÎÎÎ ÎÏÎÏÎÎÎÏÎÎÏÏÎ ÏÎÏ ÎÎÎÎÎÎÎÎÏ ÎÎÏÏÎÏÎÏ"
 
-#: ../jhbuild/commands/base.py:358
-#: ../jhbuild/commands/base.py:402
+#: ../jhbuild/commands/base.py:372 ../jhbuild/commands/base.py:416
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÎÏÎÏ ÏÎÏ ÎÎÏÎÎÎÏ '%(command)s': %(err)s"
 
-#: ../jhbuild/commands/base.py:376
-#: ../jhbuild/commands/base.py:393
+#: ../jhbuild/commands/base.py:390 ../jhbuild/commands/base.py:407
 #, python-format
 msgid "Unable to execute the command '%s'"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÎÏÎÏ ÏÎÏ ÎÎÏÎÎÎÏ '%s'"
 
-#: ../jhbuild/commands/base.py:400
-#: ../jhbuild/frontends/gtkui.py:447
+#: ../jhbuild/commands/base.py:414 ../jhbuild/frontends/gtkui.py:447
 #: ../jhbuild/frontends/terminal.py:145
 msgid "No command given"
 msgstr "ÎÎ ÎÏÎÎÎÎ ÎÎÏÎÎÎ"
 
-#: ../jhbuild/commands/base.py:409
+#: ../jhbuild/commands/base.py:423
 msgid "Start a shell under the JHBuild environment"
 msgstr "ÎÎÎÏÎÎ ÎÎÎÏÏÎÏÏ ÏÏÏ ÏÎ ÏÎÏÎÎÎÎÎÎÎ JHBuild"
 
-#: ../jhbuild/commands/base.py:424
+#: ../jhbuild/commands/base.py:438
 msgid "List the modules that would be built"
 msgstr "ÎÎÏÎÎÎÎÎÏ ÏÏÎ ÎÎÎÏÎÏÏÎ ÏÎÏ ÎÎ ÎÏÎÏÎÏÏÎÎ ÎÎ ÎÎÎÎÎÎÎÎÎÎÏÎ"
 
-#: ../jhbuild/commands/base.py:433
+#: ../jhbuild/commands/base.py:447
 msgid "show which revision will be built"
 msgstr "ÎÎÏÎÎÎÏÎ ÎÎÎÎÎÏÏÎÏÎÏ ÏÎÏ ÎÎ ÎÎÎÎÎÎÎÎÎÎÎ"
 
-#: ../jhbuild/commands/base.py:439
+#: ../jhbuild/commands/base.py:453
 msgid "start list at the given module"
 msgstr "ÎÎÎÏÎÎ ÎÎÏÏÎÏ ÏÏÎÎ ÎÎÏÎÎÎÎ ÎÎÏÏÎÏÎ"
 
-#: ../jhbuild/commands/base.py:448
+#: ../jhbuild/commands/base.py:462
 msgid "also list soft-dependencies that could be skipped"
-msgstr "ÎÏÎÏÎÏ ÎÎ ÎÎÏÎÎÏÎÏÎÏÎ ÏÏÎ ÎÎÏÏÎ ÎÎ ÎÏÎÎÎÏ-ÎÎÎÏÏÎÏÎÎÏ ÏÎÏ ÎÏÎÏÎÏÎ ÎÎ ÏÎÏÎÎÎÏÎÎÏÎ"
+msgstr ""
+"ÎÏÎÏÎÏ ÎÎ ÎÎÏÎÎÏÎÏÎÏÎ ÏÏÎ ÎÎÏÏÎ ÎÎ ÎÏÎÎÎÏ-ÎÎÎÏÏÎÏÎÎÏ ÏÎÏ ÎÏÎÏÎÏÎ ÎÎ "
+"ÏÎÏÎÎÎÏÎÎÏÎ"
 
-#: ../jhbuild/commands/base.py:451
+#: ../jhbuild/commands/base.py:465
 msgid "list all modules, not only those that would be built"
 msgstr "ÏÏÎÎÎÎÎ ÏÎÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ, ÏÏÎ ÎÏÎÎ ÎÏÏÏÎ ÏÎÏ ÏÏÏÎÎÎÏÎÎ ÎÎ ÏÏÎÏÏÎÏÎ"
 
-#: ../jhbuild/commands/base.py:458
-#, python-format
-msgid "Conflicting options specified ('%s' and '%s')"
-msgstr "ÎÎÎÎÏÎÏÏÎÎÎÎ ÎÎ ÎÎÏÎÎÏÎÏÏÎÎÎÎÏ ÎÏÎÎÎÎÎÏ ('%s' ÎÎÎ '%s')"
+#: ../jhbuild/commands/base.py:472
+#| msgid "Conflicting options specified ('%s' and '%s')"
+msgid "Conflicting options specified ('--start-at' and '--all-modules')"
+msgstr ""
+"ÎÎÎÎÏÎÏÏÎÎÎÎ ÎÎÏÎÎÏÎÏÏÎÎÎÎÏ ÎÏÎÎÎÎÎÏ ('--start-at' ÎÎÎ '--all-modules')"
 
-#: ../jhbuild/commands/base.py:492
+#: ../jhbuild/commands/base.py:504
 msgid "Output a Graphviz dependency graph for one or more modules"
-msgstr "ÎÎÎÏÎÎÎÏÎ ÎÎÎÎÏÎÎÎÎÏÎÏ ÎÎÎÏÏÎÏÎÏÎ Graphviz ÎÎÎ ÎÎÎ Î ÏÎÏÎÏÏÏÏÎÏÎÏ ÎÎÏÏÎÏÎÏ"
+msgstr ""
+"ÎÎÎÏÎÎÎÏÎ ÎÎÎÎÏÎÎÎÎÏÎÏ ÎÎÎÏÏÎÏÎÏÎ Graphviz ÎÎÎ ÎÎÎ Î ÏÎÏÎÏÏÏÏÎÏÎÏ ÎÎÏÏÎÏÎÏ"
 
-#: ../jhbuild/commands/base.py:495
-#: ../jhbuild/commands/info.py:39
+#: ../jhbuild/commands/base.py:507 ../jhbuild/commands/info.py:39
 #: ../jhbuild/commands/uninstall.py:33
 msgid "[ modules ... ]"
 msgstr "[ ÎÎÏÏÎÏÎÏ ... ]"
 
-#: ../jhbuild/commands/base.py:501
+#: ../jhbuild/commands/base.py:513
 msgid "add dotted lines to soft dependencies"
 msgstr "ÏÏÎÏÎÎÎÎ ÎÎÎÎÎÎÎÎÎÎÎÏÎ ÎÏÎÎÎÏÎ ÏÏÎÏ ÎÏÎÎÎÏ ÎÎÎÏÏÎÏÎÎÏ"
 
-#: ../jhbuild/commands/base.py:504
+#: ../jhbuild/commands/base.py:516
 msgid "group modules from metamodule together"
 msgstr "ÎÎÎÎÎÏÎÎÎÏÎ ÎÎÎÏÎÏÏÎ ÎÏÎ ÏÎ metamodule"
 
@@ -360,8 +346,7 @@ msgstr "ÎÎÎÎÎÏÎÎÏÎ ÎÏÎÎÎÎÎÏÎ ÏÏÎÏÏÎÏÎÎÎÏ"
 msgid "Control buildbot"
 msgstr "ÎÎÎÎÏÎÏ ÏÎÏ buildbot"
 
-#: ../jhbuild/commands/bot.py:57
-#: ../jhbuild/commands/__init__.py:45
+#: ../jhbuild/commands/bot.py:57 ../jhbuild/commands/__init__.py:45
 #: ../jhbuild/commands/make.py:36
 msgid "[ options ... ]"
 msgstr "[ ÎÏÎÎÎÎÎÏ ... ]"
@@ -433,14 +418,16 @@ msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÏÎÏÎ ÎÎÎ ÏÎ slave %s."
 msgid "Failed to parse slave config for %s."
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÏÏÎÏ ÏÏÎÎÎÏÎÏÎ slave ÎÎÎ ÏÎ %s."
 
-#: ../jhbuild/commands/bot.py:806
-#: ../jhbuild/commands/bot.py:814
+#: ../jhbuild/commands/bot.py:806 ../jhbuild/commands/bot.py:814
 msgid "failed to get buildbot PID"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÏÎÏ ÏÎÏ buildbot PID"
 
 #: ../jhbuild/commands/checkbranches.py:28
-msgid "Check modules in GNOME Git repository have the correct branch definition"
-msgstr "ÎÎÎÎÏÎÏ ÎÎÎÏÎÏÏÎ ÏÏÎ ÎÏÎÎÎÏÎÏÎÎ Git ÏÎÏ GNOME ÎÎÎ ÎÏÎÏÎ ÏÎÎ ÏÏÏÏÏ ÎÏÎÏÎÏ ÎÎÎÎÎÏ"
+msgid ""
+"Check modules in GNOME Git repository have the correct branch definition"
+msgstr ""
+"ÎÎÎÎÏÎÏ ÎÎÎÏÎÏÏÎ ÏÏÎ ÎÏÎÎÎÏÎÏÎÎ Git ÏÎÏ GNOME ÎÎÎ ÎÏÎÏÎ ÏÎÎ ÏÏÏÏÏ ÎÏÎÏÎÏ "
+"ÎÎÎÎÎÏ"
 
 #: ../jhbuild/commands/checkbranches.py:65
 #, python-format
@@ -467,10 +454,9 @@ msgstr "ÎÎÎÎÏÎÏÎÏÏ ÏÎÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ"
 
 #: ../jhbuild/commands/goalreport.py:328
 msgid "Report GNOME modules status wrt various goals"
-msgstr ""
+msgstr "ÎÎÎÏÎÏÎ ÎÎÏÎÏÏÎÏÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏ GNOME ÎÎÎÏÎÏÎÏÎÎÏÎ ÏÏÏÏÏÎ wrt"
 
 #: ../jhbuild/commands/goalreport.py:351
-#| msgid "Could not check git program"
 msgid "check to perform"
 msgstr "ÎÎÎÎÏÎÏ ÎÎÎ ÎÎÏÎÎÎÏÎ"
 
@@ -482,8 +468,7 @@ msgstr "ÎÎÎÎÎÏÎÎÏÎ targets ÎÏÎ ÎÎÎ GUI app"
 msgid "Display information about one or more modules"
 msgstr "ÎÏÎÎÎÎÎ ÏÎÎÏÎÏÎÏÎÏÎ ÎÎÎÏ Î ÏÎÏÎÏÏÎÏÎÏÏÎ ÎÎÎÏÎÏÏÎ"
 
-#: ../jhbuild/commands/info.py:51
-#: ../jhbuild/commands/uninstall.py:43
+#: ../jhbuild/commands/info.py:51 ../jhbuild/commands/uninstall.py:43
 #, python-format
 msgid "unknown module %s"
 msgstr "ÎÎÎÏÏÏÎ ÎÎÏÏÎÏÎ %s"
@@ -500,18 +485,15 @@ msgstr "ÎÏÎÎÎÏÎ ÎÎÏÏÎÏÎÏ:"
 msgid "Type:"
 msgstr "ÎÏÏÎÏ:"
 
-#: ../jhbuild/commands/info.py:65
-#: ../jhbuild/commands/info.py:69
+#: ../jhbuild/commands/info.py:65 ../jhbuild/commands/info.py:69
 msgid "Install version:"
-msgstr "ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÎÎÎÏÎ"
+msgstr "ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÎÎÎÏÎ"
 
-#: ../jhbuild/commands/info.py:66
-#: ../jhbuild/commands/info.py:70
+#: ../jhbuild/commands/info.py:66 ../jhbuild/commands/info.py:70
 msgid "Install date:"
 msgstr "ÎÎÎÏÎÎÎÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎÏ:"
 
-#: ../jhbuild/commands/info.py:69
-#: ../jhbuild/commands/info.py:70
+#: ../jhbuild/commands/info.py:69 ../jhbuild/commands/info.py:70
 msgid "not installed"
 msgstr "ÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ"
 
@@ -587,70 +569,66 @@ msgstr "ÎÎÏÎ:"
 msgid "Before:"
 msgstr "ÎÏÎÎ:"
 
-#: ../jhbuild/commands/__init__.py:78
-#: ../jhbuild/commands/sysdeps.py:61
+#: ../jhbuild/commands/__init__.py:84 ../jhbuild/commands/sysdeps.py:48
+#, python-format
 #| msgid "Requires:"
+msgid "required=%s"
+msgstr "required=%s"
+
+#: ../jhbuild/commands/__init__.py:86 ../jhbuild/commands/sysdeps.py:50
+#, python-format
+#| msgid "not installed"
+msgid "installed=%s"
+msgstr "installed=%s"
+
+#. Translators: This is used to separate items of package metadata
+#: ../jhbuild/commands/__init__.py:88 ../jhbuild/commands/sysdeps.py:52
+msgid ", "
+msgstr ", "
+
+#: ../jhbuild/commands/__init__.py:90 ../jhbuild/commands/sysdeps.py:54
+#, python-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#: ../jhbuild/commands/__init__.py:94 ../jhbuild/commands/sysdeps.py:79
 msgid "Required packages:"
 msgstr "ÎÏÎÎÏÎÏÎÎÎÎ ÏÎÎÎÏÎ:"
 
-#: ../jhbuild/commands/__init__.py:79
-#: ../jhbuild/commands/sysdeps.py:62
-#: ../jhbuild/commands/sysdeps.py:86
-#| msgid "System installed packages which are too old:"
+#: ../jhbuild/commands/__init__.py:95 ../jhbuild/commands/sysdeps.py:80
+#: ../jhbuild/commands/sysdeps.py:108
 msgid "  System installed packages which are too old:"
 msgstr "  ÎÎ ÏÏÏÏÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÎÎÏÎ ÏÎÏ ÎÎÎÎÎ ÎÏÎÎÏÎ ÏÎÎÎÎ:"
 
-#: ../jhbuild/commands/__init__.py:84
-#: ../jhbuild/commands/sysdeps.py:55
-#: ../jhbuild/commands/sysdeps.py:66
-#: ../jhbuild/commands/sysdeps.py:90
-#, python-format
-#| msgid "  %(pkg)s (required=%(req)s, installed=%(installed)s)"
-msgid "    %(pkg)s (required=%(req)s, installed=%(installed)s)"
-msgstr "    %(pkg)s (ÎÏÎÎÏÎÏÎÎÎÎ=%(req)s, ÎÎÎÎÏÎÏÏÎÎÎÎÎ=%(installed)s)"
-
-#: ../jhbuild/commands/__init__.py:88
-#: ../jhbuild/commands/__init__.py:98
-#: ../jhbuild/commands/sysdeps.py:70
-#: ../jhbuild/commands/sysdeps.py:80
-#: ../jhbuild/commands/sysdeps.py:94
-#| msgid "  (none)"
+#: ../jhbuild/commands/__init__.py:105 ../jhbuild/commands/__init__.py:117
+#: ../jhbuild/commands/sysdeps.py:89 ../jhbuild/commands/sysdeps.py:102
+#: ../jhbuild/commands/sysdeps.py:117
 msgid "    (none)"
 msgstr "   (ÎÎÎÎÎÎ)"
 
-#: ../jhbuild/commands/__init__.py:90
-#: ../jhbuild/commands/sysdeps.py:72
-#: ../jhbuild/commands/sysdeps.py:96
-#| msgid "No matching system package installed:"
+#: ../jhbuild/commands/__init__.py:107 ../jhbuild/commands/sysdeps.py:91
+#: ../jhbuild/commands/sysdeps.py:119
 msgid "  No matching system package installed:"
 msgstr "  ÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÎÎÎÎÎ ÎÎÏÎÏÏÎÎÏÎ ÏÎÎÎÏÎ ÏÏÏÏÎÎÎÏÎÏ"
 
-#: ../jhbuild/commands/__init__.py:94
-#: ../jhbuild/commands/sysdeps.py:76
-#: ../jhbuild/commands/sysdeps.py:99
-#, python-format
-#| msgid "  %(pkg)s (required=%(req)s)"
-msgid "    %(pkg)s (required=%(req)s)"
-msgstr "    %(pkg)s (ÎÏÎÎÏÎÏÎÎÎÎ=%(req)s)"
-
-#: ../jhbuild/commands/__init__.py:115
+#: ../jhbuild/commands/__init__.py:134
 msgid "JHBuild commands are:"
 msgstr "ÎÎ ÎÎÏÎÎÎÏ JHBuild ÎÎÎÎÎ:"
 
-#: ../jhbuild/commands/__init__.py:121
+#: ../jhbuild/commands/__init__.py:140
 msgid "For more information run \"jhbuild <command> --help\""
 msgstr "ÎÎÎ ÏÎÏÎÏÏÏÏÎÏÎÏ ÏÎÎÏÎÏÎÏÎÎÏ ÎÎÏÎÎÎÏÏÎ \"jhbuild <command> --help\""
 
-#: ../jhbuild/commands/__init__.py:130
+#: ../jhbuild/commands/__init__.py:149
 msgid "Information about available jhbuild commands"
 msgstr "ÎÎÎÏÎÏÎÏÎÎÏ ÎÎÎ ÏÎÏ ÎÎÏÎÎÎÏ jhbuild"
 
-#: ../jhbuild/commands/__init__.py:157
+#: ../jhbuild/commands/__init__.py:176
 #, python-format
 msgid "no such command (did you mean \"jhbuild build %s\"?)"
 msgstr "ÎÎ ÎÎÎÏÏÎ ÎÎÏÎÎÎ (ÎÎÏÏÏ ÎÎÎÎÎÏÏÎÏÎ \"jhbuild build %s\";)"
 
-#: ../jhbuild/commands/__init__.py:159
+#: ../jhbuild/commands/__init__.py:178
 #, python-format
 msgid "no such command (did you mean \"jhbuild run %s\"?)"
 msgstr "ÎÎ ÎÎÎÏÏÎ ÎÎÏÎÎÎ (ÎÎÏÏÏ ÎÎÎÎÎÏÏÎÏÎ \"jhbuild run %s\";)"
@@ -659,15 +637,20 @@ msgstr "ÎÎ ÎÎÎÏÏÎ ÎÎÏÎÎÎ (ÎÎÏÏÏ ÎÎÎÎÎÏÏÎÏÎ \"jhbuil
 msgid "Compile and install the module for the current directory"
 msgstr "ÎÎÏÎÎÎÏÏÏÎÏÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ ÎÎÏÏÎÏÎÏ ÏÏÎÎ ÏÏÏÎÎÏ ÏÎÎÎÎÎ"
 
-#: ../jhbuild/commands/make.py:79
+#: ../jhbuild/commands/make.py:42
+msgid "always run autogen.sh"
+msgstr "ÎÎÏÎÎÎÏÎ ÏÎÎÏÎÏÎ ÏÎÏ autogen.sh"
+
+#: ../jhbuild/commands/make.py:78
 #, python-format
 msgid "The current directory is not in the checkout root %r"
 msgstr "Î ÏÏÏÎÎÏÏ ÏÎÎÎÎÎÏ ÎÎÎ ÏÏÎÏÏÎÎ ÏÏÎ checkout root %r"
 
-#: ../jhbuild/commands/make.py:91
+#: ../jhbuild/commands/make.py:90
 #, python-format
 msgid "No module matching current directory %r in the moduleset"
-msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÎÎÏÏÎÏÎ ÏÎÏ ÎÎ ÏÎÎÏÎÎÎÎÎ ÏÏÎÎ ÏÏÏÎÎÏ ÏÎÎÎÎÎ %r ÏÏÎ moduleset"
+msgstr ""
+"ÎÎÎ ÏÏÎÏÏÎÎ ÎÎÏÏÎÏÎ ÏÎÏ ÎÎ ÏÎÎÏÎÎÎÎÎ ÏÏÎÎ ÏÏÏÎÎÏ ÏÎÎÎÎÎ %r ÏÏÎ moduleset"
 
 #: ../jhbuild/commands/rdepends.py:28
 msgid "Display reverse-dependencies of a module"
@@ -703,10 +686,8 @@ msgstr "ÏÎ checkout root (%s) ÎÎÎ ÎÎÎÎÎ ÎÎÎÏÎÏÎÎÎ"
 msgid "install prefix (%s) is not writable"
 msgstr "ÏÎ install prefix (%s) ÎÎÎ ÎÎÎÎÎ ÎÎÎÏÎÏÎÎÎ"
 
-#: ../jhbuild/commands/sanitycheck.py:66
-#: ../jhbuild/commands/sanitycheck.py:69
-#: ../jhbuild/commands/sanitycheck.py:72
-#: ../jhbuild/commands/sanitycheck.py:75
+#: ../jhbuild/commands/sanitycheck.py:66 ../jhbuild/commands/sanitycheck.py:69
+#: ../jhbuild/commands/sanitycheck.py:72 ../jhbuild/commands/sanitycheck.py:75
 #: ../jhbuild/commands/sanitycheck.py:78
 #: ../jhbuild/commands/sanitycheck.py:120
 #: ../jhbuild/commands/sanitycheck.py:124
@@ -714,16 +695,12 @@ msgstr "ÏÎ install prefix (%s) ÎÎÎ ÎÎÎÎÎ ÎÎÎÏÎÏÎÎÎ"
 #: ../jhbuild/commands/sanitycheck.py:141
 #: ../jhbuild/commands/sanitycheck.py:147
 #: ../jhbuild/commands/sanitycheck.py:149
-#: ../jhbuild/commands/sanitycheck.py:151
-#: ../jhbuild/modtypes/cmake.py:94
-#: ../jhbuild/versioncontrol/bzr.py:206
-#: ../jhbuild/versioncontrol/cvs.py:297
+#: ../jhbuild/commands/sanitycheck.py:151 ../jhbuild/modtypes/cmake.py:82
+#: ../jhbuild/versioncontrol/bzr.py:206 ../jhbuild/versioncontrol/cvs.py:297
 #: ../jhbuild/versioncontrol/darcs.py:110
 #: ../jhbuild/versioncontrol/fossil.py:107
-#: ../jhbuild/versioncontrol/git.py:448
-#: ../jhbuild/versioncontrol/hg.py:103
-#: ../jhbuild/versioncontrol/mtn.py:142
-#: ../jhbuild/versioncontrol/svn.py:311
+#: ../jhbuild/versioncontrol/git.py:448 ../jhbuild/versioncontrol/hg.py:103
+#: ../jhbuild/versioncontrol/mtn.py:142 ../jhbuild/versioncontrol/svn.py:313
 #, python-format
 msgid "%s not found"
 msgstr "ÎÎ ÎÏÎÎÎÎÎ ÏÎ %s"
@@ -735,8 +712,14 @@ msgstr "ÏÎ aclocal ÎÎÎ ÎÎÎÎÎÏÏÎÎÎÎ %s ÎÎÎÏÎÎÎÏÎÎÎÏ"
 
 #: ../jhbuild/commands/sanitycheck.py:92
 #, python-format
-msgid "Please copy the lacking macros (%s) in one of the following paths: %s"
-msgstr "ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÏÎÏÏÎ ÏÎÏ ÎÎÎÎÏÎÎÏ ÎÎÎÏÎÎÎÏÎÎÎÏ (%s) ÏÎ ÎÎÎ ÎÏÏ ÏÎÏÏ ÎÎÏÎÎÏÎÎÏÏ ÏÎÎÎÎÎÏÏ: %s"
+#| msgid ""
+#| "Please copy the lacking macros (%s) in one of the following paths: %s"
+msgid ""
+"Please copy the lacking macros (%(macros)s) in one of the following paths: "
+"%(path)s"
+msgstr ""
+"ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÏÎÏÏÎ ÏÎÏ ÎÎÎÎÏÎÎÏ ÎÎÎÏÎÎÎÏÎÎÎÏ (%(macros)s) ÏÎ ÎÎÎ ÎÏÏ ÏÎÏÏ "
+"ÎÎÏÎÎÏÎÎÏÏ ÏÎÎÎÎÎÏÏ: %(path)s"
 
 #: ../jhbuild/commands/sanitycheck.py:100
 msgid "Could not find XML catalog"
@@ -753,9 +736,9 @@ msgid "Could not find the perl module %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏ perl %s"
 
 #: ../jhbuild/commands/sanitycheck.py:128
-#, python-format
-msgid "%s or %s not found"
-msgstr "ÎÎ ÎÏÎÎÎÎÎ Ïo %s Î ÏÎ %s"
+#| msgid "%s or %s not found"
+msgid "curl or wget not found"
+msgstr "ÎÎ ÎÏÎÎÎÎÎ ÏÎ curl Î ÏÎ wget"
 
 #: ../jhbuild/commands/sanitycheck.py:137
 msgid "Installed git program is not the right git"
@@ -769,56 +752,69 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÏÎÏ ÏÏÎÎÏÎÎÎÎÏÎÏ git"
 msgid "Print out a moduleset for the exact versions that are checked out"
 msgstr "ÎÎÏÏÏÏÏÎ ÎÎÏÏ moduleset ÎÎÎ ÏÎÏ ÎÎÏÎÎÎÎÏ ÎÎÎÏÏÎÎÏ ÏÎÏ ÎÏÎÏÎ ÎÎÎÎÏÎÎÎ"
 
-#: ../jhbuild/commands/sysdeps.py:30
+#: ../jhbuild/commands/sysdeps.py:31
 msgid "Check and install tarball dependencies using system packages"
-msgstr "ÎÎÎÎÎÏÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÏÏÎ ÎÎÎÏÏÎÏÎÎÏ tarball ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ ÏÏÏÏÎÎÎ ÏÎÎÎÏÏÎ"
+msgstr ""
+"ÎÎÎÎÎÏÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÏÏÎ ÎÎÎÏÏÎÏÎÎÏ tarball ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ ÏÏÏÏÎÎÎ "
+"ÏÎÎÎÏÏÎ"
 
-#: ../jhbuild/commands/sysdeps.py:38
+#: ../jhbuild/commands/sysdeps.py:39
 msgid "Install pkg-config modules via system"
 msgstr "ÎÎÎÎÏÎÏÏÎÏÎ ÎÎÎÏÎÏÏÎ pkg-config ÎÎÏÏ ÏÎÏ ÏÏÏÏÎÎÎÏÎÏ"
 
-#: ../jhbuild/commands/sysdeps.py:51
+#: ../jhbuild/commands/sysdeps.py:68
 msgid "System installed packages which are new enough:"
 msgstr "ÎÎ ÏÏÏÏÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÎÎÏÎ ÏÎÏ ÎÎÎÎÎ ÎÏÎÎÏÎ ÎÎÎ:"
 
-#: ../jhbuild/commands/sysdeps.py:59
-#: ../jhbuild/commands/sysdeps.py:103
+#: ../jhbuild/commands/sysdeps.py:77 ../jhbuild/commands/sysdeps.py:129
 msgid "  (none)"
 msgstr "  (ÎÎÎÎÎÎ)"
 
-#: ../jhbuild/commands/sysdeps.py:85
+#: ../jhbuild/commands/sysdeps.py:107
 msgid "Optional packages: (JHBuild will build the missing packages)"
 msgstr "ÎÏÎÎÎÏÎÏÎÎÎ ÏÎÎÎÏÎ: (ÎÎ JHBuild ÎÎ ÏÏÎÏÎÎ ÏÎ ÏÎÎÎÏÎ ÏÎÏ ÎÎÎÏÎÏÎ)"
 
-#: ../jhbuild/commands/sysdeps.py:108
+#: ../jhbuild/commands/sysdeps.py:137
+#, python-format
+msgid ""
+"%(cmd)s is required to install packages on this system. Please install "
+"%(cmd)s."
+msgstr ""
+"ÎÏÎÎÏÎÎÏÎÎ Î %(cmd)s ÎÎÎ ÏÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÎÎÏÏÎ ÏÏÎ ÏÏÏÏÎÎÎ. ÎÎÏÎÎÎÎÏ "
+"ÎÎÎÎÏÎÏÏÎÏÏÎ %(cmd)s."
+
+#: ../jhbuild/commands/sysdeps.py:142
 msgid "Don't know how to install packages on this system"
 msgstr "ÎÎÎ ÎÎÏÏÎÎÏ ÏÏÏ ÎÎ ÎÎÎÎÏÎÏÏÎÏÏ ÏÎÎÎÏÎ ÏÎ ÎÏÏÏ ÏÎ ÏÏÏÏÎÎÎ"
 
-#: ../jhbuild/commands/sysdeps.py:111
+#: ../jhbuild/commands/sysdeps.py:145
 #, python-format
 msgid "No uninstalled system dependencies to install for modules: %r"
-msgstr "ÎÎÎ ÏÏÎÏÏÎÏÎ ÎÏÎÎÎÎÏÎÏÏÎÎÎÎÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÏÏÏÎÎÎÏÎÏ ÏÏÎÏ ÎÎÎÎÏÎÏÏÎÏÎ ÎÎÎ ÏÎÏ ÎÎÏÏÎÏÎÏ: %r"
+msgstr ""
+"ÎÎÎ ÏÏÎÏÏÎÏÎ ÎÏÎÎÎÎÏÎÏÏÎÎÎÎÎÏ ÎÎÎÏÏÎÏÎÎÏ ÏÏÏÏÎÎÎÏÎÏ ÏÏÎÏ ÎÎÎÎÏÎÏÏÎÏÎ ÎÎÎ ÏÎÏ "
+"ÎÎÏÏÎÏÎÏ: %r"
 
-#: ../jhbuild/commands/sysdeps.py:113
+#: ../jhbuild/commands/sysdeps.py:147
 #, python-format
 msgid "Installing dependencies on system: %s"
 msgstr "ÎÎÎÎÏÎÏÏÎÏÎ ÎÎÎÏÏÎÏÎÏÎ ÏÏÎ ÏÏÏÏÎÎÎ: %s"
 
-#: ../jhbuild/commands/tinderbox.py:28
+#: ../jhbuild/commands/tinderbox.py:29
 msgid "Build modules non-interactively and store build logs"
-msgstr "ÎÎ-ÎÎÎÎÏÎÏÏÎÎÎ ÎÎÎÎÎÏÎÎÏÎ ÎÎÎÏÎÏÏÎ ÎÎÎ ÎÏÎÎÎÎÎÏÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ ÎÎÎÎÎÏÎÎÏÎÏ"
+msgstr ""
+"ÎÎ-ÎÎÎÎÏÎÏÏÎÎÎ ÎÎÎÎÎÏÎÎÏÎ ÎÎÎÏÎÏÏÎ ÎÎÎ ÎÏÎÎÎÎÎÏÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ ÎÎÎÎÎÏÎÎÏÎÏ"
 
-#: ../jhbuild/commands/tinderbox.py:46
+#: ../jhbuild/commands/tinderbox.py:50
 msgid "directory to store build logs in"
 msgstr "ÏÎÎÎÎÎÏ ÎÎÎ ÎÏÎÎÎÎÎÏÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ ÎÎÎÎÎÏÎÎÏÎÏ (build logs)"
 
-#: ../jhbuild/commands/tinderbox.py:78
+#: ../jhbuild/commands/tinderbox.py:82
 msgid "output directory for tinderbox build not specified"
 msgstr "ÎÎÎ ÏÏÎÏÎÎÎÏÎÏÏÎÎÎ Î ÏÎÎÎÎÎÏ ÎÎÏÎÎÏ ÏÎÏ ÎÎÎÎÎÏÎÎÏÎÏ tinderbox"
 
 #: ../jhbuild/commands/twoninetynine.py:161
 msgid "Report GNOME modules status wrt 3.0 goals"
-msgstr ""
+msgstr "ÎÎÎÏÎÏÎ ÎÎÏÎÏÏÎÏÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏ GNOME ÏÏÏÏÏÎ wrt 3.0"
 
 #: ../jhbuild/commands/uninstall.py:30
 msgid "Uninstall all modules"
@@ -829,117 +825,147 @@ msgstr "ÎÏÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏÎ ÏÏÎ ÎÎÎÏÎÏÏÎ"
 msgid "Module %(mod)r is not installed"
 msgstr "ÎÎÎ ÎÏÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎ Î ÎÎÏÏÎÏÎ %(mod)r"
 
-#: ../jhbuild/config.py:174
-msgid "JHBuild start script has been installed in ~/.local/bin/jhbuild, you should remove the old version that is still in ~/bin/ (or make it a symlink to ~/.local/bin/jhbuild)"
-msgstr "ÎÎ ÏÎÎÎÏÎÎ ÎÎÎÏÎÎÏ JÎÎuild ÎÏÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎ ÏÏÎ ~/.local/bin/jhbuild, ÎÎ ÏÏÎÏÎÎ ÎÎ ÎÏÎÎÏÎÏÎÏÎ ÏÎÎ ÏÎÎÎÎ ÎÎÎÎÏÎ ÏÎÏ ÎÎÎÎÎ ÎÎÏÎÎ ÏÏÎ ~/bin/ (Î ÏÏÎÎÎÏÎ ÎÎÎ ÏÏÎÎÎÎÎÎÏ ÎÎÏÎÏ ÏÏÎÏ ÏÎ ~/.local/bin/jhbuild)"
+#: ../jhbuild/config.py:172
+msgid ""
+"JHBuild start script has been installed in ~/.local/bin/jhbuild, you should "
+"remove the old version that is still in ~/bin/ (or make it a symlink to ~/."
+"local/bin/jhbuild)"
+msgstr ""
+"ÎÎ ÏÎÎÎÏÎÎ ÎÎÎÏÎÎÏ JÎÎuild ÎÏÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎ ÏÏÎ ~/.local/bin/jhbuild, ÎÎ "
+"ÏÏÎÏÎÎ ÎÎ ÎÏÎÎÏÎÏÎÏÎ ÏÎÎ ÏÎÎÎÎ ÎÎÎÎÏÎ ÏÎÏ ÎÎÎÎÎ ÎÎÏÎÎ ÏÏÎ ~/bin/ (Î ÏÏÎÎÎÏÎ "
+"ÎÎÎ ÏÏÎÎÎÎÎÎÏ ÎÎÏÎÏ ÏÏÎÏ ÏÎ ~/.local/bin/jhbuild)"
 
-#: ../jhbuild/config.py:186
-msgid "Obsolete JHBuild start script, make sure it is removed then do run 'make install'"
-msgstr "ÎÎÏÏÏÎÎÎÎÎ ÏÎÎÎÏÎÎ ÎÎÎÏÎÎÏ ÏÎÏ JÎÎuild, ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÎÏÎÎ ÎÏÎÎÏÎÎÎÎ ÎÎÎ ÎÎÏÏÏÎÎ ÎÎÏÎÎÎÏÏÎ 'make install'"
+#: ../jhbuild/config.py:184
+msgid ""
+"Obsolete JHBuild start script, make sure it is removed then do run 'make "
+"install'"
+msgstr ""
+"ÎÎÏÏÏÎÎÎÎÎ ÏÎÎÎÏÎÎ ÎÎÎÏÎÎÏ ÏÎÏ JÎÎuild, ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÎÏÎÎ ÎÏÎÎÏÎÎÎÎ ÎÎÎ "
+"ÎÎÏÏÏÎÎ ÎÎÏÎÎÎÏÏÎ 'make install'"
 
-#: ../jhbuild/config.py:197
+#: ../jhbuild/config.py:192
 msgid "could not load config defaults"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÏÏÏÏÎÏ ÏÏÎÎÏÎÎÎÎÎÎÎÏÎ ÏÏÎÎÎÏÎÏÎ"
 
-#: ../jhbuild/config.py:208
+#: ../jhbuild/config.py:203
 #, python-format
 msgid "could not load config file, %s is missing"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÏÏÏÏÎÏ ÎÏÏÎÎÎÏ ÏÏÎÎÎÏÎÏÎ, ÎÎÎÏÎÎ ÏÎ %s"
 
-#: ../jhbuild/config.py:214
+#: ../jhbuild/config.py:209
 #, python-format
-msgid "The default location of the configuration file has changed. Please move %(old_path)s to %(new_path)s."
-msgstr "ÎÏÎÎ ÎÎÎÎÎÎÎ Î ÏÏÎÎÏÎÎÎÎÎÎÎÎ ÏÎÏÎÎÎÏÎÎ ÏÎÏ ÎÏÏÎÎÎÏ ÏÏÎÎÎÏÎÏÎ. ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÎÎÏÏÎ ÏÎ %(old_path)s ÏÏÎ %(new_path)s."
+msgid ""
+"The default location of the configuration file has changed. Please move "
+"%(old_path)s to %(new_path)s."
+msgstr ""
+"ÎÏÎÎ ÎÎÎÎÎÎÎ Î ÏÏÎÎÏÎÎÎÎÎÎÎÎ ÏÎÏÎÎÎÏÎÎ ÏÎÏ ÎÏÏÎÎÎÏ ÏÏÎÎÎÏÎÏÎ. ÎÎÏÎÎÎÎÏ "
+"ÎÎÏÎÎÎÎÎÏÏÎ ÏÎ %(old_path)s ÏÏÎ %(new_path)s."
 
-#: ../jhbuild/config.py:244
+#: ../jhbuild/config.py:239
 #, python-format
 msgid "Could not include config file (%s)"
 msgstr "ÎÎ ÎÏÏÎÎÎ ÏÏÎÎÎÏÎÏÎ (%s) ÎÎÎ ÎÏÎÎ ÎÏÎÎÏÎ ÎÎ ÏÏÎÏÏÎÎÎÎ"
 
-#: ../jhbuild/config.py:258
+#: ../jhbuild/config.py:253
 msgid "could not load config file"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÏÏÏÏÎÏ ÏÏÎÎÏÎÎÎÎÎÎÎÏÎ ÏÏÎÎÎÏÎÏÎ"
 
-#: ../jhbuild/config.py:272
+#: ../jhbuild/config.py:267
 #, python-format
 msgid "unknown keys defined in configuration file: %s"
 msgstr "ÎÏÎÏÏÎÎÎÎ ÎÎÎÏÏÏÎ ÎÎÎÎÎÎÎ ÏÏÎ ÎÏÏÎÎÎ ÏÏÎÎÎÏÎÏÎ: %s"
 
-#: ../jhbuild/config.py:279
+#: ../jhbuild/config.py:274
 #, python-format
-msgid "the \"%s\" configuration variable is deprecated, you should use \"repos['gnome.org']\"."
-msgstr "Î ÏÏÎÎÎÏÎ ÎÎÏÎÎÎÎÏÎÏ \"%s\" ÎÏÎÎ ÎÎÏÎÏÎÎÎÎÎ, ÎÎ ÏÏÎÏÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎÏÎ ÏÎ \"repos['gnome.org']\"."
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos"
+"['gnome.org']\"."
+msgstr ""
+"Î ÏÏÎÎÎÏÎ ÎÎÏÎÎÎÎÏÎÏ \"%s\" ÎÏÎÎ ÎÎÏÎÏÎÎÎÎÎ, ÎÎ ÏÏÎÏÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎÏÎ ÏÎ "
+"\"repos['gnome.org']\"."
 
-#: ../jhbuild/config.py:284
-#: ../jhbuild/config.py:289
+#: ../jhbuild/config.py:279 ../jhbuild/config.py:284
 #, python-format
-msgid "the \"%s\" configuration variable is deprecated, you should use \"repos\"."
-msgstr "Î ÎÎÏÎÎÎÎÏÎ configuration \"%s\" ÎÏÎÎ ÎÎÏÎÏÎÎÎÎÎ, ÎÎ ÏÏÎÏÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎÏÎ ÏÎ \"repos\"."
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos\"."
+msgstr ""
+"Î ÎÎÏÎÎÎÎÏÎ configuration \"%s\" ÎÏÎÎ ÎÎÏÎÏÎÎÎÎÎ, ÎÎ ÏÏÎÏÎÎ ÎÎ "
+"ÏÏÎÏÎÎÎÏÎÎÎÏÎÏÎ ÏÎ \"repos\"."
 
-#: ../jhbuild/config.py:323
+#: ../jhbuild/config.py:318
 msgid "invalid checkout mode"
 msgstr "ÎÎÏÏÎ ÎÎÎÏÎÏÏÎÎÎ ÎÎÏÎÎÏ"
 
-#: ../jhbuild/config.py:327
+#: ../jhbuild/config.py:322
 #, python-format
 msgid "invalid checkout mode (module: %s)"
 msgstr "ÎÎÏÏÎ ÎÎÎÏÎÏÏÎÎÎ ÎÎÏÎÎÏ (ÎÎÏÏÎÏÎ: %s)"
 
-#: ../jhbuild/config.py:329
+#: ../jhbuild/config.py:324
 msgid "copy mode requires copy_dir to be set"
 msgstr "Î ÎÎÎÏÎÏÏÎÎÎ ÎÎÏÎÎÏÎÏÎÏ ÎÏÎÎÏÎÎ Î ÎÎÎÎÏÎÏÎÏÏ ÏÎÏ ÏÎÎÎÎÎÏ copy_dir"
 
-#: ../jhbuild/config.py:334
+#: ../jhbuild/config.py:329
 #, python-format
 msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
-msgstr "ÎÎÎ ÎÏÎÎÎÎÎ Î ÏÎÎÎÎÎÏ modulesets (%s), ÎÏÎÎÎÏÎÎÏÎÎÎÏÎ ÏÎÏ use_local_modulesets"
+msgstr ""
+"ÎÎÎ ÎÏÎÎÎÎÎ Î ÏÎÎÎÎÎÏ modulesets (%s), ÎÏÎÎÎÏÎÎÏÎÎÎÏÎ ÏÎÏ "
+"use_local_modulesets"
 
-#: ../jhbuild/config.py:340
-#: ../jhbuild/config.py:342
-#: ../jhbuild/config.py:344
-#: ../jhbuild/config.py:346
-#: ../jhbuild/config.py:349
+#: ../jhbuild/config.py:335 ../jhbuild/config.py:337 ../jhbuild/config.py:339
+#: ../jhbuild/config.py:341 ../jhbuild/config.py:344
 #, python-format
 msgid "%s must be an absolute path"
 msgstr "%s ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÎÎÎ ÎÎÏÎÎÎÏ ÎÎÎÎÏÎÎÎ"
 
-#: ../jhbuild/config.py:362
+#: ../jhbuild/config.py:357
 #, python-format
 msgid "install prefix (%s) can not be created"
 msgstr "ÎÎÎ ÎÏÎÏÎÎ ÎÎ ÎÎÎÎÎÏÏÎÎÎÎÎ ÏÎ ÏÏÏÎÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎÏ (%s)"
 
-#: ../jhbuild/config.py:369
+#: ../jhbuild/config.py:364
 #, python-format
 msgid "working directory (%s) can not be created"
 msgstr "ÎÎÎ ÎÏÎÏÎÎ ÎÎ ÎÎÎÎÎÏÏÎÎÎÎÎ Î ÏÎÎÎÎÎÏ ÎÏÎÎÏÎÎÏ (%s)"
 
-#: ../jhbuild/config.py:476
+#: ../jhbuild/config.py:479
 #, python-format
 msgid "Can't create %s directory"
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÎÏÏÎÎÎ ÏÎÏ %s ÎÎÏÎÎÏÎÎÏ"
 
-#: ../jhbuild/config.py:507
+#: ../jhbuild/config.py:510
 #, python-format
-msgid "Unable to determine python version using the PYTHON environment variable (%s). Using default \"%s\""
-msgstr "ÎÎÏÎÎÎÎÎ ÏÏÎÏÎÎÎÏÎÏÎÎÏ ÎÎÎÎÏÎÏ ÏÎÏ python ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎÎ ÎÎÏÎÎÎÎÏÎ ÏÎÏÎÎÎÎÎÎÎÏÎÏ (%s). ÎÏÎÏÎ ÏÎÏ ÏÏÎÎÏÎÎÎÎÎÎÎÎÏ \"%s\""
+msgid ""
+"Unable to determine python version using the PYTHON environment variable "
+"(%s). Using default \"%s\""
+msgstr ""
+"ÎÎÏÎÎÎÎÎ ÏÏÎÏÎÎÎÏÎÏÎÎÏ ÎÎÎÎÏÎÏ ÏÎÏ python ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎÎ ÎÎÏÎÎÎÎÏÎ "
+"ÏÎÏÎÎÎÎÎÎÎÏÎÏ (%s). ÎÏÎÏÎ ÏÎÏ ÏÏÎÎÏÎÎÎÎÎÎÎÎÏ \"%s\""
 
-#: ../jhbuild/config.py:522
+#: ../jhbuild/config.py:525
 #, python-format
-msgid "Unable to determine python site-packages directory using the PYTHON environment variable (%s). Using default \"%s\""
-msgstr "ÎÎÏÎÎÎÎÎ ÏÏÎÏÎÎÎÏÎÏÎÎÏ ÏÎÏ ÎÎÏÎÎÏÎÎÏ site-packages ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎÎ ÎÎÏÎÎÎÎÏÎ ÏÎÏÎÎÎÎÎÎÎÏÎÏ PYTHON (%s). ÎÏÎÏÎ ÏÎÏ ÏÏÎÎÏÎÎÎÎÎÎÎÎÏ \"%s\""
+msgid ""
+"Unable to determine python site-packages directory using the PYTHON "
+"environment variable (%s). Using default \"%s\""
+msgstr ""
+"ÎÎÏÎÎÎÎÎ ÏÏÎÏÎÎÎÏÎÏÎÎÏ ÏÎÏ ÎÎÏÎÎÏÎÎÏ site-packages ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎÎ "
+"ÎÎÏÎÎÎÎÏÎ ÏÎÏÎÎÎÎÎÎÎÏÎÏ PYTHON (%s). ÎÏÎÏÎ ÏÎÏ ÏÏÎÎÏÎÎÎÎÎÎÎÎÏ \"%s\""
 
-#: ../jhbuild/config.py:569
+#: ../jhbuild/config.py:572
 #, python-format
 msgid "Could not create GConf config (%s)"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÎÏÏÎÎÎÏ ÏÏÎÎÎÏÎÏÎ GConf (%s)"
 
-#: ../jhbuild/config.py:654
+#: ../jhbuild/config.py:662
 msgid "Failed to parse 'min_age' relative time"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÏÏÎÏ ÏÎÏ ÏÏÎÏÎÎÎÏ ÏÏÏÎÎÏ 'min_age'"
 
-#: ../jhbuild/config.py:668
-msgid "quiet mode has been disabled because the Python curses module is missing."
-msgstr "Î ÎÎÏÏÏÎÎ ÎÎÎÏÎÏÏÎÎÎ ÎÏÎÎ ÎÏÎÎÎÏÎÎÏÎÎÎÎÎÎ ÎÏÎÎÎÎ Î ÎÎÏÏÎÏÎ Python curses ÎÎÎÏÎÎ."
+#: ../jhbuild/config.py:676
+msgid ""
+"quiet mode has been disabled because the Python curses module is missing."
+msgstr ""
+"Î ÎÎÏÏÏÎÎ ÎÎÎÏÎÏÏÎÎÎ ÎÏÎÎ ÎÏÎÎÎÏÎÎÏÎÎÎÎÎÎ ÎÏÎÎÎÎ Î ÎÎÏÏÎÏÎ Python curses "
+"ÎÎÎÏÎÎ."
 
 #: ../jhbuild.desktop.in.in.h:1
 msgid "GNOME Build Tool"
@@ -963,8 +989,7 @@ msgstr "ÎÏÎÎÎÎ ÎÎÎÎÎÎÎÏÏÎ, ÎÎÎÎÏÎÎÎÎÏÎ ÏÏÎÏÏÎÎ
 msgid "Error: %s"
 msgstr "ÎÏÎÎÎÎ: %s"
 
-#: ../jhbuild/frontends/autobuild.py:185
-#: ../jhbuild/utils/cmds.py:66
+#: ../jhbuild/frontends/autobuild.py:185 ../jhbuild/utils/cmds.py:66
 #, python-format
 msgid "Error running %s"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÎÎÏÎÏ %s"
@@ -976,7 +1001,7 @@ msgstr "ÎÎÎÎÎÎ: ÎÎÎÎÏ ÎÎÎÏÎÏÏÎÏÏÎÏÎÎ, ÎÎÎÎÎÏÎ Ï
 #: ../jhbuild/frontends/autobuild.py:218
 #, python-format
 msgid "Starting Build #%s"
-msgstr "ÎÎÎÏÎÎ ÎÎÎÎÎÏÎÎÏÎÏ #%s"
+msgstr "ÎÎÎÏÎÎ ÎÎÎÎÎÏÎÎÏÎÏ #%s"
 
 #: ../jhbuild/frontends/autobuild.py:232
 #, python-format
@@ -1028,8 +1053,7 @@ msgstr "Î ÎÎÏÏÎÏÎ %(mod)s ÎÎÎ ÎÎÎÎÎÎÎÎÎÎÎÎ ÎÏÎÏ ÏÎ
 msgid "Running post-installation trigger script: %r"
 msgstr "ÎÎÏÎÎÎÏÎ ÏÎÎÎÏÎÎÏ ÎÎÎÏÎÎÏÎÎÎÏÎÏ ÎÎÏÎ ÏÎÎ ÎÎÎÎÏÎÏÏÎÏÎ: %r"
 
-#: ../jhbuild/frontends/buildscript.py:254
-#: ../jhbuild/frontends/gtkui.py:595
+#: ../jhbuild/frontends/buildscript.py:254 ../jhbuild/frontends/gtkui.py:596
 #, python-format
 msgid "%(command)s returned with an error code (%(rc)s)"
 msgstr "%(command)s ÎÏÎÏÏÏÎÏÎ ÎÎÎÏÎÎ ÎÎÎÎÏÏ (%(rc)s)"
@@ -1040,11 +1064,11 @@ msgstr "ÎÎÎÎ..."
 
 #: ../jhbuild/frontends/gtkui.py:140
 msgid "Choose Module:"
-msgstr "ÎÏÎÎÎÎÏÎ ÎÎÏÏÎÏÎ:"
+msgstr "ÎÏÎÎÎÎÎ ÎÎÏÏÎÏÎÏ:"
 
 #: ../jhbuild/frontends/gtkui.py:160
 msgid "Build Progress"
-msgstr "ÎÏÏÎÎÎÏ ÎÎÎÎÎÏÎÎÏÎÏ"
+msgstr "ÎÏÏÎÎÎÏ ÎÎÎÎÎÏÎÎÏÎÏ"
 
 #: ../jhbuild/frontends/gtkui.py:163
 msgid "Terminal"
@@ -1059,8 +1083,7 @@ msgstr "ÎÎÎÏÎÎ"
 msgid "Build Completed"
 msgstr "ÎÎÎÎÎÎÏÏÎÎÎÎ Î ÎÎÎÎÎÏÎÎÏÎ"
 
-#: ../jhbuild/frontends/gtkui.py:377
-#: ../jhbuild/frontends/terminal.py:283
+#: ../jhbuild/frontends/gtkui.py:377 ../jhbuild/frontends/terminal.py:283
 #, python-format
 msgid "Error during phase %(phase)s of %(module)s"
 msgstr "ÎÎÎÎÏ ÎÎÏÎ ÏÎ ÏÎÏÎ %(phase)s ÏÎÏ %(module)s"
@@ -1069,30 +1092,25 @@ msgstr "ÎÎÎÎÏ ÎÎÏÎ ÏÎ ÏÎÏÎ %(phase)s ÏÎÏ %(module)s"
 msgid "Pick an Action"
 msgstr "ÎÎÎÎÎÎÏÎ ÎÎÎ ÎÎÎÏÎÎÎÎ"
 
-#: ../jhbuild/frontends/gtkui.py:397
-#: ../jhbuild/frontends/terminal.py:310
+#: ../jhbuild/frontends/gtkui.py:397 ../jhbuild/frontends/terminal.py:310
 #, python-format
 msgid "Rerun phase %s"
 msgstr "ÎÏÎÎÎÎÏÎÎÎÏÎ ÏÎÏÎÏ %s"
 
-#: ../jhbuild/frontends/gtkui.py:400
-#: ../jhbuild/frontends/terminal.py:312
+#: ../jhbuild/frontends/gtkui.py:400 ../jhbuild/frontends/terminal.py:312
 #, python-format
 msgid "Ignore error and continue to %s"
 msgstr "ÎÎÎÎÎÏÏÎ ÏÎ ÏÏÎÎÎÎ ÎÎÎ ÏÏÎÎÏÎÏÎÏÎ ÎÎ %s"
 
-#: ../jhbuild/frontends/gtkui.py:403
-#: ../jhbuild/frontends/terminal.py:314
+#: ../jhbuild/frontends/gtkui.py:403 ../jhbuild/frontends/terminal.py:314
 msgid "Ignore error and continue to next module"
 msgstr "ÎÎÎÎÎÏÏÎ ÏÎ ÏÏÎÎÎÎ ÎÎÎ ÏÏÎÎÏÎÏÎÏÎ ÏÏÎÎ ÎÏÏÎÎÎÎ ÎÎÏÏÎÏÎ"
 
-#: ../jhbuild/frontends/gtkui.py:405
-#: ../jhbuild/frontends/terminal.py:315
+#: ../jhbuild/frontends/gtkui.py:405 ../jhbuild/frontends/terminal.py:315
 msgid "Give up on module"
 msgstr "ÎÎÎÏÎÏÎ ÏÎÏ ÎÎÏÏÎÏÎÏ"
 
-#: ../jhbuild/frontends/gtkui.py:412
-#: ../jhbuild/frontends/terminal.py:324
+#: ../jhbuild/frontends/gtkui.py:412 ../jhbuild/frontends/terminal.py:324
 #, python-format
 msgid "Go to phase \"%s\""
 msgstr "ÎÎÏÎÎÎÏÎ ÏÏÎ ÏÎÏÎ \"%s\""
@@ -1106,28 +1124,27 @@ msgstr "ÎÎÎÎÎÎÎ ÏÎÏÎÎÏÎÎÎÏ"
 msgid "%(command)s died with signal %(rc)s"
 msgstr "%(command)s ÎÎÎÏÏÎÎÎÎ ÎÎ ÏÎÎÎ %(rc)s"
 
-#: ../jhbuild/frontends/gtkui.py:645
+#: ../jhbuild/frontends/gtkui.py:646
 msgid "Module"
 msgstr "ÎÎÏÏÎÏÎ"
 
-#: ../jhbuild/frontends/gtkui.py:664
+#: ../jhbuild/frontends/gtkui.py:665
 msgid "Start At"
 msgstr "ÎÎÎÏÎÎ ÎÏÏ"
 
-#: ../jhbuild/frontends/gtkui.py:707
+#: ../jhbuild/frontends/gtkui.py:708
 msgid "Preferences"
 msgstr "ÎÏÎÏÎÎÎÏÎÎÏ"
 
-#: ../jhbuild/frontends/gtkui.py:719
+#: ../jhbuild/frontends/gtkui.py:720
 msgid "Disable network access"
 msgstr "ÎÏÎÎÎÏÎÎÏÎÎÎÏÎ ÏÏÏÏÎÎÏÎÏ ÎÎÎÏÏÎÏ"
 
-#: ../jhbuild/frontends/gtkui.py:720
+#: ../jhbuild/frontends/gtkui.py:721
 msgid "Don't poison modules on failure"
 msgstr "ÎÎ ÎÎÎ ÎÎÎÎÏÎÏÎÎÏÎÎ ÏÎÏ ÎÎÏÏÎÏÎÏ ÏÎ ÏÎÏÎÏÏÏÏÎ ÎÏÎÏÏÏÎÎÏ"
 
-#: ../jhbuild/frontends/terminal.py:180
-#: ../jhbuild/frontends/tinderbox.py:249
+#: ../jhbuild/frontends/terminal.py:180 ../jhbuild/frontends/tinderbox.py:249
 #, python-format
 msgid "%(configuration_variable)s invalid key %(key)s"
 msgstr "%(configuration_variable)s ÎÎÎÎÎÏÎÎÎÎ ÎÎÎÎÎÎ %(key)s"
@@ -1141,8 +1158,7 @@ msgstr ""
 "ÎÏÎÎÏÎÏÏÎÎÏ ÎÎÏÎ ÏÎÎ ÎÎÎÎÎ:\n"
 
 #. it could happen on a really badly-timed ctrl-c (see bug 551641)
-#: ../jhbuild/frontends/terminal.py:259
-#: ../jhbuild/frontends/terminal.py:263
+#: ../jhbuild/frontends/terminal.py:259 ../jhbuild/frontends/terminal.py:263
 #, python-format
 msgid "########## Error running %s"
 msgstr "########## ÎÎÎÎÏ ÎÎÏÎ ÏÎÎ ÎÎÏÎÎÎÏÎ ÏÎÏ %s"
@@ -1155,13 +1171,11 @@ msgstr "ÎÏÎÏÏÏÎÎ"
 msgid "the following modules were not built"
 msgstr "ÎÎÎ ÎÏÎÏÎ ÎÎÎÎÎÎÎÎÎÎÎ ÎÎ ÎÎÏÎÎÏÎÎÏ ÎÎÏÏÎÏÎÏ"
 
-#: ../jhbuild/frontends/terminal.py:298
-#: ../jhbuild/frontends/tinderbox.py:400
+#: ../jhbuild/frontends/terminal.py:298 ../jhbuild/frontends/tinderbox.py:400
 msgid "automatically retrying configure"
 msgstr "ÎÏÏÏÎÎÏÎ ÏÏÎÏÏÎÎÎÎÎ ÏÏÎÎÎÏÎÏ"
 
-#: ../jhbuild/frontends/terminal.py:302
-#: ../jhbuild/frontends/tinderbox.py:405
+#: ../jhbuild/frontends/terminal.py:302 ../jhbuild/frontends/tinderbox.py:405
 msgid "automatically forcing a fresh checkout"
 msgstr "ÎÏÏÏÎÎÏÎÏ ÎÎÎÎÎÎÎÎÏÎÏÏ ÎÎÎÏ ÎÎÏÎÎÏ"
 
@@ -1202,8 +1216,12 @@ msgid "%prog [ -f config ] command [ options ... ]"
 msgstr "%prog [ -f config ] ÎÎÏÎÎÎ [ ÎÏÎÎÎÎÎÏ ... ]"
 
 #: ../jhbuild/main.py:108
-msgid "Build a set of modules from diverse repositories in correct dependency order (such as GNOME)."
-msgstr "ÎÎÎÎÎÏÏÎÎÎ ÎÎÎÏ ÎÎÏÎÎÏ ÎÏÏ ÎÎÎÏÎÏÎÏÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÏÎÏÏÎ ÎÎ ÏÎ ÏÏÏÏÎ ÏÎÎÏÎ ÎÎÎÏÏÎÏÎÏÎ (ÏÏÏÏ ÏÎ GNOME)."
+msgid ""
+"Build a set of modules from diverse repositories in correct dependency order "
+"(such as GNOME)."
+msgstr ""
+"ÎÎÎÎÎÏÏÎÎÎ ÎÎÎÏ ÎÎÏÎÎÏ ÎÏÏ ÎÎÎÏÎÏÎÏÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÏÎÏÏÎ ÎÎ ÏÎ ÏÏÏÏÎ ÏÎÎÏÎ "
+"ÎÎÎÏÏÎÏÎÏÎ (ÏÏÏÏ ÏÎ GNOME)."
 
 #: ../jhbuild/main.py:113
 msgid "Display this help and exit"
@@ -1229,150 +1247,156 @@ msgstr "ÎÎÎÎÏÏÎÎÎ"
 msgid "EOF"
 msgstr "EOF"
 
-#: ../jhbuild/modtypes/autotools.py:120
-#: ../jhbuild/modtypes/cmake.py:87
-#: ../jhbuild/modtypes/linux.py:113
-#: ../jhbuild/modtypes/waf.py:74
+#: ../jhbuild/modtypes/autotools.py:206 ../jhbuild/modtypes/cmake.py:75
+#: ../jhbuild/modtypes/linux.py:109 ../jhbuild/modtypes/waf.py:71
 msgid "Configuring"
 msgstr "ÎÏÎÎÎÏÎ"
 
-#: ../jhbuild/modtypes/autotools.py:214
-#: ../jhbuild/modtypes/cmake.py:114
-#: ../jhbuild/modtypes/linux.py:145
-#: ../jhbuild/modtypes/waf.py:85
+#: ../jhbuild/modtypes/autotools.py:251 ../jhbuild/modtypes/cmake.py:102
+#: ../jhbuild/modtypes/linux.py:141 ../jhbuild/modtypes/waf.py:82
 msgid "Cleaning"
 msgstr "ÎÎÎÎÎÎÏÎÏÎ"
 
-#: ../jhbuild/modtypes/autotools.py:223
-#: ../jhbuild/modtypes/cmake.py:123
-#: ../jhbuild/modtypes/distutils.py:57
-#: ../jhbuild/modtypes/linux.py:158
-#: ../jhbuild/modtypes/perl.py:52
-#: ../jhbuild/modtypes/waf.py:92
+#: ../jhbuild/modtypes/autotools.py:260 ../jhbuild/modtypes/cmake.py:111
+#: ../jhbuild/modtypes/distutils.py:57 ../jhbuild/modtypes/linux.py:154
+#: ../jhbuild/modtypes/perl.py:52 ../jhbuild/modtypes/waf.py:89
 msgid "Building"
 msgstr "ÎÎÎÎÎÏÎÎÏÎ"
 
-#: ../jhbuild/modtypes/autotools.py:257
-#: ../jhbuild/modtypes/waf.py:109
+#: ../jhbuild/modtypes/autotools.py:294 ../jhbuild/modtypes/waf.py:106
 msgid "Checking"
 msgstr "ÎÎÎÎÏÎÏ"
 
-#: ../jhbuild/modtypes/autotools.py:270
-#: ../jhbuild/modtypes/cmake.py:132
-#: ../jhbuild/modtypes/waf.py:120
+#: ../jhbuild/modtypes/autotools.py:307 ../jhbuild/modtypes/cmake.py:120
+#: ../jhbuild/modtypes/waf.py:117
 msgid "Creating tarball for"
-msgstr "ÎÎÎÎÎÏÏÎÎÎ tarball ÎÎÎ"
+msgstr "ÎÎÎÎÎÏÏÎÎÎ ÏÏÎÏÎÎÏÎÎÎÎÏ ÎÏÏÎÎÎÏ ÎÎÎ"
 
-#: ../jhbuild/modtypes/autotools.py:279
+#: ../jhbuild/modtypes/autotools.py:316
 msgid "Dist checking"
 msgstr "ÎÎÎÎÏÎÏ Dist"
 
-#: ../jhbuild/modtypes/autotools.py:288
-#: ../jhbuild/modtypes/cmake.py:141
-#: ../jhbuild/modtypes/distutils.py:69
-#: ../jhbuild/modtypes/perl.py:66
-#: ../jhbuild/modtypes/waf.py:130
+#: ../jhbuild/modtypes/autotools.py:325 ../jhbuild/modtypes/cmake.py:129
+#: ../jhbuild/modtypes/distutils.py:69 ../jhbuild/modtypes/perl.py:66
+#: ../jhbuild/modtypes/waf.py:127
 msgid "Installing"
 msgstr "ÎÎÎÎÏÎÏÏÎÏÎ"
 
-#: ../jhbuild/modtypes/autotools.py:307
+#: ../jhbuild/modtypes/autotools.py:350
 msgid "Distcleaning"
 msgstr "ÎÎÎÎÎÎÏÎÏÎ Dist"
 
-#: ../jhbuild/modtypes/__init__.py:59
+#: ../jhbuild/modtypes/__init__.py:60
 #, python-format
 msgid "unknown module type %s"
 msgstr "ÎÎÎÏÏÏÎÏ ÏÏÏÎÏ ÎÎÏÏÎÏÎÏ %s"
 
-#: ../jhbuild/modtypes/__init__.py:75
+#: ../jhbuild/modtypes/__init__.py:77
 #, python-format
 msgid "dep node for module %s is missing package attribute"
 msgstr "Î ÎÏÎÎÎÏ dep ÎÎÎ ÏÎÎ ÎÎÏÏÎÏÎ %s ÎÎÎ ÏÎÏÎÎÏÎÎ ÎÎÎÏÏÎÏÎÏ ÏÎÏ ÏÎÎÎÏÎÏ"
 
-#: ../jhbuild/modtypes/__init__.py:116
+#: ../jhbuild/modtypes/__init__.py:86 ../jhbuild/modtypes/__init__.py:93
+#, python-format
+#| msgid "dep node for module %s is missing package attribute"
+msgid "%(node)s node for %(module)s module is missing %(attribute)s attribute"
+msgstr ""
+"Î ÎÏÎÎÎÏ %(node)s ÎÎÎ ÏÎÎ ÎÎÏÏÎÏÎ %(module)s ÎÎÎ ÏÎÏÎÎÏÎÎ ÏÎÎ ÎÎÎÏÏÎÏÎ "
+"%(attribute)s"
+
+#: ../jhbuild/modtypes/__init__.py:139
 #, python-format
 msgid "no <branch> element found for %s"
 msgstr "ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÏÏÎÎÏÎÎÎ <branch> ÎÎÎ ÏÎ %s"
 
-#: ../jhbuild/modtypes/__init__.py:124
+#: ../jhbuild/modtypes/__init__.py:147
 #, python-format
-msgid "Repository=%(missing)s not found for module id=%(module)s. Possible repositories are %(possible)s"
-msgstr "ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÎÏÎÎÎÏÎÏÎÎ=%(missing)s ÎÎÎ ÏÎÎ ÎÎÏÏÎÏÎ id=%(module)s. ÎÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÎ %(possible)s"
+msgid ""
+"Repository=%(missing)s not found for module id=%(module)s. Possible "
+"repositories are %(possible)s"
+msgstr ""
+"ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÎÏÎÎÎÏÎÏÎÎ=%(missing)s ÎÎÎ ÏÎÎ ÎÎÏÏÎÏÎ id=%(module)s. ÎÎÎÎÎÎ "
+"ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÎ %(possible)s"
 
-#: ../jhbuild/modtypes/__init__.py:131
+#: ../jhbuild/modtypes/__init__.py:154
 #, python-format
-msgid "Default repository=%(missing)s not found for module id=%(module)s. Possible repositories are %(possible)s"
-msgstr "ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÎÎÎÎÏÎÏÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ=%(missing)s ÎÎÎ ÏÎÎ ÎÎÏÏÎÏÎ id=%(module)s. ÎÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÎ %(possible)s"
+msgid ""
+"Default repository=%(missing)s not found for module id=%(module)s. Possible "
+"repositories are %(possible)s"
+msgstr ""
+"ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÎÎÎÎÏÎÏÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ=%(missing)s ÎÎÎ ÏÎÎ ÎÎÏÏÎÏÎ id="
+"%(module)s. ÎÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÎ %(possible)s"
 
-#: ../jhbuild/modtypes/__init__.py:200
+#: ../jhbuild/modtypes/__init__.py:226
 #, python-format
 msgid "Deleting .la file: %r"
 msgstr "ÎÎÎÎÏÎÏÎ ÎÏÏÎÎÎÏ .la: %r"
 
-#: ../jhbuild/modtypes/__init__.py:246
+#: ../jhbuild/modtypes/__init__.py:277
 #, python-format
 msgid "Failed to rename %(src)r to %(dest)r: %(msg)s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÏÎÎÎÎÎÏÎÎÏ %(src)r ÏÎ %(dest)r: %(msg)s"
 
-#: ../jhbuild/modtypes/__init__.py:275
+#: ../jhbuild/modtypes/__init__.py:307
 #, python-format
 msgid "Moving temporary DESTDIR %r into build prefix"
 msgstr "ÎÎÏÎÎÎÎÎÏÎ ÏÏÎÏÏÏÎÎÎÏ DESTDIR %r ÏÏÎ ÏÏÏÎÎÎÎ ÎÎÎÎÎÏÎÎÏÎÏ"
 
-#: ../jhbuild/modtypes/__init__.py:277
+#: ../jhbuild/modtypes/__init__.py:309
 #, python-format
 msgid "Install complete: %d files copied"
 msgstr "ÎÎÎÎÎÎÏÏÏÎ ÎÎÎÎÏÎÏÏÎÏÎÏ: ÎÎÏÎÎÏÎÏÎÎÎÎ %d ÎÏÏÎÎÎ"
 
-#: ../jhbuild/modtypes/__init__.py:296
+#: ../jhbuild/modtypes/__init__.py:328
 #, python-format
-msgid "Files remaining in buildroot %(dest)r; module may have installed files outside of prefix."
-msgstr "ÎÏÏÎÎÎ ÏÎÏ ÏÎÏÎÎÎÎÎÎÎ ÏÏÎ buildroot %(dest)r; Î ÎÎÏÏÎÏÎ ÎÏÏÏ ÎÎÎÎÏÎÏÏÎÏÎ ÎÏÏÎÎÎ ÎÎÏÏÏ ÏÏÎÎÎÎÎÏÎÏ."
+msgid ""
+"Files remaining in buildroot %(dest)r; module may have installed files "
+"outside of prefix."
+msgstr ""
+"ÎÏÏÎÎÎ ÏÎÏ ÏÎÏÎÎÎÎÎÎÎ ÏÏÎ buildroot %(dest)r; Î ÎÎÏÏÎÏÎ ÎÏÏÏ ÎÎÎÎÏÎÏÏÎÏÎ "
+"ÎÏÏÎÎÎ ÎÎÏÏÏ ÏÏÎÎÎÎÎÏÎÏ."
 
-#: ../jhbuild/modtypes/__init__.py:314
+#: ../jhbuild/modtypes/__init__.py:346
 #, python-format
 msgid "Module failed to install into DESTDIR %(dest)r"
 msgstr "Î ÎÎÏÏÎÏÎ ÎÏÎÏÏÏÎ ÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎ ÏÏÎ DESTDIR %(dest)r"
 
-#: ../jhbuild/modtypes/__init__.py:324
+#: ../jhbuild/modtypes/__init__.py:356
 #, python-format
 msgid "%d files remaining from previous build"
 msgstr "ÎÏÎÎÎÎÎÏÎ %d ÎÏÏÎÎÎ ÎÏÏ ÏÏÎÎÎÎÏÎÎÎÎ ÎÎÎÎÎÏÎÎÏÎ"
 
-#: ../jhbuild/modtypes/__init__.py:327
-#: ../jhbuild/utils/packagedb.py:265
+#: ../jhbuild/modtypes/__init__.py:359 ../jhbuild/utils/packagedb.py:282
 #, python-format
 msgid "Deleted: %(file)r"
 msgstr "ÎÎÎÎÏÎÏÎÏÎÎ: %(file)r"
 
-#: ../jhbuild/modtypes/__init__.py:332
+#: ../jhbuild/modtypes/__init__.py:364
 #, python-format
 msgid "Failed to delete no longer installed file %(file)r: %(msg)s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÏÎÏÎÏ ÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎÏ ÎÏÏÎÎÎÏ %(file)r: %(msg)s"
 
-#: ../jhbuild/modtypes/__init__.py:382
+#: ../jhbuild/modtypes/__init__.py:416
 #, python-format
 msgid "Skipping %s (not updated)"
 msgstr "ÎÎÏÎÎÎÎÏÎ %s (ÎÎÎ ÎÎÎÎÎÏÏÎÎÎÎ)"
 
-#: ../jhbuild/modtypes/__init__.py:394
+#: ../jhbuild/modtypes/__init__.py:428
 #, python-format
 msgid "Skipping %s (package and dependencies not updated)"
 msgstr "ÎÎÏÎÎÎÎÏÎ %s (ÏÎ ÏÎÎÎÏÎ ÎÎÎ ÎÎ ÎÎÎÏÏÎÏÎÎÏ ÎÎÎ ÎÎÎÎÎÏÏÎÎÎÎÎ)"
 
-#: ../jhbuild/modtypes/__init__.py:459
-#: ../jhbuild/modtypes/__init__.py:477
-#: ../jhbuild/modtypes/linux.py:82
-#: ../jhbuild/modtypes/linux.py:89
+#: ../jhbuild/modtypes/__init__.py:517 ../jhbuild/modtypes/__init__.py:535
+#: ../jhbuild/modtypes/linux.py:81 ../jhbuild/modtypes/linux.py:88
 msgid "Checking out"
 msgstr "ÎÎÎÎÎÏ"
 
-#: ../jhbuild/modtypes/__init__.py:463
+#: ../jhbuild/modtypes/__init__.py:521
 #, python-format
 msgid "source directory %s was not created"
 msgstr "ÎÎÎ ÎÎÎÎÎÏÏÎÎÎÎÎÎ Î ÏÎÎÎÎÎÏ ÏÎÎÎÎÎÏ %s"
 
-#: ../jhbuild/modtypes/__init__.py:480
+#: ../jhbuild/modtypes/__init__.py:538
 msgid "wipe directory and start over"
 msgstr "ÎÎÎÎÏÎÏÎÏÏ ÏÎÎÎÎÎÏ ÎÎÎ ÎÏÎÎÎÎÎÎÎÎÏÎ"
 
@@ -1381,39 +1405,46 @@ msgstr "ÎÎÎÎÏÎÏÎÏÏ ÏÎÎÎÎÎÏ ÎÎÎ ÎÏÎÎÎÎÎÎÎÎÏÎ"
 msgid "kconfig file %s was not created"
 msgstr "ÎÎÎ ÎÎÎÎÎÏÏÎÎÎÎÎÎ ÏÎ ÎÏÏÎÎÎ kconfig %s"
 
-#: ../jhbuild/modtypes/linux.py:97
+#: ../jhbuild/modtypes/linux.py:93
 msgid "make mrproper"
 msgstr "make mrproper"
 
-#: ../jhbuild/modtypes/linux.py:171
+#: ../jhbuild/modtypes/linux.py:167
 msgid "Installing kernel"
 msgstr "ÎÎÎÎÏÎÏÏÎÏÎ ÏÏÏÎÎÎ"
 
-#: ../jhbuild/modtypes/linux.py:189
+#: ../jhbuild/modtypes/linux.py:185
 msgid "Installing modules"
 msgstr "ÎÎÎÎÏÎÏÏÎÏÎ ÎÎÎÏÎÏÏÎ"
 
-#: ../jhbuild/modtypes/linux.py:204
+#: ../jhbuild/modtypes/linux.py:200
 msgid "Installing kernel headers"
 msgstr "ÎÎÎÎÏÎÏÏÎÏÎ ÎÎÏÎÎÎÎÏÎ ÏÏÏÎÎÎ"
 
-#: ../jhbuild/modtypes/linux.py:244
+#: ../jhbuild/modtypes/linux.py:240
 #, python-format
-msgid "Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. Possible repositories are %(possible)s"
-msgstr "ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÎÏÎÎÎÏÎÏÎÎ=%(missing)s ÎÎÎ ÏÎ kconfig ÏÏÎ linux id=%(linux_id)s. ÎÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÎ %(possible)s"
+msgid ""
+"Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. "
+"Possible repositories are %(possible)s"
+msgstr ""
+"ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÎÏÎÎÎÏÎÏÎÎ=%(missing)s ÎÎÎ ÏÎ kconfig ÏÏÎ linux id="
+"%(linux_id)s. ÎÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÎ %(possible)s"
 
-#: ../jhbuild/modtypes/linux.py:250
+#: ../jhbuild/modtypes/linux.py:246
 #, python-format
-msgid "Default repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. Possible repositories are %(possible)s"
-msgstr "ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÎÎÎÎÏÎÏÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ=%(missing)s ÎÎÎ ÏÎ kconfig ÏÏÎ linux id=%(linux_id)s. ÎÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÎ %(possible)s"
+msgid ""
+"Default repository=%(missing)s not found for kconfig in linux id="
+"%(linux_id)s. Possible repositories are %(possible)s"
+msgstr ""
+"ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÎÎÎÎÏÎÏÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ=%(missing)s ÎÎÎ ÏÎ kconfig ÏÏÎ linux id="
+"%(linux_id)s. ÎÎÎÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÎ %(possible)s"
 
 #: ../jhbuild/modtypes/tarball.py:68
 #, python-format
 msgid "module '%(module)s' has invalid size attribute ('%(size)s')"
 msgstr "Î ÎÎÏÏÎÏÎ '%(module)s' ÎÏÎÎ ÎÎÎÎÎÏÎÎÎÎ ÎÎÎÏÏÎÏÎ ÎÎÎÎÎÎÏÏ ('%(size)s')"
 
-#: ../jhbuild/moduleset.py:34
-#: ../jhbuild/utils/httpcache.py:46
+#: ../jhbuild/moduleset.py:34 ../jhbuild/utils/httpcache.py:46
 msgid "Python xml packages are required but could not be found"
 msgstr "ÎÎ ÏÎÎÎÏÎ Python XML ÎÎÎÎÎ ÎÏÎÏÎÎÏÎÏÎ ÎÎÎÎ ÎÎÎ ÎÏÎÎÎÎÎÎ"
 
@@ -1432,51 +1463,44 @@ msgstr "ÎÎ %(module)s ÎÏÎÎ ÎÎÎ ÎÎÎÏÏÎÏÎ ÎÏÏ ÏÎ ÎÎÎÏÏ
 msgid "Circular dependencies detected: %s"
 msgstr "ÎÎÏÎÏÎÏÏÎÎÎÎ ÎÏÎÎÎÎÎÏ ÎÎÎÏÏÎÏÎÎÏ: %s"
 
-#: ../jhbuild/moduleset.py:164
-#, python-format
-msgid "module \"%s\" not found"
-msgstr "ÎÎ ÎÏÎÎÎÎÎ Î ÎÎÏÏÎÏÎ \"%s\""
-
-#: ../jhbuild/moduleset.py:265
+#: ../jhbuild/moduleset.py:276
 msgid "Unknown module:"
 msgstr "ÎÎÎÏÏÏÎ ÎÎÏÏÎÏÎ:"
 
-#: ../jhbuild/moduleset.py:363
+#: ../jhbuild/moduleset.py:374
 #, python-format
 msgid "could not download %s: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏÏÏÏÏÏÎÏ ÏÎÏ %s: %s"
 
-#: ../jhbuild/moduleset.py:368
-#: ../jhbuild/moduleset.py:370
+#: ../jhbuild/moduleset.py:379 ../jhbuild/moduleset.py:381
 #, python-format
 msgid "failed to parse %s: %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÏÏÎÏ ÏÎÏ %s: %s"
 
-#: ../jhbuild/moduleset.py:397
+#: ../jhbuild/moduleset.py:408
 msgid "Duplicate repository:"
 msgstr "ÎÎÏÎÏÏÏÏÎ ÎÏÎÎÎÏÎÏÎÎ:"
 
-#: ../jhbuild/moduleset.py:500
+#: ../jhbuild/moduleset.py:511
 #, python-format
-#| msgid ""
-#| "Modulesets were edited locally but JHBuild is configured to get them from "
-#| "the network, perhaps you need to add use_local_modulesets = True to your ."
-#| "jhbuildrc."
-msgid "Modulesets were edited locally but JHBuild is configured to get them from the network, perhaps you need to add use_local_modulesets = True to your %s."
-msgstr "ÎÎ modulesets ÎÏÎÏÎ ÎÏÎÎÎÏÎÎÏÏÎÎ ÏÎÏÎÎÎ ÎÎÎÎ ÏÎ JHBuild ÎÏÎÎ ÏÏÎÎÎÏÏÎÎ ÎÎ ÎÏÎÎÏÎÎÎÏÎ ÎÏÏ ÏÎ ÎÎÎÏÏÎ, ÎÏÏÏ ÏÏÎÎÎÏÏÎÎ ÎÎ ÏÏÎÏÎÎÏÎÏÎ use_local_modulesets = True ÏÏÎ %s."
+msgid ""
+"Modulesets were edited locally but JHBuild is configured to get them from "
+"the network, perhaps you need to add use_local_modulesets = True to your %s."
+msgstr ""
+"ÎÎ modulesets ÎÏÎÏÎ ÎÏÎÎÎÏÎÎÏÏÎÎ ÏÎÏÎÎÎ ÎÎÎÎ ÏÎ JHBuild ÎÏÎÎ ÏÏÎÎÎÏÏÎÎ ÎÎ "
+"ÎÏÎÎÏÎÎÎÏÎ ÎÏÏ ÏÎ ÎÎÎÏÏÎ, ÎÏÏÏ ÏÏÎÎÎÏÏÎÎ ÎÎ ÏÏÎÏÎÎÏÎÏÎ use_local_modulesets "
+"= True ÏÏÎ %s."
 
 #: ../jhbuild/monkeypatch.py:102
 #, python-format
 msgid "Invalid placeholder in string: line %d, col %d"
 msgstr "ÎÎÏÏÎ ÎÏÎÏÎÏÎ ÎÎÏÎÏ ÏÏÎ ÏÏÎÎÎÎÎÏÎÎÏÎ: ÎÏÎÎÎÎ %d, ÏÏÎÎÎ %d"
 
-#: ../jhbuild/monkeypatch.py:107
-#: ../jhbuild/monkeypatch.py:133
+#: ../jhbuild/monkeypatch.py:107 ../jhbuild/monkeypatch.py:133
 msgid "Too many positional arguments"
 msgstr "ÎÎÏÎ ÏÎÎÎÎ ÎÏÎÏÎÎÏÎ ÎÎÏÎÏ"
 
-#: ../jhbuild/monkeypatch.py:127
-#: ../jhbuild/monkeypatch.py:160
+#: ../jhbuild/monkeypatch.py:127 ../jhbuild/monkeypatch.py:160
 msgid "Unrecognized named group in pattern"
 msgstr "ÎÎÎÏÏÏÎ ÏÎÎÎÎ ÎÎÎÎÎÏ ÏÏÎ ÏÏÏÏÏÏÎ"
 
@@ -1486,7 +1510,9 @@ msgstr "ÎÎÎÏÎ ÏÎ ÎÏÏÎÏÎÎÏÏÎÏÏÎ ÎÎÏÎÎÎ"
 
 #: ../jhbuild/utils/httpcache.py:185
 msgid "file not in cache, but not allowed to check network"
-msgstr "ÏÎ ÎÏÏÎÎÎ ÎÎÎ ÏÏÎÏÏÎÎ ÏÏÎ ÎÎÎÎÎ cache, ÎÎÎÎ ÎÎÎ ÎÏÎÏÏÎÏÎÏÎÎ ÎÎ ÎÎÎÎÏÎÎ ÏÎ ÎÎÎÏÏÎ"
+msgstr ""
+"ÏÎ ÎÏÏÎÎÎ ÎÎÎ ÏÏÎÏÏÎÎ ÏÏÎ ÎÎÎÎÎ cache, ÎÎÎÎ ÎÎÎ ÎÏÎÏÏÎÏÎÏÎÎ ÎÎ ÎÎÎÎÏÎÎ ÏÎ "
+"ÎÎÎÏÏÎ"
 
 #: ../jhbuild/utils/lockfile.py:108
 #, python-format
@@ -1495,71 +1521,79 @@ msgstr "ÎÏÎÎÏÎÏÎ ÎÎÎÎÎÏÎÎÏÎÏ ÎÏÏ ÏÎ ÎÎ ÏÏÎÏÏÎÎ
 
 #: ../jhbuild/utils/lockfile.py:120
 #, python-format
-msgid "Lock %(path)r taken by pid %(pid)d; waiting for it to exit.  Press Control-C to interrupt."
-msgstr "ÎÎ ÎÎÎÎÎÏÎÎ ÏÎÏ %(path)r ÏÎÏÎÎÎÎ ÎÏÎ ÏÎ pid %(pid)d, ÏÎÏÎÎÎÎÎÎ ÎÎÎ ÎÎÎÎÎ. ÎÎÏÎÏÏÎ Control-C ÎÎÎ ÎÎÎÎÎÏÎ."
+msgid ""
+"Lock %(path)r taken by pid %(pid)d; waiting for it to exit.  Press Control-C "
+"to interrupt."
+msgstr ""
+"ÎÎ ÎÎÎÎÎÏÎÎ ÏÎÏ %(path)r ÏÎÏÎÎÎÎ ÎÏÎ ÏÎ pid %(pid)d, ÏÎÏÎÎÎÎÎÎ ÎÎÎ ÎÎÎÎÎ. "
+"ÎÎÏÎÏÏÎ Control-C ÎÎÎ ÎÎÎÎÎÏÎ."
 
-#: ../jhbuild/utils/packagedb.py:71
+#: ../jhbuild/utils/packagedb.py:75
 #, python-format
 msgid "package %s has files with embedded new lines"
 msgstr "ÏÎ ÏÎÎÎÏÎ %s ÏÎÏÎÎÏÎÎ ÎÏÏÎÎÎ ÎÎ ÎÎÏÏÎÎÏÏÎÎÎÎÏ ÎÎÎÏ ÎÏÎÎÎÎÏ"
 
-#: ../jhbuild/utils/packagedb.py:148
+#: ../jhbuild/utils/packagedb.py:158
 msgid "Package DB modified externally, rereading"
 msgstr "ÎÎ ÏÎÎÎÏÎ DB ÏÏÎÏÎÏÎÎÎÎÎÎÎ ÎÎÏÏÎÏÎÎÎ, ÎÏÎÎÎÎÎÎÎÏÏÎ"
 
-#: ../jhbuild/utils/packagedb.py:252
+#: ../jhbuild/utils/packagedb.py:269
 #, python-format
-msgid "no manifest for '%s', can't uninstall.  Try building again, then uninstalling."
-msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÎÎÎÏÎÏÏÎÏÎÏ, ÎÎÎÎÎ ÎÎÎÏÏÎ ÎÎÎ ÏÎ '%s'. ÎÏÎÏÎÎÏÎÏÏÎ ÎÎ ÏÎ ÎÎÎÎÎÎÎÎÏÎÏÎ ÏÎÎÎ ÎÎÎ ÎÎÏÎ ÎÎ ÏÎ ÎÏÎÎÎÎÏÎÏÏÎÏÎÏÎ."
+msgid ""
+"no manifest for '%s', can't uninstall.  Try building again, then "
+"uninstalling."
+msgstr ""
+"ÎÎÏÎÎÎÎÎ ÎÏÎÎÎÎÏÎÏÏÎÏÎÏ, ÎÎÎÎÎ ÎÎÎÏÏÎ ÎÎÎ ÏÎ '%s'. ÎÏÎÏÎÎÏÎÏÏÎ ÎÎ ÏÎ "
+"ÎÎÎÎÎÎÎÎÏÎÏÎ ÏÎÎÎ ÎÎÎ ÎÎÏÎ ÎÎ ÏÎ ÎÏÎÎÎÎÏÎÏÏÎÏÎÏÎ."
 
-#: ../jhbuild/utils/packagedb.py:269
+#: ../jhbuild/utils/packagedb.py:286
 #, python-format
 msgid "Failed to delete %(file)r: %(msg)s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÏÎÏÎÏ ÏÎÏ %(file)r: %(msg)s"
 
-#: ../jhbuild/utils/systeminstall.py:59
+#: ../jhbuild/utils/systeminstall.py:131
 msgid "No suitable root privilege command found; you should install \"pkexec\""
 msgstr "ÎÎÎ ÎÏÎÎÎÎÎÎ ÎÎÎÎÎÎÎÏ ÎÎÏÎÎÎÏ ÏÏÎÏÏÏÎÏÏÎ, ÎÎÎÎÏÎÏÏÎÏÏÎ ÏÎ \"pkexec\""
 
-#: ../jhbuild/utils/systeminstall.py:78
-#: ../jhbuild/utils/systeminstall.py:81
+#: ../jhbuild/utils/systeminstall.py:150 ../jhbuild/utils/systeminstall.py:153
 #, python-format
 msgid "PackageKit: %s"
 msgstr "PackageKit: %s"
 
-#: ../jhbuild/utils/systeminstall.py:109
+#: ../jhbuild/utils/systeminstall.py:182
 msgid "Nothing available to install"
 msgstr "ÎÎÏÎÏÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎ"
 
-#: ../jhbuild/utils/systeminstall.py:112
+#: ../jhbuild/utils/systeminstall.py:185
 #, python-format
 msgid "Installing: %s"
 msgstr "ÎÎÎÎÏÎÏÏÎÏÎ: %s"
 
-#: ../jhbuild/utils/systeminstall.py:124
+#: ../jhbuild/utils/systeminstall.py:197
 msgid "Complete!"
 msgstr "ÎÎÎÎÎÎÏÏÎÎÎÎ!"
 
-#: ../jhbuild/utils/systeminstall.py:135
+#: ../jhbuild/utils/systeminstall.py:208
 msgid "Using yum to install packages.  Please wait."
-msgstr "ÎÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ yum ÎÎÎ ÏÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÎÎÏÏÎ. ÎÎÏÎÎÎÎÏ ÏÎÏÎÎÎÎÎÏÎ."
+msgstr ""
+"ÎÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ yum ÎÎÎ ÏÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÎÎÏÏÎ. ÎÎÏÎÎÎÎÏ ÏÎÏÎÎÎÎÎÏÎ."
 
-#: ../jhbuild/utils/systeminstall.py:142
-#: ../jhbuild/utils/systeminstall.py:190
+#: ../jhbuild/utils/systeminstall.py:215 ../jhbuild/utils/systeminstall.py:263
 #, python-format
 msgid "Installing: %(pkgs)s"
 msgstr "ÎÎÎÎÏÎÏÏÎÏÎ: %(pkgs)s"
 
-#: ../jhbuild/utils/systeminstall.py:147
-#: ../jhbuild/utils/systeminstall.py:195
+#: ../jhbuild/utils/systeminstall.py:220 ../jhbuild/utils/systeminstall.py:268
 msgid "Nothing to install"
 msgstr "ÎÎÏÎÏÎ ÏÏÎÏ ÎÎÎÎÏÎÏÏÎÏÎ"
 
-#: ../jhbuild/utils/systeminstall.py:180
+#: ../jhbuild/utils/systeminstall.py:253
 msgid "Using apt-file to search for providers; this may be slow.  Please wait."
-msgstr "ÎÏÎÏÎ ÏÎÏ apt-file ÎÎÎ ÏÎÎ ÎÎÎÎÎÏÎÏÎ ÏÎÏÏÏÏÎ. ÎÏÏÏ ÎÏÎÏÎÎ ÎÎ ÎÎÎÏÏÏÎÏÎÏÎÎ.  ÎÎÏÎÎÎÎÏ ÏÎÏÎÎÎÎÎÏÎ."
+msgstr ""
+"ÎÏÎÏÎ ÏÎÏ apt-file ÎÎÎ ÏÎÎ ÎÎÎÎÎÏÎÏÎ ÏÎÏÏÏÏÎ. ÎÏÏÏ ÎÏÎÏÎÎ ÎÎ ÎÎÎÏÏÏÎÏÎÏÎÎ.  "
+"ÎÎÏÎÎÎÎÏ ÏÎÏÎÎÎÎÎÏÎ."
 
-#: ../jhbuild/utils/systeminstall.py:187
+#: ../jhbuild/utils/systeminstall.py:260
 #, python-format
 msgid "No native package found for %(id)s"
 msgstr "ÎÎÎ ÎÏÎÎÎÎÎ ÎÎÏÏÎÎÏ ÏÎÎÎÏÎ ÎÎÎ ÏÎ %(id)s"
@@ -1584,14 +1618,10 @@ msgstr "ÎÏÎÏÏÏÎ Î ÎÏÎÏÏÎÏÎÎÏÎ ÏÎÏ %s"
 msgid "Failed to unpack %s (empty file?)"
 msgstr "ÎÏÎÏÏÏÎ Î ÎÏÎÏÏÎÏÎÎÏÎ ÏÎÏ %s (ÎÎÎÏ ÎÏÏÎÎÎ;)"
 
-#: ../jhbuild/versioncontrol/bzr.py:74
-#: ../jhbuild/versioncontrol/darcs.py:55
-#: ../jhbuild/versioncontrol/fossil.py:49
-#: ../jhbuild/versioncontrol/hg.py:53
-#: ../jhbuild/versioncontrol/mtn.py:52
-#: ../jhbuild/versioncontrol/tarball.py:67
+#: ../jhbuild/versioncontrol/bzr.py:74 ../jhbuild/versioncontrol/darcs.py:55
+#: ../jhbuild/versioncontrol/fossil.py:49 ../jhbuild/versioncontrol/hg.py:53
+#: ../jhbuild/versioncontrol/mtn.py:52 ../jhbuild/versioncontrol/tarball.py:67
 #, python-format
-#| msgid "branch for %s has wrong override, check your .jhbuildrc"
 msgid "branch for %(name)s has wrong override, check your %(filename)s"
 msgstr "Î ÎÎÎÎÎÏ ÎÎÎ ÏÎ %(name)s ÎÏÎÎ ÎÎÎÎÏ ÏÎÏÎÎÎÎÏÎ, ÎÎÎÎÏÎ ÏÎ %(filename)s"
 
@@ -1627,30 +1657,30 @@ msgstr "ÎÎ \"%s\" ÎÎÎ ÏÎÎÎÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÏÏÏÏ ÎÎÏÎ
 
 #: ../jhbuild/versioncontrol/cvs.py:277
 #, python-format
-msgid "working copy points at the wrong repository (expected %(root1)s but got %(root2)s). "
-msgstr "ÎÎÎÏÎÏÏÎÎÎÎ ÏÎÎÎÎÎ ÎÎÏÎÎÏÎÏÎÏ ÏÎ ÎÎÎÎÏ ÎÏÎÎÎÏÎÏÎÎ (ÎÎÎÎÎÎÎÏÎÎ %(root1)s, ÎÎÎÎ ÎÏÎÎ %(root2)s). "
+msgid ""
+"working copy points at the wrong repository (expected %(root1)s but got "
+"%(root2)s). "
+msgstr ""
+"ÎÎÎÏÎÏÏÎÎÎÎ ÏÎÎÎÎÎ ÎÎÏÎÎÏÎÏÎÏ ÏÎ ÎÎÎÎÏ ÎÏÎÎÎÏÎÏÎÎ (ÎÎÎÎÎÎÎÏÎÎ %(root1)s, "
+"ÎÎÎÎ ÎÏÎÎ %(root2)s). "
 
 #: ../jhbuild/versioncontrol/cvs.py:279
 msgid "Consider using the changecvsroot.py script to fix this."
-msgstr "ÎÎÎÏÏÎÎÏÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎÏÎ ÏÎ ÎÎÏÎÎ ÎÎÎÏÎÎÎÏÎ changecvsroot.py ÎÎÎ ÎÎ ÏÎ ÎÎÎÏÎÏÏÎÏÎ."
+msgstr ""
+"ÎÎÎÏÏÎÎÏÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎÏÎ ÏÎ ÎÎÏÎÎ ÎÎÎÏÎÎÎÏÎ changecvsroot.py ÎÎÎ ÎÎ ÏÎ "
+"ÎÎÎÏÎÏÏÎÏÎ."
 
-#: ../jhbuild/versioncontrol/darcs.py:86
-#: ../jhbuild/versioncontrol/darcs.py:92
+#: ../jhbuild/versioncontrol/darcs.py:86 ../jhbuild/versioncontrol/darcs.py:92
 #: ../jhbuild/versioncontrol/fossil.py:84
-#: ../jhbuild/versioncontrol/fossil.py:97
-#: ../jhbuild/versioncontrol/git.py:554
-#: ../jhbuild/versioncontrol/git.py:594
-#: ../jhbuild/versioncontrol/git.py:670
-#: ../jhbuild/versioncontrol/hg.py:87
-#: ../jhbuild/versioncontrol/hg.py:93
-#, fuzzy
+#: ../jhbuild/versioncontrol/fossil.py:97 ../jhbuild/versioncontrol/git.py:558
+#: ../jhbuild/versioncontrol/git.py:598 ../jhbuild/versioncontrol/git.py:674
+#: ../jhbuild/versioncontrol/hg.py:87 ../jhbuild/versioncontrol/hg.py:93
 msgid "date based checkout not yet supported\n"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÏÎÎ ÎÎÏÎÎ Î ÎÎÎÎÎÏ ÎÏÎÎÎÏÎÏÎÎÏ ÏÏÎÏÏÎÎ ÎÎ ÎÎÎÏÎÎÎÎÎÎ\n"
 
 #: ../jhbuild/versioncontrol/git.py:111
-#, fuzzy
 msgid "ignored bad branch redefinition for module:"
-msgstr "ÎÎÎÏÎÏÎ ÎÏÏÎÎÎ ÎÏÎÎÎÏÏÎÏÎÎÎÏÎÏÎÏ ÏÏÎÎÎÏÎÏÏÎÎÎÏÎÏ ÎÎÎ ÏÎÎ ÎÎÏÏÎÏÎ:"
+msgstr "ÎÎÎÏÎÏÎ ÎÏÏÎÎÎ ÎÏÎÎÎÏÏÎÏÎÎÎÏÎÏÎÏ ÎÎÎÎÎÏ ÎÎÎ ÏÎÎ ÎÎÏÏÎÏÎ:"
 
 #: ../jhbuild/versioncontrol/git.py:199
 msgid "Need at least git-1.5.6 from June/08 to operate"
@@ -1662,8 +1692,12 @@ msgstr "ÎÎ ÎÎÎÎÎÎÏÎÎÎÎ: Checkoutdir ÎÎÎ ÎÎÎÎÎ ÎÎÎ ÎÏÎ
 
 #: ../jhbuild/versioncontrol/git.py:269
 #, python-format
-msgid "The requested branch \"%s\" is not available. Neither locally, nor remotely in the origin remote."
-msgstr "Î ÎÎÏÎÏÎÎÎÎÏ ÎÎÎÎÎÏ \"%s\" ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎÏ. ÎÏÏÎ ÏÎÏÎÎÎ, ÎÏÏÎ ÏÏÎ ÎÎ' ÎÏÎÏÏÎÏÎÏÏ ÎÏÎÎÎÎÏÏÏÎÎÎÎ ÏÏÎÎÏÎÏÎÏ."
+msgid ""
+"The requested branch \"%s\" is not available. Neither locally, nor remotely "
+"in the origin remote."
+msgstr ""
+"Î ÎÎÏÎÏÎÎÎÎÏ ÎÎÎÎÎÏ \"%s\" ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎÏ. ÎÏÏÎ ÏÎÏÎÎÎ, ÎÏÏÎ ÏÏÎ ÎÎ' "
+"ÎÏÎÏÏÎÏÎÏÏ ÎÏÎÎÎÎÏÏÏÎÎÎÎ ÏÏÎÎÏÎÏÎÏ."
 
 #: ../jhbuild/versioncontrol/git.py:277
 msgid "Refusing to switch a dirty tree."
@@ -1680,14 +1714,22 @@ msgid "Command %s did not include commit line: %r"
 msgstr "Î ÎÎÏÎÎÎ %s ÎÎÎ ÏÎÏÎÎÎÎÎÎÎÎÎ ÎÏÎÎÎÎ ÎÎÏÎÎÏÏÎÏ: %r"
 
 #: ../jhbuild/versioncontrol/git.py:420
-msgid "Failed to update module as it switched to git (you should check for changes then remove the directory)."
-msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÏÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏ ÎÎÎÏÏ ÎÎÏÎÎÎ ÏÏÎ git (ÎÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎÎÏÎ ÎÎÎ ÏÎÏ ÎÎÎÎÎÎÏ ÎÎÎ ÏÏÎ ÏÏÎÎÏÎÎÎ ÎÏÎÎÏÎÏÏÎ ÏÎ ÏÎÎÎÎÎ)."
+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:421
-msgid "Failed to update module (missing .git) (you should check for changes then remove the directory)."
-msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÏÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏ (ÎÎÎÏÎÎ ÏÎ .git) (ÎÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎÎÏÎ ÎÎÎ ÏÎÏ ÎÎÎÎÎÎÏ ÎÎÎ ÏÏÎ ÏÏÎÎÏÎÎÎ ÎÏÎÎÏÎÏÏÎ ÏÎ ÏÎÎÎÎÎ)."
+msgid ""
+"Failed to update module (missing .git) (you should check for changes then "
+"remove the directory)."
+msgstr ""
+"ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÏÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏ (ÎÎÎÏÎÎ ÏÎ .git) (ÎÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎÎÏÎ ÎÎÎ "
+"ÏÎÏ ÎÎÎÎÎÎÏ ÎÎÎ ÏÏÎ ÏÏÎÎÏÎÎÎ ÎÏÎÎÏÎÏÏÎ ÏÎ ÏÎÎÎÎÎ)."
 
-#: ../jhbuild/versioncontrol/git.py:521
+#: ../jhbuild/versioncontrol/git.py:525
 msgid ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
@@ -1695,10 +1737,11 @@ msgstr ""
 "ÎÏÎÏÏÏÎ Î ÎÎÏÏÎÏÎÎÏÏ ÏÎÎÏÎÏÎÏÏ\n"
 "ÎÎÎ ÎÎÏÎÎÎÎÏÎ ÏÎÎ ÎÎÎÎÏÎ git < 1.5.6 ÏÏÎÎÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎÎÎÎÏÎÏÎ.\n"
 
-#: ../jhbuild/versioncontrol/git.py:566
+#: ../jhbuild/versioncontrol/git.py:570
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
-msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÏÎÎÎÏÏÎÎÎÏ ÎÎÎÎÎÏÏÎÏÎÏ ÏÎÏ %s. ÎÎÎÎÎÏÎ ÏÎ ÎÎÏÎ ÏÎÏ ÎÎÏÏÎÏÎÏ."
+msgstr ""
+"ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÏÎÎÎÏÏÎÎÎÏ ÎÎÎÎÎÏÏÎÏÎÏ ÏÎÏ %s. ÎÎÎÎÎÏÎ ÏÎ ÎÎÏÎ ÏÎÏ ÎÎÏÏÎÏÎÏ."
 
 #: ../jhbuild/versioncontrol/__init__.py:193
 #, python-format
@@ -1744,96 +1787,97 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÏÎÏ Subversion URI ÎÎÎ ÏÎ %s"
 msgid "could not parse \"svn info\" output for %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÏÏÎÏ ÏÎÏ ÎÎÏÎÎÏ \"svn info\" ÎÎÎ ÏÎ %s"
 
-#: ../jhbuild/versioncontrol/svn.py:307
+#: ../jhbuild/versioncontrol/svn.py:309
 msgid "Error checking for conflicts"
 msgstr "ÎÏÎÎÎÎ ÎÎÎÎÏÎÏ ÏÏÎÎÏÎÏÏÎÏÎ"
 
-#: ../jhbuild/versioncontrol/tarball.py:87
+#: ../jhbuild/versioncontrol/tarball.py:90
 #, python-format
 msgid "branch for %s is not correct, check the moduleset file."
 msgstr "ÎÎÎ ÎÎÎÎÎ ÏÏÏÏÏÏ Î ÎÎÎÎÎÏ ÎÎÎ ÏÎ %s, ÎÎÎÎÎÏÎ ÏÎ ÎÏÏÎÎÎ moduleset."
 
-#: ../jhbuild/versioncontrol/tarball.py:123
+#: ../jhbuild/versioncontrol/tarball.py:126
 #, python-format
 msgid "URL has no filename component: %s"
 msgstr "ÎÎ URL ÎÎÎ ÏÎÏÎÎÏÎÎ ÏÎ ÏÎÎÎÎ ÎÏÏÎÎÎÏ: %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:166
+#: ../jhbuild/versioncontrol/tarball.py:169
 msgid "file not downloaded"
-msgstr "ÏÎ ÎÏÏÎÎÎ ÎÎÎ ÎÎÏÎÎÎÎÎ"
+msgstr "ÏÎ ÎÏÏÎÎÎ ÎÎÎ ÎÎÏÎÎÎÎ"
 
-#: ../jhbuild/versioncontrol/tarball.py:171
+#: ../jhbuild/versioncontrol/tarball.py:174
 #, python-format
 msgid "downloaded file size is incorrect (expected %(size1)d, got %(size2)d)"
-msgstr "ÏÎ ÎÎÎÎÎÎÏ ÏÎÏ ÎÏÏÎÎÎÏ ÏÎÏ ÎÎÏÎÎÎÎÎ ÎÎÎÎÎ ÎÎÎÎÏ (ÎÎÎÎÎÎÏÏÎÎ %(size1)d, ÎÎÎÏÎÎÏÎÎ %(size2)d)"
+msgstr ""
+"ÏÎ ÎÎÎÎÎÎÏ ÏÎÏ ÎÏÏÎÎÎÏ ÏÎÏ ÎÎÏÎÎÎÎÎ ÎÎÎÎÎ ÎÎÎÎÏ (ÎÎÎÎÎÎÏÏÎÎ %(size1)d, "
+"ÎÎÎÏÎÎÏÎÎ %(size2)d)"
 
-#: ../jhbuild/versioncontrol/tarball.py:177
+#: ../jhbuild/versioncontrol/tarball.py:180
 #, python-format
 msgid "invalid hash attribute on module %s"
 msgstr "ÎÎÏÏÎ ÎÎÎÏÏÎÏÎ ÎÎÏÎÎÎÏÎÎÏÎÏÎÎÏ ÏÏÎÎ ÎÎÏÏÎÏÎ %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:190
+#: ../jhbuild/versioncontrol/tarball.py:193
 #, python-format
 msgid "file hash is incorrect (expected %(sum1)s, got %(sum2)s)"
-msgstr "Î ÎÎÏÎÎÎÏÎÎÏÎÏÎÏÏ ÏÎÏ ÎÏÏÎÎÎÏ ÎÎÎÎÎ ÎÏÏÎÎÎÎÎÎÏ (ÎÎÎÎÎÎÏÏÎÎ %(sum1)s, ÎÎÎÏÎÎÏÎÎ %(sum2)s)"
+msgstr ""
+"Î ÎÎÏÎÎÎÏÎÎÏÎÏÎÏÏ ÏÎÏ ÎÏÏÎÎÎÏ ÎÎÎÎÎ ÎÏÏÎÎÎÎÎÎÏ (ÎÎÎÎÎÎÏÏÎÎ %(sum1)s, "
+"ÎÎÎÏÎÎÏÎÎ %(sum2)s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:193
+#: ../jhbuild/versioncontrol/tarball.py:196
 #, python-format
 msgid "skipped hash check (missing support for %s)"
 msgstr "ÏÎÏÎÎÎÎÏÎ ÎÎÎÎÏÎÏ ÎÎÏÎÎÎÏÎÎÏÎÏÎÎÏ (ÎÎÎÏÎÎ ÏÏÎÏÏÎÏÎÎÎ ÎÎÎ ÏÎ %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:207
+#: ../jhbuild/versioncontrol/tarball.py:210
 msgid "unable to find wget or curl"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÏÎ wget Î curl"
 
-#: ../jhbuild/versioncontrol/tarball.py:223
+#: ../jhbuild/versioncontrol/tarball.py:226
 #, python-format
 msgid "tarball dir (%s) can not be created"
 msgstr "Î ÎÎÏÎÎÎÎÎÏ tarball (%s) ÎÎÎ ÎÏÎÏÎÎ ÎÎ ÎÎÎÎÎÏÏÎÎÎÎÎ"
 
-#: ../jhbuild/versioncontrol/tarball.py:225
+#: ../jhbuild/versioncontrol/tarball.py:228
 #, python-format
 msgid "tarball dir (%s) must be writable"
 msgstr "Î ÎÎÏÎÎÎÎÎÏ tarball (%s) ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÎÎÎÏÎÏÎÎÎÏ"
 
-#: ../jhbuild/versioncontrol/tarball.py:237
+#: ../jhbuild/versioncontrol/tarball.py:240
 #, python-format
 msgid "failed to unpack %s"
 msgstr "ÎÏÎÏÏÏÎ Î ÎÏÎÏÎÏÎÎÏÎ ÏÎÏ %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:240
+#: ../jhbuild/versioncontrol/tarball.py:243
 #, python-format
 msgid "could not unpack tarball (expected %s dir)"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÏÎÏÏÎÏÎÎÏÎÏ ÏÎÏ ÏÏÎÏÎÎÏÎÎÎÎÏ ÎÏÏÎÎÎÏ (ÎÎÎÎÎÎÏÏÎÎ %s dir)"
 
-#: ../jhbuild/versioncontrol/tarball.py:255
+#: ../jhbuild/versioncontrol/tarball.py:258
 #, python-format
 msgid "could not download patch (error: %s)"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÏÎÏ patch (error: %s)"
 
-#: ../jhbuild/versioncontrol/tarball.py:257
+#: ../jhbuild/versioncontrol/tarball.py:260
 msgid "could not download patch"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÏÎÏ patch"
 
-#: ../jhbuild/versioncontrol/tarball.py:289
+#: ../jhbuild/versioncontrol/tarball.py:292
 #, python-format
 msgid "Failed to find patch: %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÏÏÎÏÎÏ ÏÎÏ patch: %s"
 
-#: ../jhbuild/versioncontrol/tarball.py:291
+#: ../jhbuild/versioncontrol/tarball.py:294
 msgid "Applying patch"
 msgstr "ÎÏÎÏÎÎÎÎ ÎÏÎÎÏÎÎÏÎÏ"
 
-#: ../jhbuild/versioncontrol/tarball.py:299
+#: ../jhbuild/versioncontrol/tarball.py:302
 msgid "unable to find quilt"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÎÏ quilt"
 
-#: ../jhbuild/versioncontrol/tarball.py:310
+#: ../jhbuild/versioncontrol/tarball.py:313
 msgid "could not checkout quilt patch set"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÏ ÏÎÏ guilt patch set"
 
-#~ msgid ""
-#~ "Partial build is not enabled; add partial_build = True to ~/.jhbuildrc"
-#~ msgstr ""
-#~ "Î ÎÎÏÎÎÎ ÎÎÎÎÎÏÎÎÏÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÏÎÎ, ÏÏÎÏÎÎÏÏÎ ÏÎÎ ÎÎÏÎÎÎ partial_build "
-#~ "= True ÏÏÎ ~/.jhbuildrc"
+#~ msgid "This option does nothing anymore"
+#~ msgstr "ÎÏÏÎ Î ÎÏÎÎÎÎÎ ÎÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎÎ ÏÎÎÎÎ"



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