[jhbuild] Updated German translation

From: Damned-Lies <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [jhbuild] Updated German translation
Date: Tue, 9 Aug 2016 21:39:07 +0000 (UTC)
commit 2ddfdc1097380511f2bc85a5ad65a8a6f0d17acc
Author: Christian Kirbach <Christian Kirbach gmail com>
Date:   Tue Aug 9 21:38:57 2016 +0000

    Updated German translation

 doc/de/de.po | 4746 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 2705 insertions(+), 2041 deletions(-)
---
diff --git a/doc/de/de.po b/doc/de/de.po
index 348ad65..e9a7a5d 100644
--- a/doc/de/de.po
+++ b/doc/de/de.po
@@ -1,104 +1,101 @@
 # German translation for the jhbuild manual.
 # Copyright (C) 2009 jhbuild's COPYRIGHT HOLDER
 # This file is distributed under the same license as the jhbuild package.
-# Mario Blättermann <mariobl gnome org>, 2009, 2010.
+# Mario Blättermann <mario blaettermann gmail com>, 2009, 2010, 2016.
+# Christian Kirbach <christian kirbach gmail com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: jhbuild master\n"
-"POT-Creation-Date: 2010-07-24 07:07+0000\n"
-"PO-Revision-Date: 2010-10-24 15:03+0100\n"
-"Last-Translator: Mario Blättermann <mariobl gnome org>\n"
+"POT-Creation-Date: 2016-08-02 16:51+0000\n"
+"PO-Revision-Date: 2016-08-05 20:21+0200\n"
+"Last-Translator: Christian Kirbach <christian kirbach gmail com>\n"
 "Language-Team: German <gnome-de gnome org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
+"X-Generator: Poedit 1.8.8\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:1171(None)
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr ""
+"Mario Blättermann <mario blaettermann gmail com>, 2009, 2016\n"
+"Christian Kirbach <christian kirbach gmail com>, 2016"
+
+#. (itstool) path: imagedata
+#. 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:1154
+msgctxt "_"
 msgid ""
-"@@image: 'figures/jhbuild_sample_dot_output.png'; "
-"md5=af9fe7edb29fcaefeadfb2f5987aa6e4"
-msgstr "translated"
+"external ref='figures/jhbuild_sample_dot_output.png' "
+"md5='af9fe7edb29fcaefeadfb2f5987aa6e4'"
+msgstr "Original"
 
-#: C/jhbuild.xml:7(title)
+#. (itstool) path: articleinfo/title
+#: C/index.docbook:7
 msgid "JHBuild Manual"
 msgstr "JHBuild-Handbuch"
 
-#: 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/jhbuild.xml:19(surname)
-msgid "Peters"
-msgstr "Peters"
+#. (itstool) path: authorgroup/author
+#: C/index.docbook:9
+msgid "<firstname>James</firstname> <surname>Henstridge</surname>"
+msgstr "<firstname>James</firstname> <surname>Henstridge</surname>"
 
-#: C/jhbuild.xml:22(firstname)
-msgid "David"
-msgstr "David"
+#. (itstool) path: authorgroup/author
+#: C/index.docbook:13
+msgid "<firstname>C.J.</firstname> <surname>Adams-Collier</surname>"
+msgstr "<firstname>C.J.</firstname> <surname>Adams-Collier</surname>"
 
-#: C/jhbuild.xml:23(surname)
-msgid "Turner"
-msgstr "Turner"
+#. (itstool) path: authorgroup/author
+#: C/index.docbook:17
+msgid "<firstname>Frederic</firstname> <surname>Peters</surname>"
+msgstr "<firstname>Frederic</firstname> <surname>Peters</surname>"
 
-#: C/jhbuild.xml:27(year)
-msgid "2004, 2008"
-msgstr "2004, 2008"
+#. (itstool) path: authorgroup/author
+#: C/index.docbook:21
+msgid "<firstname>David</firstname> <surname>Turner</surname>"
+msgstr "<firstname>David</firstname> <surname>Turner</surname>"
 
-#: C/jhbuild.xml:28(holder)
-msgid "James Henstridge"
-msgstr "James Henstridge"
+#. (itstool) path: articleinfo/copyright
+#: C/index.docbook:26
+msgid "<year>2004, 2008</year> <holder>James Henstridge</holder>"
+msgstr "<year>2004, 2008</year> <holder>James Henstridge</holder>"
 
-#: C/jhbuild.xml:33(revnumber)
-msgid "JHBuild Manual v0.5"
-msgstr "JHBuild-Handbuch v0.5"
-
-#: C/jhbuild.xml:34(date)
-msgid "January 2008"
-msgstr "Januar 2008"
-
-#: C/jhbuild.xml:37(revnumber)
-msgid "JHBuild Manual v0.1"
-msgstr "JHBuild-Handbuch v0.1"
+#. (itstool) path: revhistory/revision
+#: C/index.docbook:31
+msgid "<revnumber>JHBuild Manual v0.5</revnumber> <date>January 2008</date>"
+msgstr ""
+"<revnumber>Handbuch von JHBuild v0.5</revnumber> <date>Januar 2008</date>"
 
-#: C/jhbuild.xml:38(date)
-msgid "August 2007"
-msgstr "August 2007"
+#. (itstool) path: revhistory/revision
+#: C/index.docbook:35
+msgid "<revnumber>JHBuild Manual v0.1</revnumber> <date>August 2007</date>"
+msgstr ""
+"<revnumber>Handbuch von JHBuild v0.1</revnumber> <date>August 2007</date>"
 
-#: C/jhbuild.xml:43(para)
+#. (itstool) path: abstract/para
+#: C/index.docbook:41
 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."
 msgstr ""
-"JHBuild ist ein Werkzeug zum Erstellen der gesamten GNOME Arbeitsumgebung aus "
-"einer Versionsverwaltung. Es kann aber auch zum Erstellen anderer Projekte "
-"angepasst werden."
+"JHBuild ist ein Werkzeug zum Erstellen der gesamten GNOME Arbeitsumgebung "
+"aus einer Versionsverwaltung. Es kann aber auch zum Erstellen anderer "
+"Projekte angepasst werden."
 
-#: C/jhbuild.xml:50(title)
+#. (itstool) path: section/title
+#: C/index.docbook:48
 msgid "Introduction"
 msgstr "Einführung"
 
-#: C/jhbuild.xml:52(para)
+#. (itstool) path: section/para
+#: C/index.docbook:50
 msgid ""
 "JHBuild is a tool designed to ease building collections of source packages, "
 "called <quote>modules</quote>. JHBuild uses <quote>module set</quote> files "
@@ -112,7 +109,8 @@ msgstr ""
 "Dateien enthalten Abhängigkeitsinformationen, aus welchen JHBuild erfährt, "
 "was und in welcher Reihenfolge der Benutzer erstellen will."
 
-#: C/jhbuild.xml:59(para)
+#. (itstool) path: section/para
+#: C/index.docbook:57
 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 "
@@ -125,30 +123,32 @@ msgstr ""
 "Webserver abrufbar gehalten werden, wodurch es möglich ist, unabhängig von "
 "JHBuild den Benutzern Erstellungsregeln bereitzustellen."
 
-#: C/jhbuild.xml:65(para)
+#. (itstool) path: section/para
+#: C/index.docbook:63
 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."
+"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 kann Module aus verschiedenen Quellen erstellen, beispielsweise aus "
 "Softwarebeständen, die <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> und <ulink url=\"http://www.selenic.com/";
-"mercurial/\">Mercurial</ulink> verwenden. Die Verwendung von auf Web- oder "
-"FTP-Seiten bereitgestellten Tar- oder Zip-Archiven ist ebenfalls möglich. "
-"Dabei werden eine Reihe von Erstellungssystemen unterstützt, einschließlich "
-"Autotools, CMake, WAF, Ant, Python Distutils und Perl Makefiles."
-
-#: C/jhbuild.xml:79(para)
+"<ulink url=\"http://subversion.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> und <ulink "
+"url=\"http://www.selenic.com/mercurial/\";>Mercurial</ulink> verwenden. Die "
+"Verwendung von auf Web- oder FTP-Seiten bereitgestellten Tar- oder Zip-"
+"Archiven ist ebenfalls möglich. Dabei unterstützt JHBuild eine Reihe von "
+"Erstellungssystemen wie zum Beispiel Autotools, CMake, WAF, Python Distutils "
+"und Perl Makefiles."
+
+#. (itstool) path: section/para
+#: C/index.docbook:74
 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 "
@@ -156,14 +156,16 @@ msgid ""
 msgstr ""
 "JHBuild ist nicht dazu bestimmt, das Paketverwaltungssystem Ihrer "
 "Distribution zu ersetzen. Es vereinfacht lediglich, alles in einem separaten "
-"Installationspräfix zu erstellen, so dass das übrige System nicht beeinflusst "
-"wird."
+"Installationspräfix zu erstellen, so dass das übrige System nicht "
+"beeinflusst wird."
 
-#: C/jhbuild.xml:87(title)
+#. (itstool) path: section/title
+#: C/index.docbook:81
 msgid "Getting Started"
 msgstr "Erste Schritte"
 
-#: C/jhbuild.xml:89(para)
+#. (itstool) path: section/para
+#: C/index.docbook:83
 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 "
@@ -173,68 +175,47 @@ msgstr ""
 "werden kann. JHBuild hat einige Abhängigkeiten, und es ist nötig, einige "
 "Werkzeuge zu installieren, um Softwaremodule zu erhalten und zu erstellen."
 
-#: C/jhbuild.xml:95(title)
+#. (itstool) path: section/title
+#: C/index.docbook:89
 msgid "Installing JHBuild"
 msgstr "Installieren von JHBuild"
 
-#: C/jhbuild.xml:97(para)
-msgid "JHBuild requires a Python runtime. Verify Python &gt;= 2.3 is installed."
+#. (itstool) path: section/para
+#: C/index.docbook:91
+msgid ""
+"JHBuild requires a Python runtime. Verify Python &gt;= 2.3 is installed."
 msgstr ""
 "JHBuild benötigt eine Python-Laufzeitumgebung. Stellen Sie sicher, dass "
 "Python &gt;= 2.3 installiert ist."
 
-#: C/jhbuild.xml:100(para)
+#. (itstool) path: section/para
+#: C/index.docbook:94
 msgid ""
 "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/gnome</filename>."
+"will be installed, for example, <filename>~/jhbuild/checkout</filename>."
 msgstr ""
 "Der empfohlene Weg zum Herunterladen von JHBuild führt über das "
 "Versionsverwaltungssystem <command>git</command>. Dieses erreichen Sie mit "
-"dem folgenden Befehl. Es ist empfehlenswert, den Befehl in einem neuen Ordner "
-"auszuführen, in welchem der Quellcode installiert wird, beispielsweise "
-"<filename>~/checkout/gnome</filename>."
-
-#: C/jhbuild.xml:107(prompt) C/jhbuild.xml:109(prompt)
-#: C/jhbuild.xml:115(prompt) C/jhbuild.xml:116(prompt)
-#: C/jhbuild.xml:118(prompt) C/jhbuild.xml:120(prompt)
-#: C/jhbuild.xml:122(prompt) C/jhbuild.xml:127(prompt)
-#: C/jhbuild.xml:128(prompt) C/jhbuild.xml:130(prompt)
-#: C/jhbuild.xml:132(prompt) C/jhbuild.xml:139(prompt)
-#: C/jhbuild.xml:140(prompt) C/jhbuild.xml:147(prompt)
-#: C/jhbuild.xml:148(prompt) C/jhbuild.xml:278(prompt)
-#: C/jhbuild.xml:296(prompt) C/jhbuild.xml:325(prompt)
-#: C/jhbuild.xml:354(prompt) C/jhbuild.xml:360(prompt)
-#: C/jhbuild.xml:368(prompt) C/jhbuild.xml:374(prompt)
-#: C/jhbuild.xml:379(prompt) C/jhbuild.xml:387(prompt)
-#: C/jhbuild.xml:392(prompt) C/jhbuild.xml:397(prompt)
-#: C/jhbuild.xml:402(prompt) C/jhbuild.xml:459(prompt)
-#: C/jhbuild.xml:464(prompt) C/jhbuild.xml:469(prompt)
-#: C/jhbuild.xml:474(prompt) C/jhbuild.xml:497(prompt)
-#: C/jhbuild.xml:501(prompt) C/jhbuild.xml:529(prompt)
-#: C/jhbuild.xml:548(prompt) C/jhbuild.xml:549(prompt)
-#: C/jhbuild.xml:572(prompt) C/jhbuild.xml:604(prompt)
-#: C/jhbuild.xml:605(prompt) C/jhbuild.xml:628(prompt)
-#: C/jhbuild.xml:687(prompt) C/jhbuild.xml:1103(prompt)
-#: C/jhbuild.xml:1105(prompt) C/jhbuild.xml:1160(prompt)
-#: C/jhbuild.xml:1164(prompt) C/jhbuild.xml:1392(prompt)
-msgid "$"
-msgstr "$"
-
-#: C/jhbuild.xml:107(userinput)
-#, no-wrap
-msgid "git clone git://git.gnome.org/jhbuild"
-msgstr "git clone git://git.gnome.org/jhbuild"
+"dem folgenden Befehl. Es ist empfehlenswert, den Befehl in einem neuen "
+"Ordner auszuführen, in welchem der Quellcode installiert wird, "
+"beispielsweise <filename>~/jhbuild/checkout</filename>."
 
-#: C/jhbuild.xml:108(computeroutput) C/jhbuild.xml:117(computeroutput)
-#: C/jhbuild.xml:119(computeroutput) C/jhbuild.xml:121(computeroutput)
-#: C/jhbuild.xml:129(computeroutput) C/jhbuild.xml:131(computeroutput)
+#. (itstool) path: section/screen
+#: C/index.docbook:100
 #, no-wrap
-msgid "..."
-msgstr "..."
+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/jhbuild.xml:111(para)
+#. (itstool) path: section/para
+#: C/index.docbook:104
 msgid ""
 "This will download JHBuild into a new folder named <filename>jhbuild</"
 "filename> under the current directory. Now to build and install JHBuild:"
@@ -243,61 +224,76 @@ msgstr ""
 "filename> unterhalb des aktuellen Ordners heruntergeladen. Nun können Sie "
 "JHBuild erstellen und installieren:"
 
-#: C/jhbuild.xml:115(userinput) C/jhbuild.xml:127(userinput)
-#, no-wrap
-msgid "cd jhbuild"
-msgstr "cd jhbuild"
-
-#: C/jhbuild.xml:116(userinput)
-#, no-wrap
-msgid "./autogen.sh"
-msgstr "./autogen.sh"
-
-#: C/jhbuild.xml:118(userinput)
-#, no-wrap
-msgid "make"
-msgstr "make"
-
-#: C/jhbuild.xml:120(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:108
 #, no-wrap
-msgid "make install"
-msgstr "make install"
-
-#: C/jhbuild.xml:124(para)
 msgid ""
-"Alternatively, if autotools or gnome-doc-utils is not installed, install "
-"JHBuild as follows:"
-msgstr ""
-"Alternativ installieren Sie JHBuild wie folgt, falls autotools und gnome-doc-"
-"utils nicht vorhanden sind:"
-
-#: C/jhbuild.xml:128(userinput)
-#, no-wrap
-msgid "make -f Makefile.plain"
-msgstr "make -f Makefile.plain"
-
-#: C/jhbuild.xml:130(userinput)
-#, no-wrap
-msgid "make -f Makefile.plain install"
-msgstr "make -f Makefile.plain install"
+"<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>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:117
+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 ""
+"Wenn <application>gnome-common</application>, <application>yelp-tools</"
+"application> und <application>autotools</application> verfügbar sind, so "
+"wird <filename>autogen.sh</filename> JHBuild anweisen mit "
+"<application>autotools</application> zu installieren. Wenn "
+"<application>gnome-common</application>, <application>yelp-tools</"
+"application> und <application>autotools</application> nicht verfügbar sind, "
+"so wird <filename>autogen.sh</filename> JHBuild anweisen, mit einem Makefile "
+"zu installieren. Um immer die Methode mit Makefile zu verwenden, verwenden "
+"Sie die Option <option>--simple-install</option> für <filename>autogen.sh</"
+"filename>."
 
-#: C/jhbuild.xml:134(para)
+#. (itstool) path: section/para
+#: C/index.docbook:130
 msgid ""
 "If the above steps complete successfully, a small shell script will be "
 "installed in <filename>~/.local/bin</filename> to start JHBuild. Add "
 "<filename>~/.local/bin</filename> to the <envar>PATH</envar>:"
 msgstr ""
-"Falls die oben genannten Schritte erfolgreich verlaufen, wird in <filename>~/."
-"local/bin</filename> ein kleines Shell-Skript installiert, welches JHBuild "
-"startet. Fügen Sie <filename>~/.local/bin</filename> zur Variable "
-"<envar>PATH</envar> hinzu:"
+"Falls die oben genannten Schritte erfolgreich verlaufen, wird in "
+"<filename>~/.local/bin</filename> ein kleines Shell-Skript installiert, "
+"welches JHBuild startet. Fügen Sie <filename>~/.local/bin</filename> zur "
+"Variable <envar>PATH</envar> hinzu:"
 
-#: C/jhbuild.xml:139(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:134
 #, 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:142(para)
+#. (itstool) path: section/para
+#: C/index.docbook:137
 msgid ""
 "To permanently add <filename>~/.local/bin</filename> to the <envar>PATH</"
 "envar> variable, run the following command:"
@@ -305,55 +301,62 @@ msgstr ""
 "Um <filename>~/.local/bin</filename> dauerhaft zur Variable <envar>PATH</"
 "envar> hinzuzufügen, führen Sie folgenden Befehl aus:"
 
-#: C/jhbuild.xml:147(userinput) C/jhbuild.xml:497(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:140
 #, no-wrap
-msgid "echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc"
-msgstr "echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc"
-
-#: C/jhbuild.xml:150(para)
 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 ""
-"Bevor JHBuild ausgeführt werden kann, muss eine Konfiguration eingerichtet "
-"werden, die sich in der Datei <filename>~/.jhbuildrc</filename> befindet."
+"\n"
+"<prompt>$</prompt> <userinput>echo 'PATH=$PATH:~/.local/bin' &gt;&gt; ~/.bashrc</userinput>\n"
+"<prompt>$</prompt>"
 
-#: C/jhbuild.xml:157(title)
+#. (itstool) path: section/title
+#: C/index.docbook:146
 msgid "Configuring JHBuild"
-msgstr "Konfiguriere von JHBuild"
-
-#: C/jhbuild.xml:159(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."
-msgstr ""
-"Die Datei <filename>~/.jhbuildrc</filename> benutzt die Python-Syntax zum "
-"Festlegen der Konfigurationsvariablen für JHBuild. Ein Beispiel ist im Ordner "
-"<filename>jhbuild</filename> verfügbar, siehe <filename>sample.jhbuildrc</"
-"filename>. Kopieren Sie <filename>sample.jhbuildrc</filename> nach "
-"<filename>~/.jhbuildrc</filename> und passen Sie die Datei nach Ihren "
-"Wünschen an."
-
-#: C/jhbuild.xml:167(para)
+msgstr "Konfigurieren von JHBuild"
+
+#. (itstool) path: section/para
+#: C/index.docbook:148
+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 ""
+"JHBuild wird über eine Konfigurationsdatei eingerichtet. Die Datei befindet "
+"sich normalerweise unter <filename>~/config/.jhbuildrc</filename>. Wenn "
+"keine Datei vorhanden ist, so werden die Voreinstellungen verwendet. Die "
+"Datei nutzt die Python-Syntax zum Festlegen der Konfigurationsvariablen. Ein "
+"Beispiel ist im Ordner <filename>examples/sample.jhbuildrc</filename>. "
+"Kopieren Sie <filename>examples/sample.jhbuildrc</filename> nach "
+"<filename>~/.config/.jhbuildrc</filename> und passen Sie die Datei nach "
+"Ihren Wünschen an."
+
+#. (itstool) path: section/para
+#: C/index.docbook:157
 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/gnome</filename> and install all files to "
-"subdirectories of <filename>/opt/gnome</filename>. The two directories must "
-"be writable."
-msgstr ""
-"Mit der Beispielkonfiguration erstellt JHBuild das Modul <application>meta-"
-"gnome-desktop</application> und dessen Abhängigkeiten aus dem Modulsatz "
-"<systemitem>gnome-2.30</systemitem>. JHBuild  entpackt die Quellbäume nach "
-"<filename>~/checkout/gnome</filename> und installiert alle Dateien in "
-"Unterordner von <filename>/opt/gnome</filename>. Diese zwei Ordner müssen "
-"schreibbar sein."
-
-#: C/jhbuild.xml:175(para)
+"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>~/jhbuild/checkout/</"
+"filename> and install all files to subdirectories of <filename>~/jhbuild/"
+"install/</filename>. The two directories must be writable."
+msgstr ""
+"Mit der Beispielkonfiguration erstellt JHBuild die Module <application>meta-"
+"gnome-desktop</application> und <application>meta-gnome-apps-tested</"
+"application> sowie deren Abhängigkeiten aus dem Modulsatz <systemitem>gnome-"
+"apps</systemitem>. JHBuild entpackt die Quellbäume nach <filename>~/jhbuild/"
+"checkout/</filename> und installiert alle Dateien in Unterordner von "
+"<filename>~/jhbuild/install/</filename>. Für diese zwei Ordner müssen "
+"Schreibrechte vorhanden sein."
+
+#. (itstool) path: section/para
+#: C/index.docbook:166
 msgid ""
 "Configuration variables are documented in <xref linkend=\"config-reference\"/"
 ">. The most commonly used variables are:"
@@ -361,11 +364,13 @@ msgstr ""
 "Konfigurationsvariablen sind in <xref linkend=\"config-reference\"/> "
 "dokumentiert. Einige der am häufigsten verwendeten Variablen sind:"
 
-#: C/jhbuild.xml:182(varname) C/jhbuild.xml:1959(varname)
-msgid "repos"
-msgstr "repos"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:173
+msgid "<link linkend=\"cfg-repos\"><varname>repos</varname></link>"
+msgstr "<link linkend=\"cfg-repos\"><varname>repos</varname></link>"
 
-#: C/jhbuild.xml:184(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:177
 msgid ""
 "A dictionary that can be used to specify an alternative repository location "
 "for a particular repository. This configuration variable is useful to a "
@@ -375,16 +380,19 @@ msgid ""
 "For example:"
 msgstr ""
 
-#: C/jhbuild.xml:191(programlisting)
+#. (itstool) path: listitem/programlisting
+#: C/index.docbook:185
 #, no-wrap
 msgid "repos['git.gnome.org'] = 'ssh://<replaceable>username</replaceable>@git.gnome.org/git/'"
 msgstr "repos['git.gnome.org'] = 'ssh://<replaceable>Benutzername</replaceable>@git.gnome.org/git/'"
 
-#: C/jhbuild.xml:195(varname) C/jhbuild.xml:1843(varname)
-msgid "moduleset"
-msgstr "moduleset"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:189
+msgid "<link linkend=\"cfg-moduleset\"><varname>moduleset</varname></link>"
+msgstr "<link linkend=\"cfg-moduleset\"><varname>moduleset</varname></link>"
 
-#: C/jhbuild.xml:197(simpara) C/jhbuild.xml:1845(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:193 C/index.docbook:2041
 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 "
@@ -395,76 +403,93 @@ msgid ""
 "current GNOME development release."
 msgstr ""
 
-#: C/jhbuild.xml:209(varname) C/jhbuild.xml:1160(replaceable)
-#: C/jhbuild.xml:1164(replaceable) C/jhbuild.xml:1832(varname)
-msgid "modules"
-msgstr "modules"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:204
+msgid "<link linkend=\"cfg-modules\"><varname>modules</varname></link>"
+msgstr "<link linkend=\"cfg-modules\"><varname>modules</varname></link>"
 
-#: C/jhbuild.xml:211(simpara) C/jhbuild.xml:1834(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:208 C/index.docbook:2028
 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>."
+"unless the <link linkend=\"command-reference-buildone\"> <command>buildone</"
+"command></link> command is used. Defaults to <literal>['meta-gnome-"
+"desktop']</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:222(varname) C/jhbuild.xml:1638(varname)
-msgid "checkoutroot"
-msgstr "checkoutroot"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:217
+msgid ""
+"<link linkend=\"cfg-checkoutroot\"><varname>checkoutroot</varname></link>"
+msgstr ""
+"<link linkend=\"cfg-checkoutroot\"><varname>checkoutroot</varname></link>"
 
-#: C/jhbuild.xml:224(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:221
 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/gnome</"
-"filename>."
+"linkend=\"cfg-buildroot\"> <varname>buildroot</varname></link> is set, "
+"builds will occur in this directory too. Defaults to <filename>~/jhbuild/"
+"checkout</filename>."
 msgstr ""
 
-#: C/jhbuild.xml:232(varname) C/jhbuild.xml:1926(varname)
-msgid "prefix"
-msgstr "prefix"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:229
+msgid "<link linkend=\"cfg-prefix\"><varname>prefix</varname></link>"
+msgstr "<link linkend=\"cfg-prefix\"><varname>prefix</varname></link>"
 
-#: C/jhbuild.xml:234(simpara) C/jhbuild.xml:1928(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:233 C/index.docbook:2159
 msgid ""
-"A string specifying the prefix to install modules to. This directory must be "
-"writable. Defaults to <literal>'/opt/gnome'</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>'~/jhbuild/install/'</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:240(varname) C/jhbuild.xml:1559(varname)
-msgid "autogenargs"
-msgstr "autogenargs"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:240
+msgid "<link linkend=\"cfg-autogenargs\"><varname>autogenargs</varname></link>"
+msgstr ""
+"<link linkend=\"cfg-autogenargs\"><varname>autogenargs</varname></link>"
 
-#: C/jhbuild.xml:242(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:244
 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 ""
 
-#: C/jhbuild.xml:251(varname) C/jhbuild.xml:1711(varname)
-msgid "makeargs"
-msgstr "makeargs"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:252
+msgid "<link linkend=\"cfg-makeargs\"><varname>makeargs</varname></link>"
+msgstr "<link linkend=\"cfg-makeargs\"><varname>makeargs</varname></link>"
 
-#: C/jhbuild.xml:253(simpara) C/jhbuild.xml:1713(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:256 C/index.docbook:1878
 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 ""
 
-#: C/jhbuild.xml:262(title)
+#. (itstool) path: section/title
+#: C/index.docbook:266
 msgid "Build Prerequisites"
 msgstr "Voraussetzungen zur Erstellung"
 
-#: C/jhbuild.xml:264(para)
+#. (itstool) path: section/para
+#: C/index.docbook:268
 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 ""
 "Bevor irgendwelche Module erstellt werden können, müssen zunächst "
@@ -472,10 +497,11 @@ msgstr ""
 "Autotools (<application>autoconf</application>, <application>automake</"
 "application>, <application>libtool</application> und <application>gettext</"
 "application>), die GNU Toolchain (<application>binutils</application>, "
-"<application>gcc</application>, <application>g++</application>), pkg-config "
-"und Python, je nachdem, welche Module erstellt werden sollen."
+"<application>gcc</application>, <application>g++</application>), make, pkg-"
+"config und Python, je nachdem, welche Module erstellt werden sollen."
 
-#: C/jhbuild.xml:275(para)
+#. (itstool) path: section/para
+#: C/index.docbook:277
 msgid ""
 "JHBuild can check the tools are installed using the <command>sanitycheck</"
 "command> command:"
@@ -483,130 +509,84 @@ msgstr ""
 "JHBuild kann das Vorhandensein dieser Werkzeuge mit dem Befehl "
 "<command>sanitycheck</command> überprüfen:"
 
-#: C/jhbuild.xml:278(userinput) C/jhbuild.xml:1352(command)
+#. (itstool) path: section/screen
+#: C/index.docbook:280
 #, no-wrap
-msgid "jhbuild sanitycheck"
-msgstr "jhbuild sanitycheck"
-
-#: C/jhbuild.xml:280(para)
-msgid ""
-"If this command displays any messages, the errors can be fixed in one of two "
-"ways:"
-msgstr ""
-"Falls dieser Befehl Fehlermeldungen ausgibt, können die Fehler auf folgende "
-"Arten behoben werden:"
-
-#: C/jhbuild.xml:285(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."
-msgstr ""
-"Installieren Sie das benötigte Paket aus dem Softwarebestand Ihrer "
-"Distribution. Eine Liste von <ulink url=\"http://live.gnome.org/";
-"JhbuildDependencies\">Paketnamen</ulink> für verschiedene Distributionen "
-"finden Sie im GNOME-Wiki. Führen Sie den Befehl <command>sanitycheck</"
-"command> nach der Installation der Distributionspakete erneut aus, um "
-"sicherzustellen, dass die benötigten Werkzeuge vorhanden sind."
-
-#: C/jhbuild.xml:294(simpara)
-msgid ""
-"Run the <command>bootstrap</command> command to download, build and install "
-"the build prerequisites:"
-msgstr ""
-"Führen Sie den <command>bootstrap</command>-Befehl aus, um die "
-"Voraussetzungen zur Erstellung herunterzuladen, zu erstellen und zu "
-"installieren:"
-
-#: C/jhbuild.xml:296(userinput) C/jhbuild.xml:838(command)
-#, no-wrap
-msgid "jhbuild bootstrap"
-msgstr "jhbuild bootstrap"
-
-#: C/jhbuild.xml:297(para)
-msgid ""
-"When complete, run the <command>sanitycheck</command> command to verify the "
-"required tools are present."
-msgstr ""
-"Wenn dies abgeschlossen ist, führen Sie den Befehl <command>sanitycheck</"
-"command> aus, um sicherzustellen, dass die benötigten Werkzeuge vorhanden "
-"sind."
-
-#: C/jhbuild.xml:302(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 ""
-"Der <command>bootstrap</command>-Befehl erstellt nicht alle von den "
-"Erstellungswerkzeugen benötigten Paketabhängigkeiten. Falls Ihre Distribution "
-"nicht alle benötigten Pakete bereitstellt, müssen diese außerhalb der JHBuild-"
-"Umgebung erstellt werden."
-
-#: C/jhbuild.xml:308(para)
-msgid ""
-"The build tools dependencies include <application>m4</application>, "
-"<application>perl</application> and a C compiler (for example, "
-"<application>gcc</application>)."
-msgstr ""
-"Zu den abhängigen Erstellungswerkzeugen gehören <application>m4</application> "
-"<application>perl</application> und ein C-Compiler (zum Beispiel "
-"<application>gcc</application>)."
-
-#: C/jhbuild.xml:319(title)
+msgid "<prompt>$</prompt> <userinput>jhbuild sanitycheck</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild sanitycheck</userinput>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:282
+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 ""
+"Wenn dieser Befehl eine Meldung ausgibt, dann installieren Sie bitte das "
+"benötigte Paket aus dem Softwarebestand Ihrer Distribution. Eine Liste von "
+"<ulink url=\"http://live.gnome.org/JhbuildDependencies\";>Paketnamen</ulink> "
+"für verschiedene Distributionen finden Sie im GNOME-Wiki. Führen Sie den "
+"Befehl <command>sanitycheck</command> nach der Installation der "
+"Distributionspakete erneut aus, um sicherzustellen, dass die benötigten "
+"Werkzeuge vorhanden sind."
+
+#. (itstool) path: section/title
+#: C/index.docbook:292
 msgid "Using JHBuild"
 msgstr "Verwendung von JHBuild"
 
-#: C/jhbuild.xml:321(para)
+#. (itstool) path: section/para
+#: C/index.docbook:294
 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:"
+"After set up is complete, JHBuild can be used to build software. To build "
+"all the modules selected in the <filename>~/.config/jhbuildrc</filename> "
+"file, run the following command:"
 msgstr ""
 "Nachdem die Einrichtung abgeschlossen ist, kann JHBuild zum Erstellen von "
 "Software verwendet werden. Führen Sie zum Erstellen aller in der Datei "
-"<filename>~/.jhbuildrc</filename> ausgewählten Module den folgenden Befehl "
-"aus:"
+"<filename>~/.config/jhbuildrc</filename> ausgewählten Module den folgenden "
+"Befehl aus:"
 
-#: C/jhbuild.xml:325(userinput) C/jhbuild.xml:858(command)
+#. (itstool) path: section/screen
+#: C/index.docbook:299
 #, no-wrap
-msgid "jhbuild build"
-msgstr "jhbuild build"
+msgid "<prompt>$</prompt> <userinput>jhbuild build</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild build</userinput>"
 
-#: C/jhbuild.xml:327(para)
+#. (itstool) path: section/para
+#: C/index.docbook:301
 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 do. "
-"The choices include dropping to a shell to fix the error, rerunning the build "
-"from various stages, giving up on the module, or ignore the error and "
+"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 "
+"do. The choices include dropping to a shell to fix the error, rerunning the "
+"build from various stages, giving up on the module, or ignore the error and "
 "continue."
 msgstr ""
 "JHBuild lädt jedes der Module herunter, konfiguriert, kompiliert und "
 "installiert es. Falls in einer der Stufen Fehler auftreten, öffnet JHBuild "
 "ein Menü, um nach der weiteren Vorgehensweise zu fragen. Die Auswahl umfasst "
 "die Weiterleitung in eine Shell zum Beheben des Fehlers, die erneute "
-"Ausführung aus verschiedenen Stufen, Aufgeben oder Ignorieren des Fehlers und "
-"Fortsetzen."
+"Ausführung aus verschiedenen Stufen, Aufgeben oder Ignorieren des Fehlers "
+"und Fortsetzen."
 
-#: C/jhbuild.xml:334(simpara)
+#. (itstool) path: note/simpara
+#: C/index.docbook:308
 msgid ""
 "Giving up on a module will cause any modules depending on the module to fail."
 msgstr ""
 "Das Aufgeben eines Moduls wirkt sich auf die davon abhängigen Module aus, "
 "wodurch deren Erstellung scheitert."
 
-#: C/jhbuild.xml:337(para)
+#. (itstool) path: section/para
+#: C/index.docbook:312
 msgid "Below is an example of the menu displayed:"
 msgstr "Es folgt ein Beispiel des angezeigten Menüs:"
 
-#: C/jhbuild.xml:347(prompt)
-msgid "choice:"
-msgstr "Auswahl:"
-
-#: C/jhbuild.xml:338(screen)
+#. (itstool) path: section/screen
+#: C/index.docbook:314
 #, no-wrap
 msgid ""
 "  [1] Rerun phase build\n"
@@ -618,36 +598,42 @@ 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 ""
 
-#: C/jhbuild.xml:349(para)
+#. (itstool) path: section/para
+#: C/index.docbook:325
 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 ""
 "Es ist auch möglich, einen Modulsatz und dessen Abhängigkeiten zu erstellen, "
-"indem Sie die Modulnamen als Argumente an den <command>build</command>-Befehl "
-"übergeben. So erstellen Sie beispielsweise gtk+:"
+"indem Sie die Modulnamen als Argumente an den <command>build</command>-"
+"Befehl übergeben. So erstellen Sie beispielsweise gtk+:"
 
-#: C/jhbuild.xml:354(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:329
 #, 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:356(para)
+#. (itstool) path: section/para
+#: C/index.docbook:331
 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:"
+"the build at a particular module using the <option>--start-at</option> "
+"option:"
 msgstr ""
 
-#: C/jhbuild.xml:360(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:335
 #, 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:362(para)
+#. (itstool) path: section/para
+#: C/index.docbook:337
 msgid ""
 "To build one or more modules, ignoring their dependencies, JHBuild provides "
 "the <command>buildone</command> command. For the <command>buildone</command> "
@@ -655,36 +641,57 @@ msgid ""
 "and installed or provided by distribution packages."
 msgstr ""
 
-#: C/jhbuild.xml:368(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:343
+#, no-wrap
+msgid "<prompt>$</prompt> <userinput>jhbuild buildone gtk+</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild buildone gtk+</userinput>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:345
+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 ""
+
+#. (itstool) path: section/screen
+#: C/index.docbook:350
 #, 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:370(para)
+#. (itstool) path: section/para
+#: C/index.docbook:352
 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 ""
 
-#: C/jhbuild.xml:374(userinput) C/jhbuild.xml:1224(command)
+#. (itstool) path: section/screen
+#: C/index.docbook:356
 #, 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:376(para)
+#. (itstool) path: section/para
+#: C/index.docbook:358
 msgid ""
-"To get information about a particular module, use the <command>info</command> "
-"command:"
+"To get information about a particular module, use the <command>info</"
+"command> command:"
 msgstr ""
 "Um Informationen über ein bestimmtes Modul anzuzeigen, verwenden Sie den "
 "Befehl <command>info</command>:"
 
-#: C/jhbuild.xml:379(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:361
 #, 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:381(para)
+#. (itstool) path: section/para
+#: C/index.docbook:363
 msgid ""
 "To download or update all the software sources without building, use the "
 "<command>update</command> command. The <command>update</command> command "
@@ -692,12 +699,14 @@ msgid ""
 "useful if internet bandwidth varies."
 msgstr ""
 
-#: C/jhbuild.xml:387(userinput) C/jhbuild.xml:1477(command)
+#. (itstool) path: section/screen
+#: C/index.docbook:368
 #, 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:389(para)
+#. (itstool) path: section/para
+#: C/index.docbook:370
 msgid ""
 "Later, JHBuild can build everything without downloading or updating the "
 "sources:"
@@ -705,12 +714,14 @@ msgstr ""
 "Später kann JHBuild alles ohne Herunterladen oder Aktualisieren der Quellen "
 "erstellen:"
 
-#: C/jhbuild.xml:392(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:373
 #, 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:394(para)
+#. (itstool) path: section/para
+#: C/index.docbook:375
 msgid ""
 "To run a particular command with the same environment used by JHBuild, use "
 "the <command>run</command> command:"
@@ -718,16 +729,14 @@ msgstr ""
 "Um einen Befehl in der auch von JHBuild genutzten Umgebung auszuführen, "
 "benutzen Sie den <command>run</command>-Befehl:"
 
-#: C/jhbuild.xml:397(replaceable) C/jhbuild.xml:1316(replaceable)
-msgid "program"
-msgstr "Programm"
-
-#: C/jhbuild.xml:397(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:378
 #, 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:399(para)
+#. (itstool) path: section/para
+#: C/index.docbook:380
 msgid ""
 "To start a shell with the same environment used by JHBuild, use the "
 "<command>shell</command> command:"
@@ -735,31 +744,36 @@ msgstr ""
 "Um eine Shell in der auch von JHBuild genutzten Umgebung auszuführen, "
 "benutzen Sie den <command>shell</command>-Befehl:"
 
-#: C/jhbuild.xml:402(userinput) C/jhbuild.xml:459(userinput)
-#: C/jhbuild.xml:1387(command)
+#. (itstool) path: section/screen
+#: C/index.docbook:383
 #, 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:408(title)
+#. (itstool) path: section/title
+#: C/index.docbook:388
 msgid "JHBuild and GNOME"
 msgstr "JHBuild und GNOME"
 
-#: C/jhbuild.xml:410(para)
+#. (itstool) path: section/para
+#: C/index.docbook:390
 msgid ""
 "This section provides guidance on building, installing and running GNOME."
 msgstr ""
 
-#: C/jhbuild.xml:413(title)
+#. (itstool) path: section/title
+#: C/index.docbook:394
 msgid "Building GNOME"
 msgstr "GNOME erstellen"
 
-#: C/jhbuild.xml:415(para)
+#. (itstool) path: section/para
+#: C/index.docbook:396
 msgid "To build GNOME some development packages are required. This includes:"
 msgstr ""
 "Um GNOME zu erstellen, werden einige Entwicklerpakete benötigt. Diese sind:"
 
-#: C/jhbuild.xml:419(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:401
 msgid ""
 "DocBook XML DTD and XSLT stylesheets. These need to be registered in the XML "
 "catalog (<filename>/etc/xml/catalog</filename>)."
@@ -767,23 +781,27 @@ msgstr ""
 "XML-DTD und XSLT-Stilvorlagen von DocBook. Diese müssen im XML-Katalog "
 "registriert sein (<filename>/etc/xml/catalog</filename>)."
 
-#: C/jhbuild.xml:424(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:406
 msgid "X libraries"
 msgstr "X-Bibliotheken"
 
-#: C/jhbuild.xml:427(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:409
 msgid ""
 "<filename>libsmbclient</filename> from Samba (used for browsing Windows "
 "networks)."
 msgstr ""
-"<filename>libsmbclient</filename> aus Samba (wird zum Durchsuchen von Windows-"
-"Netzwerken verwendet)."
+"<filename>libsmbclient</filename> aus Samba (wird zum Durchsuchen von "
+"Windows-Netzwerken verwendet)."
 
-#: C/jhbuild.xml:431(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:413
 msgid "<filename>libbz2</filename> from bzip2."
 msgstr "<filename>libbz2</filename> aus bzip2."
 
-#: C/jhbuild.xml:434(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:416
 msgid ""
 "<filename>libpng</filename>, <filename>libjpeg</filename> and "
 "<filename>libtiff</filename> (used for image loading)."
@@ -791,27 +809,31 @@ msgstr ""
 "<filename>libpng</filename>, <filename>libjpeg</filename> und "
 "<filename>libtiff</filename> (verwendet zum Laden von Bildern)."
 
-#: C/jhbuild.xml:440(para)
+#. (itstool) path: section/para
+#: C/index.docbook:421
 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."
+"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/jhbuild.xml:449(title)
+#. (itstool) path: section/title
+#: C/index.docbook:430
 msgid "Running a Single GNOME Application"
 msgstr "Ausführung einer einzelnen GNOME-Anwendung"
 
-#: C/jhbuild.xml:451(para)
+#. (itstool) path: section/para
+#: C/index.docbook:432
 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/jhbuild.xml:456(para)
+#. (itstool) path: section/para
+#: C/index.docbook:437
 msgid ""
 "Launch a JHBuild shell. The JHBuild shell has all the necessary environment "
 "variables set."
@@ -819,176 +841,161 @@ msgstr ""
 "Starten Sie eine JHBuild-Shell. In der JHBuild-Shell sind bereits alle "
 "nötigen Umgebungsvariablen gesetzt."
 
-#: C/jhbuild.xml:461(para)
+#. (itstool) path: section/screen
+#: C/index.docbook:440
+#, no-wrap
+msgid "<prompt>$ </prompt><userinput>jhbuild shell</userinput>"
+msgstr "<prompt>$ </prompt><userinput>jhbuild shell</userinput>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:442
 msgid "Verify the correct application will be run. For example:"
 msgstr ""
 "Überprüfen Sie, ob die richtige Anwendung ausgeführt wird. Zum Beispiel:"
 
-#: C/jhbuild.xml:464(userinput)
-#, no-wrap
-msgid "which gedit"
-msgstr "which gedit"
-
-#: C/jhbuild.xml:464(screen)
+#. (itstool) path: section/screen
+#: C/index.docbook:444
 #, no-wrap
 msgid ""
-"<placeholder-1/><placeholder-2/>\n"
-"/opt/gnome/bin/gedit"
+"<prompt>$ </prompt><userinput>which gedit</userinput>\n"
+"/home/wanda/jhbuild/install/bin/gedit"
 msgstr ""
-"<placeholder-1/><placeholder-2/>\n"
-"/opt/gnome/bin/gedit"
+"<prompt>$ </prompt><userinput>which gedit</userinput>\n"
+"/home/wanda/jhbuild/install/bin/gedit"
 
-#: C/jhbuild.xml:467(para)
+#. (itstool) path: section/para
+#: C/index.docbook:447
 msgid "Run the application:"
 msgstr "Die Anwendung ausführen:"
 
-#: C/jhbuild.xml:469(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:449
 #, no-wrap
-msgid "gedit &amp;"
-msgstr "gedit &amp;"
+msgid "<prompt>$ </prompt><userinput>gedit &amp;</userinput>"
+msgstr "<prompt>$ </prompt><userinput>gedit &amp;</userinput>"
 
-#: C/jhbuild.xml:471(para)
+#. (itstool) path: section/para
+#: C/index.docbook:451
 msgid ""
 "Alternatively, run the application using the <command>run</command> command:"
 msgstr ""
 "Alternativ rufen Sie die Anwendung dem Befehl <command>run</command> auf:"
 
-#: C/jhbuild.xml:474(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:454
 #, no-wrap
-msgid "jhbuild run gedit"
-msgstr "jhbuild run gedit"
+msgid "<prompt>$ </prompt><userinput>jhbuild run gedit</userinput>"
+msgstr "<prompt>$ </prompt><userinput>jhbuild run gedit</userinput>"
 
-#: C/jhbuild.xml:478(title)
+#. (itstool) path: section/title
+#: C/index.docbook:458
 msgid "Running the GNOME Desktop Environment"
 msgstr "Ausführung der GNOME-Arbeitsumgebung"
 
-#: C/jhbuild.xml:480(para)
+#. (itstool) path: section/para
+#: C/index.docbook:460
 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>."
+"using a 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/jhbuild.xml:486(para)
+#. (itstool) path: section/para
+#: C/index.docbook:466
 msgid ""
-"Setup JHBuild on the new <systemitem class=\"username\">gnomedev</systemitem> "
-"account. Copy or soft-link <filename>~/.jhbuildrc</filename> and <filename>~/."
-"local/bin/jhbuild</filename> to <systemitem class=\"username\">gnomedev</"
-"systemitem> home directory."
+"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/jhbuild.xml:491(para)
+#. (itstool) path: section/para
+#: C/index.docbook:473
 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 ""
-"Öffnen Sie ein Terminal als Benutzer <systemitem class=\"username\">gnomedev</"
-"systemitem>. Fügen Sie <filename>~/.local/bin</filename> dauerhaft zur "
-"Variable <envar>PATH</envar> hinzu, führen Sie folgenden Befehl aus:"
+"Öffnen Sie ein Terminal als Benutzer <systemitem class=\"username"
+"\">gnomedev</systemitem>. Fügen Sie <filename>~/.local/bin</filename> "
+"dauerhaft zur Variable <envar>PATH</envar> hinzu, führen Sie folgenden "
+"Befehl aus:"
+
+#. (itstool) path: section/screen
+#: C/index.docbook:478
+#, no-wrap
+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/jhbuild.xml:499(para)
+#. (itstool) path: section/para
+#: C/index.docbook:480
 msgid "Test JHBuild works:"
 msgstr "Testen Sie, ob JHBuild funktioniert:"
 
-#: C/jhbuild.xml:501(userinput)
-#, no-wrap
-msgid "jhbuild run pkg-config gtk+-2.0 --modversion"
-msgstr "jhbuild run pkg-config gtk+-2.0 --modversion"
-
-#: C/jhbuild.xml:501(screen)
+#. (itstool) path: section/screen
+#: C/index.docbook:482
 #, no-wrap
 msgid ""
-"<placeholder-1/> <placeholder-2/>\n"
+"<prompt>$</prompt> <userinput>jhbuild run pkg-config gtk+-2.0 --modversion</userinput>\n"
 "2.20.1"
 msgstr ""
-"<placeholder-1/> <placeholder-2/>\n"
+"<prompt>$</prompt> <userinput>jhbuild run pkg-config gtk+-2.0 --modversion</userinput>\n"
 "2.20.1"
 
-#: C/jhbuild.xml:504(para)
-msgid "There are three different methods to run JHBuild GNOME:"
-msgstr "Es gibt drei verschiedene Methoden, um JHBuild-GNOME auszuführen:"
-
-#: C/jhbuild.xml:508(para)
-msgid "Nested window <emphasis>(recommended)</emphasis>."
-msgstr "Eingebettetes Fenster <emphasis>(empfohlen)</emphasis>."
-
-#: C/jhbuild.xml:512(para)
-msgid "Display manager."
-msgstr "Anmeldefenster."
-
-#: C/jhbuild.xml:517(title)
-msgid "Setup GNOME to run in a nested window"
-msgstr "GNOME für die Ausführung in einem eingebetteten Fenster einrichten"
+#. (itstool) path: section/title
+#: C/index.docbook:486
+msgid "Setup GNOME to run from the display manager"
+msgstr "GNOME für den Start über das Anmeldefenster einrichten"
 
-#: C/jhbuild.xml:519(para) C/jhbuild.xml:590(para)
+#. (itstool) path: section/para
+#: C/index.docbook:488
 msgid "Build and install JHBuild GNOME."
 msgstr "Erstellen und installieren Sie JHBuild GNOME."
 
-#: C/jhbuild.xml:521(para)
-msgid ""
-"Install the <application>Xephyr</application> application. On Fedora the "
-"system package is called <filename>xorg-x11-server-Xephyr</filename>, on "
-"Ubuntu and Debian the system package is called <filename>xserver-xephyr</"
-"filename>."
-msgstr ""
-
-#: C/jhbuild.xml:527(para)
-msgid "Test <application>Xephyr</application> works:"
-msgstr "Testen Sie, ob <application>Xephyr</application> funktioniert:"
-
-#: C/jhbuild.xml:529(userinput) C/jhbuild.xml:579(userinput)
-#, no-wrap
-msgid "Xephyr -ac -screen 800x600 :1 2&gt; /dev/null &amp;"
-msgstr "Xephyr -ac -screen 800x600 :1 2&gt; /dev/null &amp;"
-
-#: C/jhbuild.xml:531(para)
-msgid ""
-"If successful, a window with black background will be displayed. Close the "
-"<application>Xephyr</application> window."
-msgstr ""
-
-#: C/jhbuild.xml:536(para) C/jhbuild.xml:592(para)
+#. (itstool) path: section/para
+#: C/index.docbook:490
 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:"
+"daemon and the services within <filename><replaceable>~/jhbuild/install/</"
+"replaceable>/share/dbus-1/services/</filename>. Replace <filename>~/jhbuild/"
+"install</filename> with GNOME install <varname>prefix</varname> in the "
+"command below:"
 msgstr ""
 
-#: C/jhbuild.xml:548(replaceable) C/jhbuild.xml:549(replaceable)
-#: C/jhbuild.xml:604(replaceable) C/jhbuild.xml:605(replaceable)
-msgid "/opt/gnome"
-msgstr "/opt/gnome"
-
-#: C/jhbuild.xml:548(userinput) C/jhbuild.xml:604(userinput)
-#, no-wrap
-msgid "rm -rf <placeholder-1/>/var/run/dbus"
-msgstr "rm -rf <placeholder-1/>/var/run/dbus"
-
-#: C/jhbuild.xml:549(userinput) C/jhbuild.xml:605(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:500
 #, no-wrap
-msgid "ln -s /var/run/dbus <placeholder-1/>/var/run"
-msgstr "ln -s /var/run/dbus <placeholder-1/>/var/run"
+msgid ""
+"<prompt>$ </prompt><userinput>rm -rf 
<replaceable>~/jhbuild/install</replaceable>/var/run/dbus</userinput>\n"
+"<prompt>$ </prompt><userinput>ln -s /var/run/dbus 
<replaceable>~/jhbuild/install</replaceable>/var/run/dbus</userinput>\n"
+"<prompt>$ </prompt><userinput>rm -rf 
<replaceable>~/jhbuild/install</replaceable>/var/lib/dbus/machine-id</userinput>\n"
+"<prompt>$ </prompt><userinput>ln -s /var/lib/dbus/machine-id 
<replaceable>~/jhbuild/install</replaceable>/var/lib/dbus/machine-id</userinput>"
+msgstr ""
+"<prompt>$ </prompt><userinput>rm -rf 
<replaceable>~/jhbuild/install</replaceable>/var/run/dbus</userinput>\n"
+"<prompt>$ </prompt><userinput>ln -s /var/run/dbus 
<replaceable>~/jhbuild/install</replaceable>/var/run/dbus</userinput>\n"
+"<prompt>$ </prompt><userinput>rm -rf 
<replaceable>~/jhbuild/install</replaceable>/var/lib/dbus/machine-id</userinput>\n"
+"<prompt>$ </prompt><userinput>ln -s /var/lib/dbus/machine-id 
<replaceable>~/jhbuild/install</replaceable>/var/lib/dbus/machine-id</userinput>"
 
-#: C/jhbuild.xml:551(para)
+#. (itstool) path: section/para
+#: C/index.docbook:505
 msgid ""
-"Create a GNOME startup script at <filename>~/.local/bin/gnome-jhbuild-xephyr-"
-"session</filename> with the following, replacing <filename>/opt/gnome</"
+"Create a GNOME startup script at <filename>/usr/bin/gnome-jhbuild-session</"
+"filename> with the following, replacing <filename>~/jhbuild/install</"
 "filename> with GNOME install <varname>prefix</varname>:"
 msgstr ""
 
-#: C/jhbuild.xml:557(programlisting) C/jhbuild.xml:613(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:510
 #, no-wrap
 msgid ""
 "#!/bin/sh\n"
 "\n"
-"GNOME=<replaceable>/opt/gnome</replaceable>\n"
-" \n"
+"GNOME=<replaceable>~/jhbuild/install</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"
@@ -997,107 +1004,40 @@ msgid ""
 msgstr ""
 "#!/bin/sh\n"
 "\n"
-"GNOME=<replaceable>/opt/gnome</replaceable>\n"
-" \n"
+"GNOME=<replaceable>~/jhbuild/install</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/jhbuild.xml:568(para)
-msgid ""
-"Make the file <filename>~/.local/bin/gnome-jhbuild-xephyr-session</filename> "
-"executable:"
-msgstr ""
-"Machen Sie die Datei <filename>~/.local/bin/gnome-jhbuild-xephyr-session</"
-"filename> ausführbar:"
-
-#: C/jhbuild.xml:572(userinput)
-#, no-wrap
-msgid "chmod u+x ~/.local/bin/gnome-jhbuild-xephyr-session"
-msgstr "chmod u+x ~/.local/bin/gnome-jhbuild-xephyr-session"
-
-#: C/jhbuild.xml:575(title)
-msgid "Running GNOME in a nested window"
-msgstr "Ausführung von GNOME in einem eingebetteten Fenster"
-
-#: C/jhbuild.xml:576(para)
-msgid ""
-"Open a terminal as the user <systemitem class=\"username\">gnomedev</"
-"systemitem>."
-msgstr ""
-"Öffnen Sie ein Terminal als Benutzer <systemitem class=\"username\">gnomedev</"
-"systemitem>."
-
-#: C/jhbuild.xml:578(para)
-msgid "Run <application>Xephyr</application>:"
-msgstr "Rufen Sie <application>Xephyr</application> auf:"
-
-#: C/jhbuild.xml:579(prompt) C/jhbuild.xml:581(prompt)
-#: C/jhbuild.xml:583(prompt)
-msgid "#"
-msgstr "#"
-
-#: C/jhbuild.xml:580(para)
-msgid "Set the <varname>DISPLAY</varname> environment variable:"
-msgstr "Setzen Sie die Umgebungsvariable <varname>DISPLAY</varname>:"
-
-#: C/jhbuild.xml:581(userinput)
-#, no-wrap
-msgid "export DISPLAY=:1"
-msgstr "export DISPLAY=:1"
-
-#: C/jhbuild.xml:582(para)
-msgid "Start GNOME:"
-msgstr "Starten Sie GNOME:"
-
-#: C/jhbuild.xml:583(userinput)
-#, no-wrap
-msgid "gnome-jhbuild-xephyr-session"
-msgstr "gnome-jhbuild-xephyr-session"
-
-#: C/jhbuild.xml:585(para)
-msgid ""
-"If successful, JHBuild GNOME will be displayed in Xephyr window. If "
-"unsuccessful, check the output of the terminal window."
-msgstr ""
-"Falls erfolgreich, wird das JHBuild-GNOME in einem Xephyr-Fenster angezeigt. "
-"Falls nicht, überprüfen Sie die Ausgaben des Terminalfensters."
-
-#: C/jhbuild.xml:588(title)
-msgid "Setup GNOME to run from the display manager"
-msgstr "GNOME für den Start über das Anmeldefenster einrichten"
-
-#: C/jhbuild.xml:607(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/jhbuild.xml:624(para)
+#. (itstool) path: section/para
+#: C/index.docbook:521
 msgid ""
 "Make the file <filename>/usr/bin/gnome-jhbuild-session</filename> executable:"
 msgstr ""
 "Machen Sie die Datei <filename>/usr/bin/gnome-jhbuild-session</filename> "
 "ausführbar:"
 
-#: C/jhbuild.xml:628(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:524
 #, no-wrap
-msgid "chmod a+x /usr/bin/gnome-jhbuild-session"
-msgstr "chmod a+x /usr/bin/gnome-jhbuild-session"
+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/jhbuild.xml:630(para)
+#. (itstool) path: section/para
+#: C/index.docbook:526
 msgid ""
 "To add a new session entry in the display manager, create <filename>/usr/"
 "share/xsessions/gnome-jhbuild.desktop</filename> and enter:"
 msgstr ""
 "Um einen neuen Sitzungseintrag für das Anmeldefenster anzulegen, erstellen "
-"Sie die Datei <filename>/usr/share/xsessions/gnome-jhbuild.desktop</filename> "
-"und geben Sie ein:"
+"Sie die Datei <filename>/usr/share/xsessions/gnome-jhbuild.desktop</"
+"filename> und geben Sie ein:"
 
-#: C/jhbuild.xml:635(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:530
 #, no-wrap
 msgid ""
 "[Desktop Entry]\n"
@@ -1116,40 +1056,82 @@ msgstr ""
 "Icon=\n"
 "Type=Application"
 
-#: C/jhbuild.xml:643(para)
+#. (itstool) path: section/para
+#: C/index.docbook:538
 msgid "Restart <command>gdm</command>."
 msgstr "Starten Sie <command>gdm</command> neu."
 
-#: C/jhbuild.xml:648(title)
+#. (itstool) path: section/title
+#: C/index.docbook:544
 msgid "Running GNOME from the display manager"
 msgstr "GNOME über das Anmeldefenster ausführen"
 
-#: C/jhbuild.xml:650(para)
+#. (itstool) path: section/para
+#: C/index.docbook:546
 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 within the <filename>~gnomedev/.xsession-errors</"
-"filename> file."
+"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 ""
+
+#. (itstool) path: section/title
+#: C/index.docbook:557
+msgid "Static Analysis"
+msgstr "Statische Analysen"
+
+#. (itstool) path: section/para
+#: C/index.docbook:559
+msgid ""
+"JHBuild supports running static analysis tools on the code in modules as "
+"they’re built. To enable this, set the <varname>static_analyzer</varname> "
+"configuration variable to <constant>True</constant> in the <filename>."
+"jhbuildrc</filename> configuration file."
+msgstr ""
+
+#. (itstool) path: section/para
+#: C/index.docbook:565
+msgid ""
+"If enabled, every time a module is built using JHBuild, the build process "
+"will be wrapped in a static analyzer, which will generate a report of any "
+"problems it finds with the code. These reports are saved as HTML files in "
+"subdirectories of <filename>/tmp/jhbuild_static_analyzer</filename> (by "
+"default; the path can be changed using the "
+"<varname>static_analyzer_outputdir</varname> configuration variable)."
+msgstr ""
+
+#. (itstool) path: section/para
+#: C/index.docbook:573
+msgid ""
+"Static analysis currently only works for modules which use autotools as "
+"their build system. It requires the <command>scan-build</command> program to "
+"be installed, although the command it uses can be changed by modifying the "
+"<varname>static_analyzer_template</varname> configuration variable."
 msgstr ""
 
-#: C/jhbuild.xml:662(title)
+#. (itstool) path: section/title
+#: C/index.docbook:582
 msgid "Buildbot Integration"
 msgstr "Integration von Buildbot"
 
-#: C/jhbuild.xml:664(para)
+#. (itstool) path: section/para
+#: C/index.docbook:584
 msgid ""
-"Coupled with the <ulink url=\"http://buildbot.net\";>Buildbot</ulink> project, "
-"JHBuild can also function as a continuous integration tool. The Buildbot "
-"configuration is used by the GNOME project at <ulink url=\"http://build.gnome.";
-"org\">build.gnome.org</ulink>."
+"Coupled with the <ulink url=\"http://buildbot.net\";>Buildbot</ulink> "
+"project, JHBuild can also function as a continuous integration tool. The "
+"Buildbot configuration is used by the GNOME project at <ulink url=\"http://";
+"build.gnome.org\">build.gnome.org</ulink>."
 msgstr ""
 
-#: C/jhbuild.xml:672(title)
+#. (itstool) path: section/title
+#: C/index.docbook:590
 msgid "Configuring a Buildbot Slave"
 msgstr "Konfigurieren eines Buildbot-Slaves"
 
-#: C/jhbuild.xml:674(para)
+#. (itstool) path: section/para
+#: C/index.docbook:592
 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 "
@@ -1157,29 +1139,34 @@ msgid ""
 "Buildbot customizations."
 msgstr ""
 
-#: C/jhbuild.xml:681(para)
+#. (itstool) path: section/para
+#: C/index.docbook:597
 msgid ""
 "Buildbot commands are options to the <command>bot</command> command. To "
 "download and install the extra required software, run the following command:"
 msgstr ""
 "Buildbot-Befehle sind Optionen des <command>bot</command>-Befehls. Um die "
-"zusätzlich benötigte Software herunterzuladen und zu installieren, führen Sie "
-"den folgenden Befehl aus:"
+"zusätzlich benötigte Software herunterzuladen und zu installieren, führen "
+"Sie den folgenden Befehl aus:"
 
-#: C/jhbuild.xml:687(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:601
 #, 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:689(para)
+#. (itstool) path: section/para
+#: C/index.docbook:603
 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 ""
 "Sobald dieser Schritt erfolgreich abgeschlossen ist, sind drei neue "
-"Konfigurationsvariablen in der <filename>~/.jhbuildrc</filename> erforderlich."
+"Konfigurationsvariablen in der Datei <filename>~/.config/jhbuildrc</"
+"filename> erforderlich."
 
-#: C/jhbuild.xml:695(para)
+#. (itstool) path: note/para
+#: C/index.docbook:608
 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."
@@ -1188,7 +1175,8 @@ msgstr ""
 "Option <link linkend=\"option-file\"><option>--file</option></link> wird "
 "nicht die gewünschten Effekte erzielen."
 
-#: C/jhbuild.xml:702(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:613
 #, no-wrap
 msgid ""
 "\n"
@@ -1201,16 +1189,18 @@ msgstr ""
 "jhbuildbot_slavename = 'slavename'\n"
 "jhbuildbot_password = 'password'\n"
 
-#: C/jhbuild.xml:708(para)
+#. (itstool) path: section/para
+#: C/index.docbook:619
 msgid ""
 "<varname>jhbuildbot_master</varname> is a string specifying the Buildbot "
 "master server; it defaults to <literal>'build.gnome.org:9070'</literal>. "
 "<varname>jhbuildbot_slavename</varname> and <varname>jhbuildbot_password</"
-"varname> identify the slave on the master server. Contact the Buildbot master "
-"administrators to obtain the slave name and password."
+"varname> identify the slave on the master server. Contact the Buildbot "
+"master administrators to obtain the slave name and password."
 msgstr ""
 
-#: C/jhbuild.xml:719(para)
+#. (itstool) path: note/para
+#: C/index.docbook:628
 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"
@@ -1220,84 +1210,121 @@ msgstr ""
 "ulink> sind über die <ulink url=\"mailto:build-brigade-list gnome org"
 "\">Mailingliste der Build Brigade</ulink> erreichbar."
 
-#: C/jhbuild.xml:739(title)
+#. (itstool) path: section/title
+#: C/index.docbook:643
 msgid "Command Reference"
 msgstr "Befehlsreferenz"
 
-#: C/jhbuild.xml:741(para)
+#. (itstool) path: section/para
+#: C/index.docbook:645
 msgid "JHBuild uses a command line syntax similar to tools like CVS:"
 msgstr ""
 "JHBuild verwendet eine Befehlszeilensyntax ähnlich wie in Werkzeugen wie CVS:"
 
-#: C/jhbuild.xml:744(command)
-msgid "jhbuild"
-msgstr "jhbuild"
-
-#: C/jhbuild.xml:745(replaceable)
-msgid "global-options"
-msgstr "global-options"
-
-#: C/jhbuild.xml:746(replaceable)
-msgid "command"
-msgstr "command"
-
-#: C/jhbuild.xml:747(replaceable)
-msgid "command-arguments"
-msgstr "command-arguments"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:647
+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:750(para)
+#. (itstool) path: section/para
+#: C/index.docbook:653
 msgid "The global JHBuild options are:"
 msgstr "Folgende globale Optionen stehen für JHBuild zur Verfügung:"
 
-#: C/jhbuild.xml:754(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:657
 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>Konfigurationsdatei</"
+"<option>-f</option>, <option>--file</option> <replaceable>config</"
 "replaceable>"
 
-#: C/jhbuild.xml:757(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:662
 msgid ""
 "Use an alternative configuration file instead of the default <filename>~/."
-"jhbuildrc</filename>."
+"config/jhbuildrc</filename>."
 msgstr ""
-"Eine alternative Konfiguration anstelle der vorgegebenen <filename>~/."
+"Eine alternative Konfiguration anstelle der vorgegebenen <filename>~/.config/"
 "jhbuildrc</filename> verwenden."
 
-#: C/jhbuild.xml:763(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:667
 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>Modulsatz</"
+"<option>-m</option>, <option>--moduleset</option> <replaceable>Modulsatz</"
 "replaceable>"
 
-#: C/jhbuild.xml:766(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:672
 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:774(option)
-msgid "--no-interact"
-msgstr "--no-interact"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:679
+msgid "<option>--no-interact</option>"
+msgstr "<option>--no-interact</option>"
 
-#: C/jhbuild.xml:776(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:683
 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:783(para)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:689
+msgid "<option>--exit-on-error</option>"
+msgstr "<option>--exit-on-error</option>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:693
+msgid ""
+"Exit immediately if a module fails to build. This option is primarily useful "
+"in noninteractive mode, in order to ensure jhbuild does not continue to "
+"build any additional modules."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:699
+msgid "<option>--conditions</option>"
+msgstr "<option>--conditions</option>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:703
+msgid ""
+"Modify the condition flags to be different than those determined on the "
+"basis of the OS and those specified in jhbuildrc. Modifications are "
+"specified like <literal>-wayland</literal> or <literal>+docs</literal> in "
+"order to remove or add conditions. Multiple modifications can be separated "
+"by a comma like <command>--conditions=+docs,-wayland</command> or you can "
+"split them across multiple <command>--conditions</command> arguments."
+msgstr ""
+
+#. (itstool) path: section/para
+#: C/index.docbook:712
 msgid "Command specific options are listed below."
 msgstr "Befehlsspezifische Optionen werden nachstehend aufgelistet."
 
-#: C/jhbuild.xml:786(title)
+#. (itstool) path: section/title
+#: C/index.docbook:715
 msgid "autobuild"
 msgstr "autobuild"
 
-#: C/jhbuild.xml:788(para)
+#. (itstool) path: section/para
+#: C/index.docbook:717
 msgid ""
 "The <command>autobuild</command> command automatically builds the modules as "
 "specified in the configuration file, and then upload the results to "
@@ -1307,69 +1334,36 @@ msgstr ""
 "Konfigurationsdatei angegebenen Module und überträgt die Ergebnisse zu "
 "JHAutobuild."
 
-#: C/jhbuild.xml:793(command)
-msgid "jhbuild autobuild"
-msgstr "jhbuild autobuild"
-
-#: C/jhbuild.xml:794(arg) C/jhbuild.xml:859(arg) C/jhbuild.xml:1057(arg)
-#: C/jhbuild.xml:1423(arg)
-msgid "--autogen"
-msgstr "--autogen"
-
-#: C/jhbuild.xml:795(arg) C/jhbuild.xml:860(arg) C/jhbuild.xml:1058(arg)
-#: C/jhbuild.xml:1424(arg)
-msgid "--clean"
-msgstr "--clean"
-
-#: C/jhbuild.xml:796(replaceable) C/jhbuild.xml:797(replaceable)
-#: C/jhbuild.xml:866(replaceable) C/jhbuild.xml:867(replaceable)
-#: C/jhbuild.xml:876(arg) C/jhbuild.xml:1066(arg)
-#: C/jhbuild.xml:1117(replaceable) C/jhbuild.xml:1118(replaceable)
-#: C/jhbuild.xml:1144(arg) C/jhbuild.xml:1202(arg)
-#: C/jhbuild.xml:1228(replaceable) C/jhbuild.xml:1232(arg)
-#: C/jhbuild.xml:1284(arg) C/jhbuild.xml:1427(replaceable)
-#: C/jhbuild.xml:1428(replaceable) C/jhbuild.xml:1433(arg)
-#: C/jhbuild.xml:1464(arg) C/jhbuild.xml:1478(replaceable)
-#: C/jhbuild.xml:1479(replaceable) C/jhbuild.xml:1483(arg)
-#: C/jhbuild.xml:1504(arg)
-msgid "module"
-msgstr "module"
-
-#: C/jhbuild.xml:796(arg) C/jhbuild.xml:866(arg) C/jhbuild.xml:1117(arg)
-#: C/jhbuild.xml:1427(arg) C/jhbuild.xml:1478(arg)
-msgid "--skip=<placeholder-1/>"
-msgstr "--skip=<placeholder-1/>"
-
-#: C/jhbuild.xml:797(arg) C/jhbuild.xml:867(arg) C/jhbuild.xml:1118(arg)
-#: C/jhbuild.xml:1228(arg) C/jhbuild.xml:1428(arg) C/jhbuild.xml:1479(arg)
-msgid "--start-at=<placeholder-1/>"
-msgstr "--start-at=<placeholder-1/>"
-
-#: C/jhbuild.xml:798(replaceable)
-msgid "reporturl"
-msgstr "reporturl"
-
-#: C/jhbuild.xml:798(arg)
-msgid "--report-url=<placeholder-1/>"
-msgstr "--report-url=<placeholder-1/>"
-
-#: C/jhbuild.xml:799(arg)
-msgid "--verbose"
-msgstr "--verbose"
-
-#: C/jhbuild.xml:802(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."
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:721
+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>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:731
+msgid ""
+"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 ""
 "Die Optionen <option>--autogen</option>, <option>--clean</option>, <option>--"
-"skip</option> und <option>--start-at</option> werden ebenso wie für <link "
-"linkend=\"command-reference-build\"><command>build</command></link> "
-"verarbeitet."
+"distcheck</option>, <option>--skip</option> und <option>--start-at</option> "
+"werden ebenso wie der Befehl <link linkend=\"command-reference-build"
+"\"><command>build</command></link> verarbeitet."
 
-#: C/jhbuild.xml:810(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:739
 msgid ""
 "<option>--report-url=<replaceable>reporturl</replaceable></option>, <option>-"
 "r <replaceable>reporturl</replaceable></option>"
@@ -1377,37 +1371,54 @@ msgstr ""
 "<option>--report-url=<replaceable>reporturl</replaceable></option>, <option>-"
 "r <replaceable>Berichtsadresse</replaceable></option>"
 
-#: C/jhbuild.xml:813(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:744
 msgid "This option specifies the JhAutobuild URL to report to."
 msgstr "Diese Option legt die Adresse für Berichte an JHAutobuild fest."
 
-#: C/jhbuild.xml:819(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:749
 msgid "<option>--verbose</option>, <option>-v</option>"
 msgstr "<option>--verbose</option>, <option>-v</option>"
 
-#: C/jhbuild.xml:821(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:753
 msgid "If specified, JHBuild's output will be more verbose."
 msgstr "Falls angegeben, sind die Ausgaben von JHBuild ausführlicher."
 
-#: C/jhbuild.xml:830(title)
+#. (itstool) path: section/title
+#: C/index.docbook:761
 msgid "bootstrap"
 msgstr "bootstrap"
 
-#: C/jhbuild.xml:832(para)
+#. (itstool) path: section/para
+#: C/index.docbook:763
 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:841(para)
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:772
+msgid "<command>jhbuild bootstrap</command>"
+msgstr "<command>jhbuild bootstrap</command>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:775
 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."
+"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:845(para)
+#. (itstool) path: section/para
+#: C/index.docbook:779
 msgid ""
 "See the <link linkend=\"command-reference-build\"><command>build</command></"
 "link> command documentation for available options."
@@ -1415,11 +1426,13 @@ msgstr ""
 "Die verfügbaren Optionen finden Sie in der <link linkend=\"command-reference-"
 "build\">Dokumentation zu <command>build</command></link>."
 
-#: C/jhbuild.xml:852(title)
+#. (itstool) path: section/title
+#: C/index.docbook:785
 msgid "build"
 msgstr "build"
 
-#: C/jhbuild.xml:854(para)
+#. (itstool) path: section/para
+#: C/index.docbook:787
 msgid ""
 "The <command>build</command> command builds one or more packages, including "
 "their dependencies."
@@ -1427,77 +1440,32 @@ msgstr ""
 "Der Befehl <command>build</command> erstellt ein oder mehrere Pakete "
 "einschließlich deren Abhängigkeiten."
 
-#: C/jhbuild.xml:861(arg) C/jhbuild.xml:905(option) C/jhbuild.xml:1059(arg)
-msgid "--check"
-msgstr "--check"
-
-#: C/jhbuild.xml:862(arg)
-msgid "--dist"
-msgstr "--dist"
-
-#: C/jhbuild.xml:863(arg) C/jhbuild.xml:921(option) C/jhbuild.xml:1060(arg)
-msgid "--distcheck"
-msgstr "--distcheck"
-
-#: C/jhbuild.xml:864(arg) C/jhbuild.xml:929(option) C/jhbuild.xml:1230(arg)
-#: C/jhbuild.xml:1481(arg)
-msgid "--ignore-suggests"
-msgstr "--ignore-suggests"
-
-#: C/jhbuild.xml:865(arg) C/jhbuild.xml:1061(arg) C/jhbuild.xml:1425(arg)
-msgid "--no-network"
-msgstr "--no-network"
-
-#: C/jhbuild.xml:868(replaceable) C/jhbuild.xml:1229(replaceable)
-#: C/jhbuild.xml:1480(replaceable)
-msgid "tags"
-msgstr "tags"
-
-#: C/jhbuild.xml:868(arg) C/jhbuild.xml:1229(arg) C/jhbuild.xml:1480(arg)
-msgid "--tags=<placeholder-1/>"
-msgstr "--tags=<placeholder-1/>"
-
-#: C/jhbuild.xml:869(replaceable) C/jhbuild.xml:977(replaceable)
-#: C/jhbuild.xml:1062(replaceable) C/jhbuild.xml:1429(replaceable)
-#: C/jhbuild.xml:1482(replaceable) C/jhbuild.xml:1503(replaceable)
-msgid "date"
-msgstr "date"
-
-#: C/jhbuild.xml:869(arg) C/jhbuild.xml:1062(arg) C/jhbuild.xml:1429(arg)
-#: C/jhbuild.xml:1482(arg) C/jhbuild.xml:1503(arg)
-msgid "-D <placeholder-1/>"
-msgstr "-D <placeholder-1/>"
-
-#: C/jhbuild.xml:870(arg) C/jhbuild.xml:1063(arg)
-msgid "--no-xvfb"
-msgstr "--no-xvfb"
-
-#: C/jhbuild.xml:871(arg)
-msgid "--try-checkout"
-msgstr "--try-checkout"
-
-#: C/jhbuild.xml:872(arg)
-msgid "--no-poison"
-msgstr "--no-poison"
-
-#: C/jhbuild.xml:873(arg) C/jhbuild.xml:1064(arg)
-msgid "--force"
-msgstr "--force"
-
-#: C/jhbuild.xml:874(arg) C/jhbuild.xml:1023(option)
-msgid "--build-optional-modules"
-msgstr "--build-optional-modules"
-
-#: C/jhbuild.xml:875(replaceable) C/jhbuild.xml:1065(replaceable)
-msgid "time"
-msgstr "time"
-
-#: C/jhbuild.xml:875(arg) C/jhbuild.xml:1065(arg)
-msgid "--min-age=<placeholder-1/>"
-msgstr "--min-age=<placeholder-1/>"
-
-#: C/jhbuild.xml:879(para) C/jhbuild.xml:1121(para) C/jhbuild.xml:1147(para)
-#: C/jhbuild.xml:1235(para)
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:790
+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 ""
+"<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>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:813 C/index.docbook:1106 C/index.docbook:1130
+#: C/index.docbook:1227
 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."
@@ -1506,53 +1474,96 @@ msgstr ""
 "linkend=\"cfg-modules\">Modulliste</link> aus der Konfigurationsdatei "
 "verwendet."
 
-#: C/jhbuild.xml:885(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:819
 msgid "<option>-a</option>, <option>--autogen</option>"
 msgstr "<option>-a</option>, <option>--autogen</option>"
 
-#: C/jhbuild.xml:887(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."
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:823
+msgid "Always run <command>autogen.sh</command> before building modules."
 msgstr ""
+"<command>autogen.sh</command> immer vor der Erstellung von Modulen ausführen."
 
-#: C/jhbuild.xml:897(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:828
 msgid "<option>-c</option>, <option>--clean</option>"
 msgstr "<option>-c</option>, <option>--clean</option>"
 
-#: C/jhbuild.xml:899(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:832
 msgid "Run <command>make clean</command> before building modules."
-msgstr "<command>make clean</command> vor der Erstellung von Modulen ausführen."
+msgstr ""
+"<command>make clean</command> vor der Erstellung von Modulen ausführen."
 
-#: C/jhbuild.xml:907(simpara)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:837
+msgid "<option>--check</option>"
+msgstr "<option>--check</option>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:841
 msgid "Run <command>make check</command> after building modules."
 msgstr ""
 "<command>make check</command> nach der Erstellung von Modulen ausführen."
 
-#: C/jhbuild.xml:913(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:846
 msgid "<option>-d</option>, <option>--dist</option>"
 msgstr "<option>-d</option>, <option>--dist</option>"
 
-#: C/jhbuild.xml:915(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:850
 msgid "Run <command>make dist</command> after building modules."
-msgstr "<command>make dist</command> nach der Erstellung von Modulen ausführen."
+msgstr ""
+"<command>make dist</command> nach der Erstellung von Modulen ausführen."
 
-#: C/jhbuild.xml:923(simpara)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:855
+msgid "<option>--distcheck</option>"
+msgstr "<option>--distcheck</option>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:859
 msgid "Run <command>make distcheck</command> after building modules."
 msgstr ""
 "<command>make distcheck</command> nach der Erstellung von Modulen ausführen."
 
-#: C/jhbuild.xml:931(simpara)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:864
+msgid "<option>--distclean</option>"
+msgstr "<option>--distclean</option>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:868
+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 ""
+
+#. (itstool) path: note/simpara
+#: C/index.docbook:873
+msgid "This option will delete any uncommitted changes."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:879
+msgid "<option>--ignore-suggests</option>"
+msgstr "<option>--ignore-suggests</option>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:883
 msgid "Do not build soft dependencies."
 msgstr "Keine weichen Abhängigkeiten erstellen."
 
-#: C/jhbuild.xml:936(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:887
 msgid "<option>-n</option>, <option>--no-network</option>"
 msgstr "<option>-n</option>, <option>--no-network</option>"
 
-#: C/jhbuild.xml:938(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:891
 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, "
@@ -1563,7 +1574,8 @@ msgstr ""
 "Falls das Modul ohne Netzwerkzugriff nicht erstellt werden kann, wird die "
 "Erstellung des Moduls scheitern."
 
-#: C/jhbuild.xml:946(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:898
 msgid ""
 "<option>-s</option>, <option>--skip</option>=<replaceable>module,...</"
 "replaceable>"
@@ -1571,7 +1583,8 @@ msgstr ""
 "<option>-s</option>, <option>--skip</option>=<replaceable>Modul,…</"
 "replaceable>"
 
-#: C/jhbuild.xml:949(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:903
 msgid ""
 "Do not build the listed modules. Used to skip the building of specified "
 "dependencies."
@@ -1579,17 +1592,20 @@ msgstr ""
 "Die aufgelisteten Module nicht erstellen. Wird benutzt, um die Erstellung "
 "spezifischer Abhängigkeiten zu überspringen."
 
-#: C/jhbuild.xml:955(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:908
 msgid "<option>--tags</option>=<replaceable>tag,...</replaceable>"
 msgstr "<option>--tags</option>=<replaceable>Tag, …</replaceable>"
 
-#: C/jhbuild.xml:958(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:912
 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:966(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:919
 msgid ""
 "<option>-t</option>, <option>--start-at</option>=<replaceable>module</"
 "replaceable>"
@@ -1597,7 +1613,8 @@ msgstr ""
 "<option>-t</option>, <option>--start-at</option>=<replaceable>Modul</"
 "replaceable>"
 
-#: C/jhbuild.xml:969(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:924
 msgid ""
 "Start at the named module rather than at the beginning of the list. This "
 "option is useful if the build was interrupted."
@@ -1605,41 +1622,50 @@ msgstr ""
 "Beim genannten Modul anstatt am Beginn der Liste starten. Diese Option ist "
 "sinnvoll, wenn die Erstellung zuvor unterbrochen wurde."
 
-#: C/jhbuild.xml:976(option)
-msgid "-D"
-msgstr "-D"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:930
+msgid "<option>-D</option> <replaceable>date</replaceable>"
+msgstr "<option>-D</option> <replaceable>Datum</replaceable>"
 
-#: C/jhbuild.xml:979(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:934
 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>."
+"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:987(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:941
 msgid "<option>-x</option>, <option>--no-xvfb</option>"
 msgstr "<option>-x</option>, <option>--no-xvfb</option>"
 
-#: C/jhbuild.xml:989(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:945
 msgid ""
 "Run graphical tests on the actual X server rather than in a simulated Xvfb."
 msgstr ""
+"Grafiktests im eigentlichen X-Server anstelle des simulierten Xvfb ausführen."
 
-#: C/jhbuild.xml:995(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:950
 msgid "<option>-C</option>, <option>--try-checkout</option>"
 msgstr "<option>-C</option>, <option>--try-checkout</option>"
 
-#: C/jhbuild.xml:998(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:954
 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:1006(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:960
 msgid "<option>-N</option>, <option>--no-poison</option>"
 msgstr "<option>-N</option>, <option>--no-poison</option>"
 
-#: C/jhbuild.xml:1008(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:964
 msgid ""
 "If one or more of a module's dependencies failed, this option forces JHBuild "
 "to try to build the module anyway."
@@ -1647,16 +1673,24 @@ msgstr ""
 "Falls die Abhängigkeiten eines oder mehrerer Module scheitern, erzwingt dies "
 "die Erstellung des Moduls durch JHBuild."
 
-#: C/jhbuild.xml:1015(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:969
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: C/jhbuild.xml:1017(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:973
 msgid "Build the modules even if policy states it is not required."
 msgstr ""
 "Das Modul erstellen, auch wenn die Regeln es als nicht erforderlich ansehen."
 
-#: C/jhbuild.xml:1025(simpara)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:978
+msgid "<option>--build-optional-modules</option>"
+msgstr "<option>--build-optional-modules</option>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:982
 msgid ""
 "Modules listed as optional dependencies, may not be required to build the "
 "module. This option forces JHBuild to build optional dependencies."
@@ -1665,24 +1699,72 @@ msgstr ""
 "Erstellung des Zielmoduls notwendig. Diese Option zwingt JHBuild, diese "
 "Module trotzdem einzuschließen."
 
-#: C/jhbuild.xml:1032(term)
-msgid "<option>--min-time</option>=<replaceable>time</replaceable>"
-msgstr "<option>--min-time</option>=<replaceable>Zeit</replaceable>"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:988
+msgid "<option>--min-age</option>=<replaceable>time</replaceable>"
+msgstr "<option>--min-age</option>=<replaceable>Zeit</replaceable>"
 
-#: C/jhbuild.xml:1034(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:992
 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 built "
-"less than two hours ago."
+"<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-age=2h</option> will skip modules "
+"built less than two hours ago."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1001
+msgid "<option>--nodeps</option>"
+msgstr "<option>--nodeps</option>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1005
+msgid ""
+"Ignore missing system dependencies. To ignore a single system dependency add "
+"the module to <link linkend=\"cfg-skip\"><varname>skip</varname></link>."
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.docbook:1014
+msgid "make"
+msgstr "make"
+
+#. (itstool) path: section/para
+#: C/index.docbook:1016
+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 ""
+
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1021
+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/jhbuild.xml:1049(title)
+#. (itstool) path: section/para
+#: C/index.docbook:1028
+msgid ""
+"The options are the same as those available for the <link linkend=\"command-"
+"reference-build\"><command>buildone</command></link> command."
+msgstr ""
+"Die verfügbaren Optionen sind die gleichen wie für den Befehl <link linkend="
+"\"command-reference-build\"><command>buildone</command></link>."
+
+#. (itstool) path: section/title
+#: C/index.docbook:1035
 msgid "buildone"
 msgstr "buildone"
 
-#: C/jhbuild.xml:1051(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1037
 msgid ""
 "The <command>buildone</command> command is similar to <command>build</"
 "command>, but it does not build the dependent modules. It is useful for "
@@ -1692,84 +1774,98 @@ msgstr ""
 "command>, erstellt jedoch keine abhängigen Module. Dies ist nützlich für das "
 "erneute Erstellen eines oder mehrerer Module."
 
-#: C/jhbuild.xml:1056(command)
-msgid "jhbuild buildone"
-msgstr "jhbuild buildone"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1041
+msgid ""
+"<command>jhbuild buildone</command> <arg>--autogen</arg> <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>--autogen</arg> <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:1069(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1056
 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."
+"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 ""
 "Die Optionen <option>--autogen</option>, <option>--check</option>, <option>--"
-"clean</option>, <option>-d</option>, <option>--distcheck</option>, <option>--"
-"no-network</option> <option>-D</option> und <option>-x</option> werden ebenso "
-"wie für <link linkend=\"command-reference-build\"><command>build</command></"
+"clean</option>, <option>-d</option>, <option>--distcheck</option>, "
+"<option>--distclean</option>, <option>--no-network</option> <option>-D</"
+"option>, <option>-x</option> und <option>--nodeps</option> werden ebenso wie "
+"für <link linkend=\"command-reference-build\"><command>build</command></"
 "link> verarbeitet."
 
-#: C/jhbuild.xml:1077(para) C/jhbuild.xml:1511(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1064 C/index.docbook:1568
 msgid "At least one module must be listed on the command line."
 msgstr "In der Befehlszeile muss mindestens ein Modul angegeben werden."
 
-#: C/jhbuild.xml:1083(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1068
 msgid "checkbranches"
 msgstr "checkbranches"
 
-#: C/jhbuild.xml:1085(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1070
 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."
+"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:1090(command)
-msgid "jhbuild checkbranches"
-msgstr "jhbuild checkbranches"
-
-#: C/jhbuild.xml:1091(replaceable)
-msgid "branch"
-msgstr "branch"
-
-#: C/jhbuild.xml:1091(arg)
-msgid "--branch=<placeholder-1/>"
-msgstr "--branch=<placeholder-1/>"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1074
+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:1096(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1080
 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>"
+"option> <replaceable>branch</replaceable>"
 
-#: C/jhbuild.xml:1098(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1085
 msgid "The branch to check."
 msgstr "Der auszucheckende Zweig."
 
-#: C/jhbuild.xml:1103(userinput)
-#, no-wrap
-msgid "jhbuild -m gnome-2.20 checkbranches"
-msgstr "jhbuild -m gnome-2.20 checkbranches"
-
-#: C/jhbuild.xml:1103(screen)
+#. (itstool) path: section/screen
+#: C/index.docbook:1090
 #, 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 ""
-"<placeholder-1/> <placeholder-2/>\n"
-"libgnomecanvas is missing branch definition for gnome-2-20\n"
-"<placeholder-3/>"
+"<prompt>$</prompt> <userinput>jhbuild -m gnome-2.20 checkbranches</userinput>\n"
+"libgnomecanvas fehlen Zweigdefinitionen für gnome-2-20\n"
+"<prompt>$</prompt>"
 
-#: C/jhbuild.xml:1110(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1096
 msgid "clean"
 msgstr "clean"
 
-#: C/jhbuild.xml:1112(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1098
 msgid ""
 "The <command>clean</command> command cleans the build directories of one or "
 "more modules."
@@ -1777,11 +1873,19 @@ msgstr ""
 "Der Befehl <command>clean</command> leert die Erstellungsordner von einem "
 "oder mehreren Modulen."
 
-#: C/jhbuild.xml:1116(command)
-msgid "jhbuild clean"
-msgstr "jhbuild clean"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1101
+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>Modul</replaceable></arg> <arg>--start-"
+"at=<replaceable>Modul</replaceable></arg>"
 
-#: C/jhbuild.xml:1125(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1110
 msgid ""
 "See the <link linkend=\"command-reference-build\"><command>build</command></"
 "link> command documentation for a description of available options."
@@ -1790,39 +1894,40 @@ msgstr ""
 "\"><command>build</command></link> finden Sie eine Beschreibung der "
 "verfügbaren Optionen."
 
-#: C/jhbuild.xml:1132(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1116
 msgid "dot"
 msgstr "dot"
 
-#: C/jhbuild.xml:1134(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1118
 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 then "
-"be processed using the <ulink url=\"http://www.graphviz.org/\";>GraphViz</"
-"ulink> software to produce a diagram."
+"graph formed by the dependencies between a set of modules. This file can "
+"then be processed using the <ulink url=\"http://www.graphviz.org/";
+"\">GraphViz</ulink> software to produce a diagram."
 msgstr ""
 
-#: C/jhbuild.xml:1141(command)
-msgid "jhbuild dot"
-msgstr "jhbuild dot"
-
-#: C/jhbuild.xml:1142(arg)
-msgid "--soft-deps"
-msgstr "--soft-deps"
-
-#: C/jhbuild.xml:1143(arg)
-msgid "--clusters"
-msgstr "--clusters"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1124
+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:1151(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1134
 msgid ""
-"The <option>--soft-deps</option> option adds dotted lines from the modules to "
-"the soft dependencies. The <option>--clusters</option> option groups modules "
-"from <link linkend=\"moduleset-syntax-defs-metamodule\">metamodules</link> "
-"together."
+"The <option>--soft-deps</option> option adds dotted lines from the modules "
+"to the soft dependencies. The <option>--clusters</option> option groups "
+"modules from <link linkend=\"moduleset-syntax-defs-metamodule\">metamodules</"
+"link> together."
 msgstr ""
 
-#: C/jhbuild.xml:1157(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1140
 msgid ""
 "The output of the dot command can be piped to the dot utility to generate a "
 "PostScript file:"
@@ -1830,29 +1935,35 @@ msgstr ""
 "Die Ausgabe dieses Befehls kann leicht zum Befehl <command>dot</command> "
 "weitergeleitet werden, um eine PostScript-Datei zu erstellen:"
 
-#: C/jhbuild.xml:1160(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:1143
 #, no-wrap
-msgid "jhbuild dot <placeholder-1/> | dot -Tps &gt; dependencies.ps"
-msgstr "jhbuild dot <placeholder-1/> | dot -Tps &gt; dependencies.ps"
+msgid "<prompt>$</prompt> <userinput>jhbuild dot <replaceable>modules</replaceable> | dot -Tps &gt; 
dependencies.ps</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild dot <replaceable>Module</replaceable> | dot -Tps &gt; 
dependencies.ps</userinput>"
 
-#: C/jhbuild.xml:1162(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1145
 msgid "Or a PNG image:"
 msgstr "Oder ein PNG-Bild:"
 
-#: C/jhbuild.xml:1164(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:1147
 #, no-wrap
-msgid "jhbuild dot <placeholder-1/> | dot -Tpng &gt; dependencies.png"
-msgstr "jhbuild dot <placeholder-1/> | dot -Tpng &gt; dependencies.png"
+msgid "<prompt>$</prompt> <userinput>jhbuild dot <replaceable>modules</replaceable> | dot -Tpng &gt; 
dependencies.png</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild dot <replaceable>Module</replaceable> | dot -Tpng &gt; 
dependencies.png</userinput>"
 
-#: C/jhbuild.xml:1167(title)
+#. (itstool) path: figure/title
+#: C/index.docbook:1150
 msgid "Sample JHBuild dot output"
 msgstr "Beispielausgabe von dot in JHBuild"
 
-#: C/jhbuild.xml:1180(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1162
 msgid "gui"
 msgstr "gui"
 
-#: C/jhbuild.xml:1182(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1164
 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."
@@ -1861,40 +1972,50 @@ msgstr ""
 "JHBuild, in welcher Module ausgewählt und einige Optionen angepasst werden "
 "können."
 
-#: C/jhbuild.xml:1187(command)
-msgid "jhbuild gui"
-msgstr "jhbuild gui"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1168
+msgid "<command>jhbuild gui</command>"
+msgstr "<command>jhbuild gui</command>"
 
-#: C/jhbuild.xml:1190(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1171
 msgid ""
-"The graphical interface is rendered using GTK, so extra support libraries are "
-"required."
+"The graphical interface is rendered using GTK, so extra support libraries "
+"are required."
 msgstr ""
 "Die erzeugte grafische Oberfläche benötigt GTK zur Darstellung, so dass "
 "einige unterstützende Bibliotheken erforderlich sein werden."
 
-#: C/jhbuild.xml:1195(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1176
 msgid "info"
 msgstr "info"
 
-#: C/jhbuild.xml:1197(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1178
 msgid ""
 "The <command>info</command> command displays information about one or more "
 "modules."
 msgstr ""
-"Der Befehl <command>info</command> wird dazu verwendet, um Informationen über "
-"ein oder mehrere Module anzuzeigen."
+"Der Befehl <command>info</command> wird dazu verwendet, um Informationen "
+"über ein oder mehrere Module anzuzeigen."
 
-#: C/jhbuild.xml:1201(command)
-msgid "jhbuild info"
-msgstr "jhbuild info"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1181
+msgid ""
+"<command>jhbuild info</command> <arg choice=\"opt\">--installed</arg> <arg "
+"choice=\"opt\" rep=\"repeat\">module</arg>"
+msgstr ""
+"<command>jhbuild info</command> <arg choice=\"opt\">--installed</arg> <arg "
+"choice=\"opt\" rep=\"repeat\">module</arg>"
 
-#: C/jhbuild.xml:1205(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1186
 msgid ""
-"The command displays the module name, type, dependencies, dependent 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."
+"The command displays the module name, type, dependencies, dependent "
+"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 ""
 "Der Befehl gibt den Modulnamen, den Typ, die Abhängigkeiten, die davon "
 "abhängenden Pakete, den Quellordner und die Zeit der letzten Erstellung mit "
@@ -1902,7 +2023,8 @@ msgstr ""
 "Modultyps ausgegeben werden, wie den CVS-Softwarebestand oder die "
 "Downloadadresse."
 
-#: C/jhbuild.xml:1211(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1192
 msgid ""
 "If there is no module specified the command will display information about "
 "all the modules defined in the module set."
@@ -1910,71 +2032,102 @@ msgstr ""
 "Falls kein Modul angegeben wird, dann werden Informationen über alle im "
 "Modulsatz definierten Module ausgegeben."
 
-#: C/jhbuild.xml:1217(title)
-msgid "list"
-msgstr "list"
-
-#: C/jhbuild.xml:1219(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1195
 msgid ""
-"The <command>list</command> command displays the expanded list of modules the "
-"<command>build</command> command would build."
+"If the <option>--installed</option> option is specified, the output will be "
+"filtered to include only installed packages. This resulting output only "
+"contains modules that were actually built and installed by jhbuild. The "
+"output does not include system dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:1225(arg)
-msgid "-a"
-msgstr "-a"
+#. (itstool) path: note/simpara
+#: C/index.docbook:1202
+msgid ""
+"If the <option>--installed</option> option is specified together with one or "
+"more module names, then only the installed modules (not including system "
+"dependencies) are printed out. If at least one module is not installed, then "
+"the command will exit with a return value of 1."
+msgstr ""
 
-#: C/jhbuild.xml:1226(arg)
-msgid "-r"
-msgstr "-r"
+#. (itstool) path: section/title
+#: C/index.docbook:1211
+msgid "list"
+msgstr "list"
 
-#: C/jhbuild.xml:1227(arg)
-msgid "-s"
-msgstr "-s"
+#. (itstool) path: section/para
+#: C/index.docbook:1213
+msgid ""
+"The <command>list</command> command displays the expanded list of modules "
+"the <command>build</command> command would build."
+msgstr ""
 
-#: C/jhbuild.xml:1231(arg) C/jhbuild.xml:1266(option)
-msgid "--list-optional-modules"
-msgstr "--list-optional-modules"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1216
+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\">Modul</arg>"
 
-#: C/jhbuild.xml:1239(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1231
 msgid ""
 "The <option>--skip</option>, <option>--start-at</option>, <option>--tags</"
 "option>, and <option>--ignore-suggests</option> options are processed as per "
-"the <link linkend=\"command-reference-build\"><command>build</command></link> "
-"command."
+"the <link linkend=\"command-reference-build\"><command>build</command></"
+"link> command."
 msgstr ""
 "Die Optionen <option>--skip</option>, <option>--start-at</option>, <option>--"
 "tags</option> und <option>--ignore-suggests</option> werden ebenso wie für "
 "<link linkend=\"command-reference-build\"><command>build</command></link> "
 "verarbeitet."
 
-#: C/jhbuild.xml:1248(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1239
 msgid "<option>-a</option>, <option>--all-modules</option>"
 msgstr "<option>-a</option>, <option>--all-modules</option>"
 
-#: C/jhbuild.xml:1251(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1243
 msgid ""
-"List all the modules from the module set regardless of the build dependencies."
+"List all the modules from the module set regardless of the build "
+"dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:1257(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1248
 msgid "<option>-r</option>, <option>--show-revision</option>"
 msgstr "<option>-r</option>, <option>--show-revision</option>"
 
-#: C/jhbuild.xml:1260(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1252
 msgid ""
 "If a module is set to a branch, show the branch name with the module name."
 msgstr ""
 
-#: C/jhbuild.xml:1268(simpara)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1257
+msgid "<option>--list-optional-modules</option>"
+msgstr "<option>--list-optional-modules</option>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1261
 msgid "This option forces JHBuild to list optional dependencies."
 msgstr "Diese Option zwingt JHBuild, optionale Abhängigkeiten aufzulisten."
 
-#: C/jhbuild.xml:1277(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1269
 msgid "rdepends"
 msgstr "rdepends"
 
-#: C/jhbuild.xml:1279(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1271
 msgid ""
 "The <command>rdepends</command> command displays the reverse dependencies of "
 "a module."
@@ -1982,81 +2135,91 @@ msgstr ""
 "Der Befehl <command>rdepends</command> zeigt die rekursiven Abhängigkeiten "
 "eines Moduls an."
 
-#: C/jhbuild.xml:1283(command)
-msgid "jhbuild rdepends"
-msgstr "jhbuild rdepends"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1274
+msgid "<command>jhbuild rdepends</command> <arg>module</arg>"
+msgstr "<command>jhbuild rdepends</command> <arg>Modul</arg>"
 
-#: C/jhbuild.xml:1289(option)
-msgid "--dependencies"
-msgstr "--dependencies"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1280
+msgid "<option>--dependencies</option>"
+msgstr "<option>--dependencies</option>"
 
-#: C/jhbuild.xml:1291(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1284
 msgid "Show dependency path next to modules."
 msgstr "Zeigt den Abhängigkeitspfad neben den Modulen an."
 
-#: C/jhbuild.xml:1296(option)
-msgid "--direct"
-msgstr "--direct"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1288
+msgid "<option>--direct</option>"
+msgstr "<option>--direct</option>"
 
-#: C/jhbuild.xml:1298(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1292
 msgid "Limit display to modules directly depending on specified module."
 msgstr ""
 
-#: C/jhbuild.xml:1306(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1300
 msgid "run"
 msgstr "run"
 
-#: C/jhbuild.xml:1308(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1302
 msgid ""
 "The <command>run</command> command runs the specified command using the same "
 "environment that JHBuild uses when building modules."
 msgstr ""
 
-#: C/jhbuild.xml:1313(command)
-msgid "jhbuild run"
-msgstr "jhbuild run"
-
-#: C/jhbuild.xml:1314(arg)
-msgid "--in-builddir"
-msgstr "--in-builddir"
-
-#: C/jhbuild.xml:1315(arg)
-msgid "--in-checkoutdir"
-msgstr "--in-checkoutdir"
-
-#: C/jhbuild.xml:1317(replaceable)
-msgid "argument"
-msgstr "argument"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1306
+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:1320(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1313
 msgid ""
 "If using JHBuild to build GNOME, this command can be useful in X startup "
 "scripts."
 msgstr ""
-"Falls Sie JHBuild zur Erstellung von GNOME verwenden, kann dieser Befehl in X-"
-"Startskripten nützlich sein."
+"Falls Sie JHBuild zur Erstellung von GNOME verwenden, kann dieser Befehl in "
+"X-Startskripten nützlich sein."
 
-#: C/jhbuild.xml:1325(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1318
 msgid "<option>--in-builddir</option>=<replaceable>module</replaceable>"
 msgstr "<option>--in-builddir</option>=<replaceable>Modul</replaceable>"
 
-#: C/jhbuild.xml:1327(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1322
 msgid "Run the command in the build directory of the specified module."
-msgstr "Führen Sie den Befehl im Erstellungesordner des angegebenen Moduls aus."
+msgstr ""
+"Führen Sie den Befehl im Erstellungesordner des angegebenen Moduls aus."
 
-#: C/jhbuild.xml:1335(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1330
 msgid "<option>--in-checkoutdir</option>=<replaceable>module</replaceable>"
 msgstr "<option>--in-checkoutdir</option>=<replaceable>Modul</replaceable>"
 
-#: C/jhbuild.xml:1337(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1334
 msgid "Run the command in the source directory of the specified module."
 msgstr "Führen Sie den Befehl im Quellordner des angegebenen Moduls aus."
 
-#: C/jhbuild.xml:1346(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1342
 msgid "sanitycheck"
 msgstr "sanitycheck"
 
-#: C/jhbuild.xml:1348(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1344
 msgid ""
 "The <command>sanitycheck</command> command performs a number of checks to "
 "verify the build environment is okay."
@@ -2064,19 +2227,28 @@ msgstr ""
 "Der Befehl <command>sanitycheck</command> nimmt eine Reihe von Überprüfungen "
 "vor, um die Vollständigkeit der Erstellungsumgebung zu gewährleisten."
 
-#: C/jhbuild.xml:1355(para)
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1347
+msgid "<command>jhbuild sanitycheck</command>"
+msgstr "<command>jhbuild sanitycheck</command>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:1350
 msgid "Some of the checks include:"
 msgstr "Beispielsweise wird Folgendes überprüft:"
 
-#: C/jhbuild.xml:1359(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1354
 msgid "The checkout and install prefixes are writable."
 msgstr "Ob die Präfixes für Checkout und Installation schreibbar sind."
 
-#: C/jhbuild.xml:1363(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1357
 msgid "The required build tools are installed."
 msgstr "Ob die benötigten Erstellungswerkzeuge installiert sind."
 
-#: C/jhbuild.xml:1366(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1360
 msgid ""
 "Some commonly used macros are available in the search paths of the "
 "<command>aclocal</command> commands associated with the various versions of "
@@ -2086,39 +2258,51 @@ msgstr ""
 "Versionen von <command>automake</command> zugeordneten <command>aclocal</"
 "command>-Befehle vorhanden sind."
 
-#: C/jhbuild.xml:1372(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1365
 msgid "The XML catalog contains the DocBook DTD and stylesheets."
 msgstr "Ob der XML-Katalog die DocBook-DTD und die Stilvorlagen enthält."
 
-#: C/jhbuild.xml:1380(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1372
 msgid "shell"
 msgstr "shell"
 
-#: C/jhbuild.xml:1382(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1374
 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:1390(para)
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1377
+msgid "<command>jhbuild shell</command>"
+msgstr "<command>jhbuild shell</command>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:1380
 msgid "This command is equivalent to the following:"
 msgstr "Dieser Befehl entspricht dem Folgenden:"
 
-#: C/jhbuild.xml:1392(userinput)
+#. (itstool) path: section/screen
+#: C/index.docbook:1382
 #, no-wrap
-msgid "jhbuild run $SHELL"
-msgstr "jhbuild run $SHELL"
+msgid "<prompt>$</prompt> <userinput>jhbuild run $SHELL</userinput>"
+msgstr "<prompt>$</prompt> <userinput>jhbuild run $SHELL</userinput>"
 
-#: C/jhbuild.xml:1394(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1384
 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>:"
+"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:1400(screen)
+#. (itstool) path: section/screen
+#: C/index.docbook:1390
 #, no-wrap
 msgid ""
 "\n"
@@ -2133,64 +2317,167 @@ msgstr ""
 "\tfi\n"
 "      "
 
-#: C/jhbuild.xml:1406(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1396
 msgid ""
 "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:1413(title)
-msgid "tinderbox"
-msgstr "tinderbox"
+#. (itstool) path: section/title
+#: C/index.docbook:1402
+msgid "sysdeps"
+msgstr "sysdeps"
+
+#. (itstool) path: section/para
+#: C/index.docbook:1404
+msgid "The <command>sysdeps</command> command displays:"
+msgstr "Der Befehl <command>sysdeps</command> zeigt Folgendes an:"
 
-#: C/jhbuild.xml:1415(para)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1408
 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."
+"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 ""
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1413
+msgid ""
+"a list of required packages. To begin a build the packages must be provided "
+"by your system."
+msgstr ""
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1417
+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:1422(command)
-msgid "jhbuild tinderbox"
-msgstr "jhbuild tinderbox"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1425
+msgid "<command>jhbuild sysdeps</command> <arg>--install</arg>"
+msgstr "<command>jhbuild sysdeps</command> <arg>--install</arg>"
 
-#: C/jhbuild.xml:1426(replaceable)
-msgid "directory"
-msgstr "directory"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1431
+msgid "<option>--install</option>"
+msgstr "<option>--install</option>"
 
-#: C/jhbuild.xml:1426(arg)
-msgid "--output=<placeholder-1/>"
-msgstr "--output=<placeholder-1/>"
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1435
+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:1430(arg)
-msgid "-C"
-msgstr "-C"
+#. (itstool) path: example/title
+#: C/index.docbook:1449
+msgid "<command>sysdeps</command> example"
+msgstr "<command>sysdeps</command> example"
 
-#: C/jhbuild.xml:1431(arg)
-msgid "-N"
-msgstr "-N"
+#. (itstool) path: example/screen
+#: C/index.docbook:1450
+#, 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/jhbuild.xml:1432(arg)
-msgid "-f"
-msgstr "-f"
+#. (itstool) path: section/title
+#: C/index.docbook:1471
+msgid "tinderbox"
+msgstr "tinderbox"
 
-#: C/jhbuild.xml:1436(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1473
 msgid ""
-"The <option>--autogen</option>, <option>--clean</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."
+"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 ""
+
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1478
+msgid ""
+"<command>jhbuild tinderbox</command> <arg>--autogen</arg> <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>--autogen</arg> <arg>--clean</arg> "
+"<arg>--distclean</arg> <arg>--no-network</arg> <arg>--"
+"output=<replaceable>Ordner</replaceable></arg> <arg rep=\"repeat\">--"
+"skip=<replaceable>module</replaceable></arg> <arg>--start-"
+"at=<replaceable>module</replaceable></arg> <arg>-D <replaceable>Datum</"
+"replaceable></arg> <arg>-C</arg> <arg>-N</arg> <arg>-f</arg> <arg>--nodeps</"
+"arg> <arg rep=\"repeat\">Modul</arg>"
+
+#. (itstool) path: section/para
+#: C/index.docbook:1494
+msgid ""
+"The <option>--autogen</option>, <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>, <option>-f</option> and <option>--nodeps</option> "
+"options are processed as per the <link linkend=\"command-reference-build"
+"\"><command>build</command></link> command."
 msgstr ""
 "Die Optionen <option>--autogen</option>, <option>--clean</option>, <option>--"
-"no-network</option>, <option>--skip</option>, <option>--start-at</option>, "
-"<option>-D</option>, <option>-C</option> <option>-N</option> und <option>-f</"
-"option> werden ebenso wie für <link linkend=\"command-reference-build"
+"distclean</option>, <option>--no-network</option>, <option>--skip</option>, "
+"<option>--start-at</option>, <option>-D</option>, <option>-C</option> "
+"<option>-N</option> und <option>-f</option> und <option>--nodeps</option> "
+"werden ebenso wie der Befehl <link linkend=\"command-reference-build"
 "\"><command>build</command></link> verarbeitet."
 
-#: C/jhbuild.xml:1446(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1505
 msgid ""
 "<option>-o</option>, <option>--output</option>=<replaceable>directory</"
 "replaceable>"
@@ -2198,35 +2485,65 @@ msgstr ""
 "<option>-o</option>, <option>--output</option>=<replaceable>Ordner</"
 "replaceable>"
 
-#: C/jhbuild.xml:1449(simpara)
-msgid "The directory to write the HTML files."
-msgstr "Der Ordner zum Speichern der HTML-Dateien."
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1510
+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:1457(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1519
 msgid "uninstall"
 msgstr "uninstall"
 
-#: C/jhbuild.xml:1459(para)
-msgid "The <command>uninstall</command> command uninstalls one or more modules."
+#. (itstool) path: section/para
+#: C/index.docbook:1521
+msgid ""
+"The <command>uninstall</command> command uninstalls one or more modules."
 msgstr ""
-"Der Befehl <command>uninstall</command> deinstalliert ein oder mehrere Module."
+"Der Befehl <command>uninstall</command> deinstalliert ein oder mehrere "
+"Module."
 
-#: C/jhbuild.xml:1463(command)
-msgid "jhbuild uninstall"
-msgstr "jhbuild uninstall"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1524
+msgid ""
+"<command>jhbuild uninstall</command> <arg choice=\"plain\" rep=\"repeat"
+"\">module</arg>"
+msgstr ""
+"<command>jhbuild uninstall</command> <arg choice=\"plain\" rep=\"repeat"
+"\">Modul</arg>"
 
-#: C/jhbuild.xml:1470(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1530
 msgid "update"
 msgstr "update"
 
-#: C/jhbuild.xml:1472(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1532
+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 ""
+
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1536
 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."
+"<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>Modul</replaceable></arg> <arg>--start-"
+"at=<replaceable>Modul</replaceable></arg> <arg>--tags=<replaceable>Tags</"
+"replaceable></arg> <arg>--ignore-suggests</arg> <arg>-D <replaceable>Datum</"
+"replaceable></arg> <arg rep=\"repeat\">Modul</arg>"
 
-#: C/jhbuild.xml:1486(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1545
 msgid ""
 "The <option>--skip</option>, <option>--start-at</option>, <option>--tags</"
 "option>, <option>--ignore-suggests</option> and <option>-D</option> options "
@@ -2238,334 +2555,505 @@ msgstr ""
 "werden ebenso wie für <link linkend=\"command-reference-build"
 "\"><command>build</command></link> verarbeitet."
 
-#: C/jhbuild.xml:1495(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1553
 msgid "updateone"
 msgstr "updateone"
 
-#: C/jhbuild.xml:1497(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1555
 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:1502(command)
-msgid "jhbuild updateone"
-msgstr "jhbuild updateone"
+#. (itstool) path: section/cmdsynopsis
+#: C/index.docbook:1559
+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>Datum</"
+"replaceable></arg> <arg choice=\"plain\" rep=\"repeat\">Modul</arg>"
 
-#: C/jhbuild.xml:1507(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1564
 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:1518(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1573
 msgid "Configuration File Reference"
 msgstr "Referenz der Konfigurationsdatei"
 
-#: C/jhbuild.xml:1520(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1575
 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:1526(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1581
 msgid ""
 "Boolean configuration variables are set using syntax as demonstrated in the "
 "following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1528(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:1584
 #, no-wrap
 msgid "use_local_modulesets = True"
 msgstr "use_local_modulesets = True"
 
-#: C/jhbuild.xml:1530(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1586
 msgid ""
 "String configuration variables are set using syntax as demonstrated in the "
 "following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1532(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:1589
 #, no-wrap
 msgid "autogenargs = '--disable-static --disable-gtk-doc'"
 msgstr "autogenargs = '--disable-static --disable-gtk-doc'"
 
-#: C/jhbuild.xml:1534(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1591
 msgid ""
 "List configuration variables are set using syntax as demonstrated in the "
 "following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1536(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:1594
 #, no-wrap
 msgid "skip = ['mozilla', 'pulseaudio']"
 msgstr "skip = ['mozilla', 'pulseaudio']"
 
-#: C/jhbuild.xml:1538(para)
+#. (itstool) path: section/para
+#: C/index.docbook:1596
 msgid ""
 "Dictionary configuration variables are set using syntax as demonstrated in "
 "the following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1540(programlisting) C/jhbuild.xml:1968(programlisting)
+#. (itstool) path: section/programlisting
+#. (itstool) path: listitem/programlisting
+#: C/index.docbook:1599 C/index.docbook:2221
 #, no-wrap
 msgid "repos['git.gnome.org'] = 'ssh://username git gnome org/git/'"
 msgstr "repos['git.gnome.org'] = 'ssh://username git gnome org/git/'"
 
-#: C/jhbuild.xml:1543(title)
+#. (itstool) path: section/title
+#: C/index.docbook:1602
 msgid "Configuration Variables"
 msgstr "Konfigurationsvariablen"
 
-#: C/jhbuild.xml:1548(varname)
-msgid "alwaysautogen"
-msgstr "alwaysautogen"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1607
+msgid "<varname>alwaysautogen</varname>"
+msgstr "<varname>alwaysautogen</varname>"
 
-#: C/jhbuild.xml:1550(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1611
 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>."
+"<command>autogen.sh</command>. This is equivalent to passing <option>--"
+"autogen</option> option to JHBuild. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1561(simpara)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1618
+msgid "<varname>autogenargs</varname>"
+msgstr "<varname>autogenargs</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1622
 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:1569(varname)
-msgid "branches"
-msgstr "branches"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1629
+msgid "<varname>branches</varname>"
+msgstr "<varname>branches</varname>"
 
-#: C/jhbuild.xml:1571(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1633
 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:1576(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1638
 msgid "The definition of branches depends on the module VCS:"
 msgstr ""
-"Die Definition der Zweige hängt von der Art der Versionsverwaltung des Moduls "
-"ab:"
+"Die Definition der Zweige hängt von der Art der Versionsverwaltung des "
+"Moduls ab:"
 
-#: C/jhbuild.xml:1579(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1643
 msgid "CVS: revision. E.g. <literal>'BRANCH-PROJECT-0_8'</literal>"
 msgstr "CVS: Revision. Beispielsweise <literal>'BRANCH-PROJECT-0_8'</literal>"
 
-#: C/jhbuild.xml:1582(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1647
 msgid ""
 "Bazaar: URI of module branch. E.g. <literal>'http://bzr.example.net/project/";
 "gnome-2-28'</literal>"
 msgstr ""
-"Bazaar: Adresse des Modulzweiges. Beispielsweise <literal>'http://bzr.example.";
-"net/project/gnome-2-28'</literal>"
+"Bazaar: Adresse des Modulzweiges. Beispielsweise <literal>'http://bzr.";
+"example.net/project/gnome-2-28'</literal>"
 
-#: C/jhbuild.xml:1585(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1652
 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>"
+"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:1590(simpara)
+#. (itstool) path: example/title
+#: C/index.docbook:1658
+msgid "Simple example"
+msgstr "Einfaches Beispiel"
+
+#. (itstool) path: example/programlisting
+#: C/index.docbook:1659
+#, no-wrap
+msgid "branches['modulename'] = (None, 'branchname')"
+msgstr "branches['modulename'] = (None, 'branchname')"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1663
 msgid ""
-"Subversion: URI of module branch E.g. <literal>'svn://svn.example.net/project/"
-"gnome-2-28'</literal>"
+"Subversion: URI of module branch E.g. <literal>'svn://svn.example.net/"
+"project/gnome-2-28'</literal>"
 msgstr ""
 "Subversion: Adresse des Modulzweiges. Beispielsweise <literal>'svn://svn."
 "example.net/project/gnome-2-28'</literal>"
 
-#: C/jhbuild.xml:1597(varname)
-msgid "builddir_pattern"
-msgstr "builddir_pattern"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1671
+msgid "<varname>builddir_pattern</varname>"
+msgstr "<varname>builddir_pattern</varname>"
 
-#: C/jhbuild.xml:1599(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1675
 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>."
+"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 <varname>checkoutdir</varname>. Defaults to <literal>'%s'</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1608(varname)
-msgid "buildroot"
-msgstr "buildroot"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1684
+msgid "<varname>buildroot</varname>"
+msgstr "<varname>buildroot</varname>"
 
-#: C/jhbuild.xml:1610(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1688
 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:1617(varname)
-msgid "buildscript"
-msgstr "buildscript"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1694
+msgid "<varname>buildscript</varname>"
+msgstr "<varname>buildscript</varname>"
 
-#: C/jhbuild.xml:1619(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1698
 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:1626(varname)
-msgid "build_policy"
-msgstr "build_policy"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1704
+msgid "<varname>build_policy</varname>"
+msgstr "<varname>build_policy</varname>"
 
-#: C/jhbuild.xml:1628(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1708
 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>."
+"literal> to build modules which have changed or which have dependencies "
+"which have changed. Defaults to <literal>updated-deps</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1640(simpara)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1717
+msgid "<varname>checkoutroot</varname>"
+msgstr "<varname>checkoutroot</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1721
 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/gnome</filename>."
+"<varname>buildroot</varname> is set, builds will occur in this directory "
+"too. Defaults to <filename>~/checkout/gnome</filename>."
 msgstr ""
 
-#: C/jhbuild.xml:1647(varname)
-msgid "checkout_mode"
-msgstr "checkout_mode"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1728
+msgid "<varname>checkout_mode</varname>"
+msgstr "<varname>checkout_mode</varname>"
 
-#: C/jhbuild.xml:1649(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1732
 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 "
 "using <varname>module_checkout_mode</varname>. Possible values are "
 "<literal>update</literal> (update checkout directory), <literal>clobber</"
 "literal> (wipe out directory before checking out the sources), "
-"<literal>export</literal> (wipe out directory then create an unversioned copy "
-"of the sources) and <literal>copy</literal> (checkout in a directory "
+"<literal>export</literal> (wipe out directory then create an unversioned "
+"copy of the sources) and <literal>copy</literal> (checkout in a directory "
 "different from the one it will build)."
 msgstr ""
 
-#: C/jhbuild.xml:1663(varname)
-msgid "copy_dir"
-msgstr "copy_dir"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1745
+msgid "<varname>copy_dir</varname>"
+msgstr "<varname>copy_dir</varname>"
 
-#: C/jhbuild.xml:1665(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1749
 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. Defaults "
-"to the checkout directory."
+"A string specifying the directory to copy to, if the copy <link linkend="
+"\"cfg-checkout-mode\"> <varname>checkout_mode</varname></link> is in use. "
+"Defaults to the checkout directory."
 msgstr ""
 
-#: C/jhbuild.xml:1672(varname)
-msgid "cvs_program"
-msgstr "cvs_program"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1756
+msgid "<varname>cvs_program</varname>"
+msgstr "<varname>cvs_program</varname>"
 
-#: C/jhbuild.xml:1674(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1760
 msgid ""
 "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:1681(varname)
-msgid "installprog"
-msgstr "installprog"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1767
+msgid "<varname>disable_Werror</varname>"
+msgstr "<varname>disable_Werror</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1771
+msgid ""
+"A boolean value (default <literal>True</literal>) which controls if "
+"<literal>--disable-Werror</literal> will be passed to automake builds. Many "
+"packages use this flag as a way to disable fatal compiler warnings. The "
+"value of <literal>True</literal> is selected as a reasonable default for "
+"those using jhbuild as a means to get an up-to-date version of software "
+"packages without being side-tracked by build failures in other people's "
+"modules. Settings this value to <literal>False</literal> may make sense for "
+"those using jhbuild as part of a continuous integration or testing system."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1783
+msgid "<varname>dvcs_mirror_dir</varname>"
+msgstr "<varname>dvcs_mirror_dir</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1787
+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 ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1798
+msgid "<varname>exit_on_error</varname>"
+msgstr "<varname>exit_on_error</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1802
+msgid ""
+"A boolean value specifying whether to exit immediately when a module fails "
+"to build. This is primarily useful in noninteractive mode, in order to "
+"prevent additional modules from building after one fails. Setting this value "
+"to <constant>True</constant> is equivalent to passing the <option>--exit-on-"
+"error</option> option. Defaults to <constant>False</constant>."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1811
+msgid "<varname>extra_prefixes</varname>"
+msgstr "<varname>extra_prefixes</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1815
+msgid ""
+"A list of strings specifying, in precedence order, the list of extra "
+"prefixes. JHBuild sets many environment variables (such as "
+"<envar>LD_LIBRARY_PATH</envar>, <envar>PKG_CONFIG_PATH</envar> and "
+"<envar>XDG_DATA_DIRS</envar>) based on the <varname>prefix</varname> "
+"variable. Adding directories to <varname>extra_prefixes</varname> will cause "
+"these prefixes to be included as well, at a lower precedence than the "
+"JHBuild <varname>prefix</varname>, but at a higher precedence than system "
+"directories. This variable is empty by default except on systems that "
+"install software in <filename>/usr/local</filename>, in which case it "
+"contains this directory."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1830
+msgid "<varname>help_website</varname>"
+msgstr "<varname>help_website</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1834
+msgid ""
+"A tuple specifying a help website name and URL. The website is displayed in "
+"the tinderbox html for failed modules. <varname>%(module)s</varname> in the "
+"URL will be replaced with the module name. To disable, set "
+"<varname>help_website</varname> to <literal>None</literal>. Defaults to "
+"<literal>('Gnome Live!', 'http://live.gnome.org/JhbuildIssues/%(module)s')</"
+"literal>."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1844
+msgid "<varname>installprog</varname>"
+msgstr "<varname>installprog</varname>"
 
-#: C/jhbuild.xml:1683(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1848
 msgid ""
 "A string specifying a program to use as replacement for <literal>/usr/bin/"
-"install</literal>. If available, defaults to the <literal>install-check</"
-"literal> wrapper provided by JHBuild. The <literal>install-check</literal> "
-"wrapper optimizes header installation to reduce the time taken for rebuilds."
+"install</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1693(varname)
-msgid "ignore_suggests"
-msgstr "ignore_suggests"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1853
+msgid "<varname>ignore_suggests</varname>"
+msgstr "<varname>ignore_suggests</varname>"
 
-#: C/jhbuild.xml:1695(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1857
 msgid ""
 "A boolean value specifying whether to ignore soft dependencies when "
 "calculating the dependency tree. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1701(varname)
-msgid "interact"
-msgstr "interact"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1863
+msgid "<varname>interact</varname>"
+msgstr "<varname>interact</varname>"
 
-#: C/jhbuild.xml:1703(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1867
 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>."
+"value to <constant>False</constant> is equivalent to passing the <option>--"
+"no-interact</option> option. Defaults to <constant>True</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1719(varname)
-msgid "makecheck"
-msgstr "makecheck"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1874
+msgid "<varname>makeargs</varname>"
+msgstr "<varname>makeargs</varname>"
 
-#: C/jhbuild.xml:1721(simpara)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1885
+msgid "<varname>makecheck</varname>"
+msgstr "<varname>makecheck</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1889
 msgid ""
-"A boolean value specifying whether to run <command>make check</command> after "
-"<command>make</command>. Defaults to <constant>False</constant>."
+"A boolean value specifying whether to run <command>make check</command> "
+"after <command>make</command>. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1728(varname)
-msgid "makecheck_advisory"
-msgstr "makecheck_advisory"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1895
+msgid "<varname>makecheck_advisory</varname>"
+msgstr "<varname>makecheck_advisory</varname>"
 
-#: C/jhbuild.xml:1730(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1899
 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>."
+"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:1736(varname)
-msgid "makeclean"
-msgstr "makeclean"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1906
+msgid "<varname>makeclean</varname>"
+msgstr "<varname>makeclean</varname>"
 
-#: C/jhbuild.xml:1738(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1910
 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:1745(varname)
-msgid "makedist"
-msgstr "makedist"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1916
+msgid "<varname>makedist</varname>"
+msgstr "<varname>makedist</varname>"
 
-#: C/jhbuild.xml:1747(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1920
 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."
+"<command>make</command>. Defaults to <constant>False</constant>. This "
+"setting is equivalent to passing the <option>--dist</option> option."
 msgstr ""
 
-#: C/jhbuild.xml:1755(varname)
-msgid "makedistcheck"
-msgstr "makedistcheck"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1927
+msgid "<varname>makedistcheck</varname>"
+msgstr "<varname>makedistcheck</varname>"
 
-#: C/jhbuild.xml:1757(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1931
 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:1765(varname)
-msgid "module_autogenargs"
-msgstr "module_autogenargs"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1938
+msgid "<varname>module_autogenargs</varname>"
+msgstr "<varname>module_autogenargs</varname>"
 
-#: C/jhbuild.xml:1767(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1942
 msgid ""
 "A dictionary mapping module names to strings specifying the arguments to be "
 "passed to <command>autogen.sh</command>. The setting in "
@@ -2574,92 +3062,146 @@ msgid ""
 "in the dictionary, the global <varname>autogenargs</varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1777(varname)
-msgid "module_checkout_mode"
-msgstr "module_checkout_mode"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1951
+msgid "<varname>module_checkout_mode</varname>"
+msgstr "<varname>module_checkout_mode</varname>"
 
-#: C/jhbuild.xml:1779(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1955
 msgid ""
 "A dictionary specifying which checkout mode to use for modules. This "
 "overrides the global <varname>checkout_mode</varname> setting."
 msgstr ""
 
-#: C/jhbuild.xml:1785(varname)
-msgid "module_makeargs"
-msgstr "module_makeargs"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1961
+msgid "<varname>module_makeargs</varname>"
+msgstr "<varname>module_makeargs</varname>"
 
-#: C/jhbuild.xml:1787(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1965
 msgid ""
-"A dictionary mapping module names to strings specifying the arguments to pass "
-"to <command>make</command>. The setting in <varname>module_makeargs</varname> "
-"replaces the value of <varname>makeargs</varname>. If a particular module "
-"isn't listed in the dictionary, the global <varname>makeargs</varname> will "
-"be used."
+"A dictionary mapping module names to strings specifying the arguments to "
+"pass to <command>make</command>. The setting in <varname>module_makeargs</"
+"varname> replaces the value of <varname>makeargs</varname>. If a particular "
+"module isn't listed in the dictionary, the global <varname>makeargs</"
+"varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1797(varname)
-msgid "module_makecheck"
-msgstr "module_makecheck"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1974
+msgid "<varname>module_makecheck</varname>"
+msgstr "<varname>module_makecheck</varname>"
 
-#: C/jhbuild.xml:1799(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1978
 msgid ""
-"A dictionary mapping module names to boolean values specifying whether to run "
-"<command>make check</command> after <command>make</command>. The setting in "
-"<varname>module_makecheck</varname> replaces the value of <varname>makecheck</"
-"varname>. If a particular module isn't listed in the dictionary, the global "
-"<varname>makecheck</varname> will be used."
+"A dictionary mapping module names to boolean values specifying whether to "
+"run <command>make check</command> after <command>make</command>. The setting "
+"in <varname>module_makecheck</varname> replaces the value of "
+"<varname>makecheck</varname>. If a particular module isn't listed in the "
+"dictionary, the global <varname>makecheck</varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1810(varname)
-msgid "module_nopoison"
-msgstr "module_nopoison"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:1988
+msgid "<varname>module_nopoison</varname>"
+msgstr "<varname>module_nopoison</varname>"
 
-#: C/jhbuild.xml:1812(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:1992
 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 "
-"even if the specified module failed. The setting in <varname>module_nopoison</"
-"varname> replaces the value of <varname>nopoison</varname>. If a particular "
-"module isn't listed in the dictionary, the global <varname>nopoison</varname> "
-"will be used."
+"even if the specified module failed. The setting in "
+"<varname>module_nopoison</varname> replaces the value of <varname>nopoison</"
+"varname>. If a particular module isn't listed in the dictionary, the global "
+"<varname>nopoison</varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1823(varname)
-msgid "module_extra_env"
-msgstr "module_extra_env"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2002
+msgid "<varname>module_extra_env</varname>"
+msgstr "<varname>module_extra_env</varname>"
 
-#: C/jhbuild.xml:1825(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2006
 msgid ""
 "A dictionary mapping module names to dictionaries with extra environment "
 "variables to pass when executing commands for the module."
 msgstr ""
 
-#: C/jhbuild.xml:1857(varname)
-msgid "modulesets_dir"
-msgstr "modulesets_dir"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2012
+msgid "<varname>module_static_analyzer</varname>"
+msgstr "<varname>module_static_analyzer</varname>"
 
-#: C/jhbuild.xml:1859(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2016
+msgid ""
+"Dictionary mapping module names to boolean values indicating whether static "
+"analysis should be performed while building that module. This allows the "
+"global <varname>static_analyzer</varname> configuration option to be "
+"overridden."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2024
+msgid "<varname>modules</varname>"
+msgstr "<varname>modules</varname>"
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2037
+msgid "<varname>moduleset</varname>"
+msgstr "<varname>moduleset</varname>"
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2052
+msgid "<varname>modulesets_dir</varname>"
+msgstr "<varname>modulesets_dir</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2056
 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:1866(varname)
-msgid "nobuild"
-msgstr "nobuild"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2063
+msgid "<varname>nice_build</varname>"
+msgstr "<varname>nice_build</varname>"
 
-#: C/jhbuild.xml:1868(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2067
+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 ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2075
+msgid "<varname>nobuild</varname>"
+msgstr "<varname>nobuild</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2079
 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:1875(varname)
-msgid "nonetwork"
-msgstr "nonetwork"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2085
+msgid "<varname>nonetwork</varname>"
+msgstr "<varname>nonetwork</varname>"
 
-#: C/jhbuild.xml:1877(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2089
 msgid ""
 "A boolean value specifying whether to access the network. This affects "
 "checking out or updating CVS modules, downloading tarballs and updating "
@@ -2668,23 +3210,26 @@ msgid ""
 "<constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1886(varname)
-msgid "nonotify"
-msgstr "nonotify"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2098
+msgid "<varname>nonotify</varname>"
+msgstr "<varname>nonotify</varname>"
 
-#: C/jhbuild.xml:1888(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2102
 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:1896(varname)
-msgid "nopoison"
-msgstr "nopoison"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2109
+msgid "<varname>nopoison</varname>"
+msgstr "<varname>nopoison</varname>"
 
-#: C/jhbuild.xml:1898(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2113
 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 "
@@ -2692,23 +3237,26 @@ msgid ""
 "argument. The default value is <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1906(varname)
-msgid "notrayicon"
-msgstr "notrayicon"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2121
+msgid "<varname>notrayicon</varname>"
+msgstr "<varname>notrayicon</varname>"
 
-#: C/jhbuild.xml:1908(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2125
 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:1916(varname)
-msgid "noxvfb"
-msgstr "noxvfb"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2132
+msgid "<varname>noxvfb</varname>"
+msgstr "<varname>noxvfb</varname>"
 
-#: C/jhbuild.xml:1918(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2136
 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</"
@@ -2716,39 +3264,83 @@ msgid ""
 "The default value is <constant>False</constant>"
 msgstr ""
 
-#: C/jhbuild.xml:1934(varname)
-msgid "pretty_print"
-msgstr "pretty_print"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2144
+msgid "<varname>partial_build</varname>"
+msgstr "<varname>partial_build</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2148
+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 ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2155
+msgid "<varname>prefix</varname>"
+msgstr "<varname>prefix</varname>"
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2166
+msgid "<varname>pretty_print</varname>"
+msgstr "<varname>pretty_print</varname>"
 
-#: C/jhbuild.xml:1936(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2170
 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:1943(varname)
-msgid "progress_bar"
-msgstr "progress_bar"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2177
+msgid "<varname>print_command_pattern</varname>"
+msgstr "<varname>print_command_pattern</varname>"
 
-#: C/jhbuild.xml:1945(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2181
+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 ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2189
+msgid "<varname>progress_bar</varname>"
+msgstr "<varname>progress_bar</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2193
 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:1951(varname)
-msgid "quiet_mode"
-msgstr "quiet_mode"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2199
+msgid "<varname>quiet_mode</varname>"
+msgstr "<varname>quiet_mode</varname>"
 
-#: C/jhbuild.xml:1953(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2203
 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:1961(simpara)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2209
+msgid "<varname>repos</varname>"
+msgstr "<varname>repos</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2213
 msgid ""
 "A dictionary specifying an alternative repository location for a particular "
 "repository. This configuration variable is useful to a module developer. By "
@@ -2757,57 +3349,130 @@ msgid ""
 "values are the alternative repository location strings. For example:"
 msgstr ""
 
-#: C/jhbuild.xml:1972(varname)
-msgid "skip"
-msgstr "skip"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2225
+msgid "<varname>skip</varname>"
+msgstr "<varname>skip</varname>"
 
-#: C/jhbuild.xml:1974(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2229
 msgid ""
 "A list of modules to skip. This <option>--skip</option> command line option "
-"extends the list. This list is empty by default."
+"extends the list. This list is empty by default. If the list contains the "
+"special value <literal>'*'</literal>, JHBuild will skip all modules not "
+"explicitly listed in the <varname>modules</varname> variable. This may be "
+"useful if you want to build modules without their implicit dependencies."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2239
+msgid "<varname>static_analyzer</varname>"
+msgstr "<varname>static_analyzer</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2243
+msgid ""
+"A boolean value: if set to <constant>True</constant>, run a static analysis "
+"tool on each module as it’s being built. Defaults to <constant>False</"
+"constant>."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2249
+msgid "<varname>static_analyzer_outputdir</varname>"
+msgstr "<varname>static_analyzer_outputdir</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2253
+msgid ""
+"Root directory below which static analysis reports will be saved (if "
+"<varname>static_analyzer</varname> is <constant>True</constant>). Defaults "
+"to <filename>/tmp/jhbuild_static_analyzer</filename>."
+msgstr ""
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2260
+msgid "<varname>static_analyzer_template</varname>"
+msgstr "<varname>static_analyzer_template</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2264
+msgid ""
+"Command template for the static analyzer. This has the parameters "
+"<varname>outputdir</varname> (the value of the "
+"<varname>static_analyzer_outputdir</varname> configuration variable) and "
+"<varname>module</varname> (the name of the module currently being built) "
+"substituted into it <function>printf</function>-style. The resulting command "
+"is used as a prefix to <command>make</command> when building a module. "
+"Defaults to <command>scan-build</command>."
 msgstr ""
 
-#: C/jhbuild.xml:1980(varname)
-msgid "sticky_date"
-msgstr "sticky_date"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2275
+msgid "<varname>sticky_date</varname>"
+msgstr "<varname>sticky_date</varname>"
 
-#: C/jhbuild.xml:1982(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2279
 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. An "
-"ISO date format is required, e.g. <literal>'<replaceable>yyyy</replaceable>-"
-"<replaceable>mm</replaceable>-<replaceable>dd</replaceable>'</literal>. "
-"Defaults to <constant>None</constant>."
+"JHBuild will update the source tree to the specified date before building. "
+"An ISO date format is required, e.g. <literal>'<replaceable>yyyy</"
+"replaceable>-<replaceable>mm</replaceable>-<replaceable>dd</replaceable>'</"
+"literal>. Defaults to <constant>None</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1991(varname)
-msgid "svn_program"
-msgstr "svn_program"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2288
+msgid "<varname>svn_program</varname>"
+msgstr "<varname>svn_program</varname>"
 
-#: C/jhbuild.xml:1993(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2292
 msgid ""
 "A string specifying which program to use for subversion support. This can be "
-"<literal>svn</literal>, <literal>git-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 ""
+"A string specifying which program to use for subversion support. This can be "
+"<literal>svn</literal>, <literal>git-svn</literal> or <literal>bzr</"
+"literal>. Defaults to <literal>svn</literal>."
+
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2299
+msgid "<varname>system_libdirs</varname>"
+msgstr "<varname>system_libdirs</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2303
+msgid ""
+"A list of strings specifying the system library paths. This is used when "
+"setting the default values of some environment variables, such as "
+"<envar>PKG_CONFIG_PATH</envar>."
 msgstr ""
 
-#: C/jhbuild.xml:2000(varname)
-msgid "tarballdir"
-msgstr "tarballdir"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2309
+msgid "<varname>tarballdir</varname>"
+msgstr "<varname>tarballdir</varname>"
 
-#: C/jhbuild.xml:2002(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2313
 msgid ""
 "A string if set, tarballs will be downloaded to the specified directory "
 "instead of <varname>checkoutroot</varname>. This is useful if you have "
 "multiple JHBuild environments or regularly clear out <varname>checkoutroot</"
-"varname> and want to reduce bandwidth usage."
+"varname> and want to reduce bandwidth usage. Defaults to <literal>'~/.cache/"
+"jhbuild/downloads'</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:2010(varname)
-msgid "tinderbox_outputdir"
-msgstr "tinderbox_outputdir"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2322
+msgid "<varname>tinderbox_outputdir</varname>"
+msgstr "<varname>tinderbox_outputdir</varname>"
 
-#: C/jhbuild.xml:2012(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2326
 msgid ""
 "A string specifying the directory to store <command>jhbuild tinderbox</"
 "command> output. This string can be overridden by the <option>--output</"
@@ -2816,11 +3481,13 @@ msgid ""
 "file."
 msgstr ""
 
-#: C/jhbuild.xml:2021(varname)
-msgid "trycheckout"
-msgstr "trycheckout"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2335
+msgid "<varname>trycheckout</varname>"
+msgstr "<varname>trycheckout</varname>"
 
-#: C/jhbuild.xml:2023(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2339
 msgid ""
 "A boolean value, if set to <constant>True</constant> JHBuild will "
 "automatically try to solve failures by 1) running <command>autogen.sh</"
@@ -2829,101 +3496,121 @@ msgid ""
 "option> option."
 msgstr ""
 
-#: C/jhbuild.xml:2032(varname)
-msgid "use_lib64"
-msgstr "use_lib64"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2348
+msgid "<varname>use_local_modulesets</varname>"
+msgstr "<varname>use_local_modulesets</varname>"
 
-#: C/jhbuild.xml:2034(simpara)
-msgid ""
-"A boolean value that specifies whether to install libraries to "
-"<filename>lib64</filename> directories. If set, <literal>--libdir=\\"
-"${exec_prefix}/lib64</literal> will be passed to configure. Defaults to "
-"<constant>True</constant> if running on <literal>x86_64</literal>, "
-"<literal>ppc64</literal> or <literal>s390x</literal> Linux, and "
-"<constant>False</constant> on other systems."
-msgstr ""
-
-#: C/jhbuild.xml:2045(varname)
-msgid "use_local_modulesets"
-msgstr "use_local_modulesets"
-
-#: C/jhbuild.xml:2047(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2352
 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:2055(varname)
-msgid "xvfbargs"
-msgstr "xvfbargs"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2359
+msgid "<varname>xvfbargs</varname>"
+msgstr "<varname>xvfbargs</varname>"
 
-#: C/jhbuild.xml:2057(simpara)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2363
 msgid ""
 "A string listing arguments to pass to <command>Xvfb</command> if running "
 "graphical tests."
 msgstr ""
 
-#: C/jhbuild.xml:2065(title)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2368
+msgid "<varname>conditions</varname>"
+msgstr "<varname>conditions</varname>"
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2372
+msgid ""
+"A set of condition (strings) that can influence the modules that are built "
+"and the options that are used for building them. You should use "
+"<literal>conditions.add()</literal> and <literal>conditions.discard()</"
+"literal> to modify the list if you want to make changes."
+msgstr ""
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:2375
+msgid ""
+"The original set of conditions is determined on a per-OS basis and can be "
+"modified using the --conditions= commandline argument. The changes made by --"
+"conditions are visible at the time that jhbuildrc is sourced, so you can set "
+"other variables based on the current value of the set, but --conditions will "
+"be applied again after any changes made by jhbuildrc."
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.docbook:2385
 msgid "Other Configuration File Structures"
 msgstr "Weitere Strukturen der Konfigurationsdatei"
 
-#: C/jhbuild.xml:2067(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2387
 msgid ""
 "In addition to the above variables, there are other settings that can be set "
 "in the configuration file:"
 msgstr ""
 
-#: C/jhbuild.xml:2072(varname)
-msgid "os.environ"
-msgstr "os.environ"
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2392
+msgid "<varname>os.environ</varname>"
+msgstr "<varname>os.environ</varname>"
 
-#: C/jhbuild.xml:2074(para)
+#. (itstool) path: listitem/para
+#: C/index.docbook:2396
 msgid ""
 "A dictionary representing the environment. This environment is passed to "
 "processes that JHBuild spawns."
 msgstr ""
 
-#: C/jhbuild.xml:2076(para)
+#. (itstool) path: listitem/para
+#: C/index.docbook:2399
 msgid ""
 "Some influential environment variables include <envar>CPPFLAGS</envar>, "
-"<envar>CFLAGS</envar>, <envar>INSTALL</envar> and <envar>LDFLAGS</envar>. For "
-"example:"
+"<envar>CFLAGS</envar>, <envar>INSTALL</envar> and <envar>LDFLAGS</envar>. "
+"For example:"
 msgstr ""
 
-#: C/jhbuild.xml:2080(programlisting)
+#. (itstool) path: listitem/programlisting
+#: C/index.docbook:2404
 #, no-wrap
 msgid "os.environ['CFLAGS'] = '-O0 -g'"
 msgstr "os.environ['CFLAGS'] = '-O0 -g'"
 
-#: C/jhbuild.xml:2084(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2408
 msgid ""
 "<function>addpath</function>(<parameter>envvar</parameter>, "
 "<parameter>pathname</parameter>)"
 msgstr ""
 
-#: C/jhbuild.xml:2087(para)
+#. (itstool) path: listitem/para
+#: C/index.docbook:2413
 msgid ""
 "This will add a directory to the <envar>PATH</envar> environment variable. "
 "<function>addpath</function> will correctly handle the case when the "
 "environment variable is initially empty (having a stray colon at the "
-"beginning or end of an environment variable can have unexpected consequences)."
-msgstr ""
-
-#: C/jhbuild.xml:2093(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>."
+"beginning or end of an environment variable can have unexpected "
+"consequences)."
 msgstr ""
 
-#: C/jhbuild.xml:2100(term)
+#. (itstool) path: varlistentry/term
+#: C/index.docbook:2421
 msgid ""
 "<function>prependpath</function>(<parameter>envvar</parameter>, "
 "<parameter>pathname</parameter>)"
 msgstr ""
+"<function>prependpath</function>(<parameter>envvar</parameter>, "
+"<parameter>pathname</parameter>)"
 
-#: C/jhbuild.xml:2103(para)
+#. (itstool) path: listitem/para
+#: C/index.docbook:2426
 msgid ""
 "After processing the configuration file, JHBuild will alter some paths based "
 "on variables such as <varname>prefix</varname> (e.g. adding <literal>$prefix/"
@@ -2933,18 +3620,21 @@ msgstr ""
 "Variablen wie <varname>prefix</varname>, zum Beispiel durch Einfügen von "
 "<literal>$prefix/bin</literal> am Beginn der Variable <envar>PATH</envar>."
 
-#: C/jhbuild.xml:2108(para)
+#. (itstool) path: listitem/para
+#: C/index.docbook:2431
 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."
+"function>, except that the environment variable is modified after JHBuild "
+"has made its changes to the environment."
 msgstr ""
 
-#: C/jhbuild.xml:2119(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2442
 msgid "Module Set File Syntax"
 msgstr "Die Syntax der Modulsatz-Datei"
 
-#: C/jhbuild.xml:2121(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2444
 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 "
@@ -2952,7 +3642,8 @@ msgid ""
 "to edit module set files using <literal>nxml-mode</literal> in Emacs."
 msgstr ""
 
-#: C/jhbuild.xml:2127(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2450
 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 "
@@ -2960,21 +3651,36 @@ msgid ""
 "module definitions."
 msgstr ""
 
-#: C/jhbuild.xml:2133(title) C/jhbuild.xml:2889(title)
+#. (itstool) path: section/para
+#: C/index.docbook:2455
+msgid ""
+"Content in the moduleset file can be conditionally included by use of the "
+"&lt;if&gt; tag to surround the conditional content. It is currently only "
+"possible to predicate the inclusion on whether a particular condition flag "
+"is set or not, using &lt;if condition-set='cond'&gt; or &lt;if condition-"
+"unset='cond'&gt;. Conditions are set by default on a per-OS basis but can be "
+"influenced by way of the <varname>conditions</varname> variable in jhbuildrc "
+"or the <command>--conditions=</command> commandline argument."
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.docbook:2463 C/index.docbook:3293
 msgid "Module Sources"
 msgstr "Modulquellen"
 
-#: C/jhbuild.xml:2135(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2465
 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 "
 "module definitions. As well as reducing the amount of redundant information "
 "in the module set, it makes it easy for a user to specify an alternative "
-"source for those modules (for CVS and Subversion, it is common for developers "
-"and users to use different repository access methods)."
+"source for those modules (for CVS and Subversion, it is common for "
+"developers and users to use different repository access methods)."
 msgstr ""
 
-#: C/jhbuild.xml:2144(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2473
 msgid ""
 "The <sgmltag class=\"element\">repository</sgmltag> element is used to "
 "describe all types of repository. The <sgmltag class=\"element\">branch</"
@@ -2982,7 +3688,8 @@ msgid ""
 "settings."
 msgstr ""
 
-#: C/jhbuild.xml:2149(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2478
 #, no-wrap
 msgid ""
 "\n"
@@ -3017,44 +3724,50 @@ msgstr ""
 "  [ tags-template=\"<replaceable>tags-template</replaceable>\" ]\n"
 "  [ developer-href-example=\"<replaceable>developer-href-example</replaceable>\" ] /&gt;\n"
 
-#: C/jhbuild.xml:2166(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2495
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute is a unique "
 "identifier for the repository."
 msgstr ""
 
-#: C/jhbuild.xml:2169(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2498
 msgid ""
 "The <sgmltag class=\"attribute\">default</sgmltag> attribute specifies "
 "whether this repository is the default source for this module set."
 msgstr ""
 
-#: C/jhbuild.xml:2173(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2502
 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>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 in the repository type sub-sections."
+"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 in the repository type sub-sections."
 msgstr ""
 
-#: C/jhbuild.xml:2184(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2514
 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:2188(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2518
 msgid ""
-"The <sgmltag class=\"element\">branch</sgmltag> element is used inside module "
-"definitions."
+"The <sgmltag class=\"element\">branch</sgmltag> element is used inside "
+"module definitions."
 msgstr ""
 
-#: C/jhbuild.xml:2191(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2521
 #, no-wrap
 msgid ""
 "\n"
@@ -3089,78 +3802,53 @@ msgstr ""
 "  [ source-subdir=\"<replaceable>source-subdir</replaceable>\" ]\n"
 "  [ hash=\"<replaceable>hash</replaceable>\" ]/&gt;\n"
 
-#: C/jhbuild.xml:2208(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2538
 msgid ""
-"All atributes have sensible defaults and depend on the module and repository "
-"definitions. Common attributes are described here."
+"All attributes have sensible defaults and depend on the module and "
+"repository definitions. Common attributes are described here."
 msgstr ""
 
-#: C/jhbuild.xml:2211(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2541
 msgid ""
 "The <sgmltag class=\"attribute\">repo</sgmltag> attribute is used to specify "
 "non-default repository name."
 msgstr ""
 
-#: C/jhbuild.xml:2214(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2544
 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:2218(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2548
 msgid ""
 "The <sgmltag class=\"attribute\">checkoutdir</sgmltag> attribute is used to "
 "specify the checkout directory name. Defaults to module id."
 msgstr ""
 
-#: C/jhbuild.xml:2221(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2552
 msgid "Other attributes are described below"
 msgstr ""
 
-#: C/jhbuild.xml:2224(title)
-msgid "Arch"
-msgstr "Arch"
-
-#: C/jhbuild.xml:2226(para)
-msgid "This repository type is used to define a Arch repository."
-msgstr ""
-
-#: C/jhbuild.xml:2228(para)
-msgid ""
-"The <sgmltag class=\"attribute\">archive</sgmltag> attribute is used to "
-"specify the archive to use."
-msgstr ""
-
-#: C/jhbuild.xml:2231(para)
-msgid ""
-"The <sgmltag class=\"attribute\">href</sgmltag> attribute is used to specify "
-"the URL of the repository."
-msgstr ""
-
-#: C/jhbuild.xml:2234(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";
-msgstr ""
-"\n"
-"&lt;repository type=\"arch\" name=\"rhythmbox\"\n"
-"    archive=\"rhythmbox-devel gnome org--2004\"\n"
-"    href=\"http://web.rhythmbox.org/arch/2004\"/&gt;\n";
-
-#: C/jhbuild.xml:2243(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2555
 msgid "Bazaar"
 msgstr "Bazaar"
 
-#: C/jhbuild.xml:2244(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2557
 msgid ""
-"This repository type is used to define a Bazaar repository. It is recommended "
-"to have Bazaar 1.16 or higher."
+"This repository type is used to define a Bazaar repository. It is "
+"recommended to have Bazaar 1.16 or higher."
 msgstr ""
 
-#: C/jhbuild.xml:2247(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2560
 #, no-wrap
 msgid ""
 "\n"
@@ -3173,7 +3861,8 @@ msgstr ""
 "      href=\"lp:\"/&gt;\n"
 "        "
 
-#: C/jhbuild.xml:2252(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2565
 msgid ""
 "Additional attributes are: <sgmltag class=\"attribute\">trunk-template</"
 "sgmltag> (defaults to <literal>\"%(module)s\"</literal>) and <sgmltag class="
@@ -3182,30 +3871,33 @@ msgid ""
 "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 "
+"values will be substituted 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."
+"can override repository to build modules from your personal branch or build "
+"many modules from a repository with non-standard layout."
 msgstr ""
 
-#: C/jhbuild.xml:2267(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2581
 msgid ""
 "An addition <sgmltag class=\"element\">branch</sgmltag> element accepts "
-"<sgmltag class=\"attribute\">revspec</sgmltag> attibute to anchor on a "
+"<sgmltag class=\"attribute\">revspec</sgmltag> attribute 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:2276(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2589
 msgid ""
 "For example repository with <sgmltag class=\"attribute\">template</sgmltag> "
 "attributes defined:"
 msgstr ""
 
-#: C/jhbuild.xml:2279(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2593
 #, no-wrap
 msgid ""
 "\n"
@@ -3222,13 +3914,15 @@ msgstr ""
 "      branches-template=\"~bzr-pqm/%(module)s/%(branch)s\"/&gt;\n"
 "        "
 
-#: C/jhbuild.xml:2286(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2600
 msgid ""
 "Example <sgmltag class=\"element\">branch</sgmltag> elements for the above "
 "repository:"
 msgstr ""
 
-#: C/jhbuild.xml:2289(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2603
 #, no-wrap
 msgid ""
 "\n"
@@ -3243,7 +3937,8 @@ msgstr ""
 "      checkoutdir=\"bzr-next\"/&gt;\n"
 "        "
 
-#: C/jhbuild.xml:2294(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2609
 #, no-wrap
 msgid ""
 "\n"
@@ -3260,27 +3955,32 @@ msgstr ""
 "      checkoutdir=\"bzr-beta\"/&gt;\n"
 "        "
 
-#: C/jhbuild.xml:2304(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2618
 msgid "CVS"
 msgstr "CVS"
 
-#: C/jhbuild.xml:2305(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2620
 msgid "This repository type is used to define a CVS repository."
 msgstr ""
 
-#: C/jhbuild.xml:2307(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2622
 msgid ""
 "The <sgmltag class=\"attribute\">password</sgmltag> attribute is used to "
 "specify the password to the repository."
 msgstr ""
 
-#: C/jhbuild.xml:2311(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2625
 msgid ""
 "The <sgmltag class=\"attribute\">cvsroot</sgmltag> attribute is used to "
 "specify the root of the repository."
 msgstr ""
 
-#: C/jhbuild.xml:2315(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2628
 #, no-wrap
 msgid ""
 "\n"
@@ -3295,23 +3995,26 @@ msgstr ""
 "    password=\"\"/&gt;\n"
 "        "
 
-#. TODO describe these attributes
-#: C/jhbuild.xml:2322(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2636
 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:2330(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2643
 msgid "Darcs"
 msgstr "Darcs"
 
-#: C/jhbuild.xml:2331(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2645
 msgid "This repository type is used to define a Darcs repository."
 msgstr ""
 
-#: C/jhbuild.xml:2333(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2648
 #, no-wrap
 msgid ""
 "\n"
@@ -3322,15 +4025,18 @@ msgstr ""
 "&lt;repository type=\"darcs\" name=\"telepathy.freedesktop.org\"\n"
 "      href=\"http://projects.collabora.co.uk/darcs/telepathy/\"/&gt;\n";
 
-#: C/jhbuild.xml:2340(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2655
 msgid "Git"
 msgstr "Git"
 
-#: C/jhbuild.xml:2341(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2657
 msgid "This repository type is used to define a Git repository."
 msgstr ""
 
-#: C/jhbuild.xml:2343(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2659
 #, no-wrap
 msgid ""
 "\n"
@@ -3343,13 +4049,15 @@ msgstr ""
 "    href=\"git://anongit.freedesktop.org/git/\"/&gt;\n"
 "        "
 
-#: C/jhbuild.xml:2348(para) C/jhbuild.xml:2453(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2664 C/index.docbook:2786
 msgid ""
 "It allows the following attributes on the <sgmltag class=\"element\">branch</"
 "sgmltag> element:"
 msgstr ""
 
-#: C/jhbuild.xml:2351(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2668
 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. "
@@ -3359,17 +4067,16 @@ msgid ""
 "your own work."
 msgstr ""
 
-#: C/jhbuild.xml:2359(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2675
 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."
+"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 ""
 
-#. TODO I can't say much about the subdir attribute. In the
-#. end it will just be appended to checkoutdir.
-#. https://bugzilla.gnome.org/show_bug.cgi?id=342846
-#: C/jhbuild.xml:2369(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2685
 #, no-wrap
 msgid ""
 "\n"
@@ -3386,15 +4093,18 @@ msgstr ""
 "        tag=\"<replaceable>tree-ish</replaceable>\"/&gt;\n"
 "        "
 
-#: C/jhbuild.xml:2378(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2694
 msgid "Mercurial"
 msgstr "Mercurial"
 
-#: C/jhbuild.xml:2379(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2696
 msgid "This repository type is used to define a Mercurial repository."
 msgstr ""
 
-#: C/jhbuild.xml:2381(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2699
 #, no-wrap
 msgid ""
 "\n"
@@ -3405,7 +4115,8 @@ msgstr ""
 "&lt;repository type=\"hg\" name=\"hg.gtk-vnc\"\n"
 "    href=\"http://gtk-vnc.codemonkey.ws/hg/\"; /&gt;\n"
 
-#: C/jhbuild.xml:2386(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2704
 #, no-wrap
 msgid ""
 "\n"
@@ -3414,33 +4125,39 @@ msgstr ""
 "\n"
 "&lt;branch repo=\"hg.gtk-vnc\" module=\"outgoing.hg\" checkoutdir=\"gtk-vnc\"/&gt;\n"
 
-#: C/jhbuild.xml:2393(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2710
 msgid "Monotone"
 msgstr "Monotone"
 
-#: C/jhbuild.xml:2394(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2712
 msgid "This repository type is used to define a Monotone repository."
 msgstr ""
 
-#: C/jhbuild.xml:2396(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2715
 msgid ""
 "The <sgmltag class=\"attribute\">server</sgmltag> attribute is used to "
 "specify the repository server."
 msgstr ""
 
-#: C/jhbuild.xml:2399(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2718
 msgid ""
 "The <sgmltag class=\"attribute\">database</sgmltag> attribute is used to "
 "specify the database to use for the repository."
 msgstr ""
 
-#: C/jhbuild.xml:2403(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2721
 msgid ""
 "The <sgmltag class=\"attribute\">defbranch</sgmltag> attribute is used "
 "specify the branch of the repository to use."
 msgstr ""
 
-#: C/jhbuild.xml:2407(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2724
 #, no-wrap
 msgid ""
 "\n"
@@ -3453,15 +4170,18 @@ msgstr ""
 "    server=\"pidgin.im\" database=\"pidgin.im.mtn\"\n"
 "    defbranch=\"im.pidgin.pidgin\"/&gt;\n"
 
-#: C/jhbuild.xml:2416(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2732
 msgid "Subversion"
 msgstr "Subversion"
 
-#: C/jhbuild.xml:2417(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2734
 msgid "This repository type is used to define a Subversion repository."
 msgstr ""
 
-#: C/jhbuild.xml:2419(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2737
 #, no-wrap
 msgid ""
 "\n"
@@ -3474,15 +4194,16 @@ msgstr ""
 "    href=\"http://svn.gnome.org/svn/\"/&gt;\n";
 "        "
 
-#. So how do I checkut out branch at a specific revision?
-#: C/jhbuild.xml:2425(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2744
 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."
+"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:2430(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2749
 #, no-wrap
 msgid ""
 "\n"
@@ -3493,24 +4214,52 @@ msgstr ""
 "&lt;branch revision=\"gnome-2-20\"/&gt;\n"
 "        "
 
-#: C/jhbuild.xml:2434(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2753
+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 ""
+
+#. (itstool) path: section/title
+#: C/index.docbook:2763
+msgid "System"
+msgstr "System"
+
+#. (itstool) path: section/para
+#: C/index.docbook:2765
+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 ""
+
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2770
+#, no-wrap
 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\")"
+"\n"
+"&lt;repository type=\"system\" name=\"system\"/&gt;\n"
 msgstr ""
+"\n"
+"&lt;repository type=\"system\" name=\"system\"/&gt;\n"
 
-#: C/jhbuild.xml:2445(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2776
 msgid "Tarballs"
 msgstr "Tarballs"
 
-#: C/jhbuild.xml:2446(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2778
 msgid "This repository type is used to define a tarball repository."
 msgstr ""
 
-#: C/jhbuild.xml:2448(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2781
 #, no-wrap
 msgid ""
 "\n"
@@ -3521,32 +4270,37 @@ msgstr ""
 "&lt;repository type=\"tarball\" name=\"dbus/dbus-python\"\n"
 "    href=\"http://dbus.freedesktop.org/releases/dbus-python/\"/&gt;\n";
 
-#: C/jhbuild.xml:2456(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2790
 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:2461(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2796
 msgid ""
-"The <sgmltag class=\"attribute\">size</sgmltag> and <sgmltag class=\"attribute"
-"\">hash</sgmltag>, as well as the obsolete <sgmltag class=\"attribute"
-"\">md5sum</sgmltag>, attributes are optional. If these attributes are "
-"present, they are used to check that the source package was downloaded "
+"The <sgmltag class=\"attribute\">size</sgmltag> and <sgmltag class="
+"\"attribute\">hash</sgmltag>, as well as the obsolete <sgmltag class="
+"\"attribute\">md5sum</sgmltag>, attributes are optional. If these attributes "
+"are present, they are used to check that the source package was downloaded "
 "correctly."
 msgstr ""
 
-#: C/jhbuild.xml:2467(para) C/jhbuild.xml:3045(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2802
 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."
+"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:2475(para) C/jhbuild.xml:3053(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2810 C/index.docbook:3425
 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 "
@@ -3556,7 +4310,8 @@ msgid ""
 "specify a URI, in which case it will be downloaded from that location."
 msgstr ""
 
-#: C/jhbuild.xml:2484(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2818
 #, no-wrap
 msgid ""
 "\n"
@@ -3564,26 +4319,37 @@ msgid ""
 "    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"
+"&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"
+"&lt;/branch&gt;\n"
+
+#. (itstool) path: section/para
+#: C/index.docbook:2826
+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:2497(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2834
 msgid "Including Other Module Sets"
 msgstr "Einbinden anderer Modulsätze"
 
-#: C/jhbuild.xml:2499(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2836
 msgid ""
-"JHBuild allows one module set to include the contents of another by reference "
-"using the <sgmltag class=\"element\">include</sgmltag> element."
+"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:2503(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2840
 #, no-wrap
 msgid ""
 "\n"
@@ -3592,49 +4358,56 @@ msgstr ""
 "\n"
 "&lt;include href=\"<replaceable>uri</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2507(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2844
 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."
+"module set to be included, relative to the file containing the <sgmltag "
+"class=\"element\">include</sgmltag> element."
 msgstr ""
 
-#: C/jhbuild.xml:2512(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2848
 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:2519(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2855
 msgid "Module Definitions"
 msgstr "Moduldefinitionen"
 
-#: C/jhbuild.xml:2521(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2857
 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."
+"set file, and the list can easily be extended. Only the most common ones "
+"will be mentioned here."
 msgstr ""
 
-#: C/jhbuild.xml:2525(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2861
 msgid ""
 "They are all basically composed of a <sgmltag class=\"element\">branch</"
-"sgmltag> element describing how to get the module and <sgmltag class=\"element"
-"\">dependencies</sgmltag>, <sgmltag class=\"element\">suggests</sgmltag> and "
-"<sgmltag class=\"element\">after</sgmltag> elements to declare the "
-"dependencies of the module."
+"sgmltag> element describing how to get the module and <sgmltag class="
+"\"element\">dependencies</sgmltag>, <sgmltag class=\"element\">suggests</"
+"sgmltag> and <sgmltag class=\"element\">after</sgmltag> elements to declare "
+"the dependencies of the module."
 msgstr ""
 
-#: C/jhbuild.xml:2532(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2868
 msgid ""
 "Any modules listed in the <sgmltag class=\"element\">dependencies</sgmltag> "
-"element will be added to the module list for <command>jhbuild build</command> "
-"if it isn't already included, and make sure the dependent modules are built "
-"first."
+"element will be added to the module list for <command>jhbuild build</"
+"command> if it isn't already included, and make sure the dependent modules "
+"are built first."
 msgstr ""
 
-#: C/jhbuild.xml:2538(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2873
 msgid ""
 "After generating the modules list, the modules listed in the <sgmltag class="
 "\"element\">suggests</sgmltag> element will be used to further sort the "
@@ -3643,17 +4416,20 @@ msgid ""
 "module."
 msgstr ""
 
-#: C/jhbuild.xml:2546(title)
+#. (itstool) path: section/title
+#: C/index.docbook:2880
 msgid "autotools"
 msgstr "autotools"
 
-#: C/jhbuild.xml:2548(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2882
 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:2552(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2886
 #, no-wrap
 msgid ""
 "\n"
@@ -3664,9 +4440,13 @@ 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      [ uninstall-before-install=\"<replaceable>uninstall-before-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"
+"\t      [ supports-non-srcdir-builds=\"<replaceable>supports-non-srcdir-builds</replaceable>\" ]\n"
+"\t      [ force-non-srcdir-builds=\"<replaceable>force-non-srcdir-builds</replaceable>\" ]\n"
+"\t      [ supports-static-analyzer=\"<replaceable>supports-static-analyzer</replaceable>\" ]&gt;\n"
 "\n"
 "  &lt;branch [ ... ] &gt;\n"
 "    [...]\n"
@@ -3691,9 +4471,13 @@ msgstr ""
 "\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      [ uninstall-before-install=\"<replaceable>uninstall-before-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"
+"\t      [ supports-non-srcdir-builds=\"<replaceable>supports-non-srcdir-builds</replaceable>\" ]\n"
+"\t      [ force-non-srcdir-builds=\"<replaceable>force-non-srcdir-builds</replaceable>\" ]\n"
+"\t      [ supports-static-analyzer=\"<replaceable>supports-static-analyzer</replaceable>\" ]&gt;\n"
 "\n"
 "  &lt;branch [ ... ] &gt;\n"
 "    [...]\n"
@@ -3710,7 +4494,8 @@ msgstr ""
 "\n"
 "&lt;/autotools&gt;\n"
 
-#: C/jhbuild.xml:2580(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2918
 msgid ""
 "The <sgmltag class=\"attribute\">autogenargs</sgmltag> and <sgmltag class="
 "\"attribute\">makeargs</sgmltag> and <sgmltag class=\"attribute"
@@ -3719,28 +4504,54 @@ msgid ""
 "and <command>make install</command> respectively."
 msgstr ""
 
-#: C/jhbuild.xml:2587(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2925
+msgid ""
+"The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies "
+"the name of the autogen.sh script to run. The value <literal>autoreconf</"
+"literal> can be used if your module has no <command>autogen.sh</command> "
+"script equivalent. In that case, JHBuild will run <command>autoreconf -fi</"
+"command>, followed by the proper <command>configure</command>. <sgmltag "
+"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\">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 ""
+
+#. (itstool) path: section/para
+#: C/index.docbook:2940
 msgid ""
-"The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies the "
-"name of the autogen.sh script to run. The value <literal>autoreconf</literal> "
-"can be used if your module has no <command>autogen.sh</command> script "
-"equivalent. In that case, JHBuild will run <command>autoreconf -fi</command>, "
-"followed by the proper <command>configure</command>. <sgmltag 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."
+"The <sgmltag class=\"attribute\">uninstall-before-install</sgmltag> "
+"specifies any old installed files from the module should before removed "
+"before running the install step. This can be used to work around a problem "
+"where libtool tries to link one library it is installing against another "
+"library it is installing, but because of jhbuild's use of DESTDIR, finds the "
+"old installed library instead. The downside of specifying this is that it "
+"could cause problems if the user is currently running code that relies on "
+"installed files from the module."
 msgstr ""
 
-#: C/jhbuild.xml:2602(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2950
 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:2607(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2955
+msgid ""
+"The <sgmltag class=\"attribute\">force-non-srcdir-builds</sgmltag> attribute "
+"is used to mark modules that can't be cleanly built from the source "
+"directory, but can be built from outside it."
+msgstr ""
+
+#. (itstool) path: section/para
+#: C/index.docbook:2959
 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 "
@@ -3750,7 +4561,8 @@ msgid ""
 "example, here is the default autogen-template:"
 msgstr ""
 
-#: C/jhbuild.xml:2616(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2967
 #, no-wrap
 msgid ""
 "\n"
@@ -3759,28 +4571,42 @@ msgstr ""
 "\n"
 "%(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s\n"
 
-#: C/jhbuild.xml:2620(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2971
 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:2627(title)
+#. (itstool) path: section/para
+#: C/index.docbook:2975
+msgid ""
+"The <sgmltag class=\"attribute\">supports-static-analyzer</sgmltag> "
+"attribute must be specified (with false as value) for modules which don’t "
+"support being built under a static analysis tool such as <command>scan-"
+"build</command>."
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.docbook:2982
 msgid "cmake"
 msgstr "cmake"
 
-#: C/jhbuild.xml:2629(para)
+#. (itstool) path: section/para
+#: C/index.docbook:2984
 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:2632(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:2987
 #, no-wrap
 msgid ""
 "\n"
-"&lt;cmake id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;cmake id=\"<replaceable>modulename</replaceable>\"\n"
+"            [ skip-install=\"<replaceable>skip-install</replaceable>\" ]&gt;\n"
 "  &lt;branch [ ... ] &gt;\n"
 "    [...]\n"
 "  &lt;/branch&gt;\n"
@@ -3796,7 +4622,8 @@ msgid ""
 "&lt;/cmake&gt;\n"
 msgstr ""
 "\n"
-"&lt;cmake id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"  &lt;cmake id=\"<replaceable>modulename</replaceable>\"\n"
+"            [ skip-install=\"<replaceable>skip-install</replaceable>\" ]&gt;\n"
 "  &lt;branch [ ... ] &gt;\n"
 "    [...]\n"
 "  &lt;/branch&gt;\n"
@@ -3811,17 +4638,20 @@ msgstr ""
 "  &lt;/after&gt;\n"
 "&lt;/cmake&gt;\n"
 
-#: C/jhbuild.xml:2652(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3007
 msgid "distutils"
 msgstr "distutils"
 
-#: C/jhbuild.xml:2654(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3009
 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:2658(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3012
 #, no-wrap
 msgid ""
 "\n"
@@ -3858,18 +4688,21 @@ msgstr ""
 "  &lt;/after&gt;\n"
 "&lt;/distutils&gt;\n"
 
-#: C/jhbuild.xml:2679(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3032
 msgid "linux"
 msgstr "linux"
 
-#: C/jhbuild.xml:2681(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3034
 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:2687(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3039
 #, no-wrap
 msgid ""
 "\n"
@@ -3920,23 +4753,27 @@ msgstr ""
 "\n"
 "&lt;/linux&gt;\n"
 
-#: C/jhbuild.xml:2715(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3066
 msgid "perl"
 msgstr "perl"
 
-#: C/jhbuild.xml:2717(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3068
 msgid ""
 "The <sgmltag class=\"element\">perl</sgmltag> element is used to build perl "
 "modules."
 msgstr ""
 
-#: C/jhbuild.xml:2720(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3071
 msgid ""
 "The <sgmltag class=\"attribute\">makeargs</sgmltag> attribute is used to "
 "specify additional arguments to pass to <command>make</command>."
 msgstr ""
 
-#: C/jhbuild.xml:2724(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3075
 #, no-wrap
 msgid ""
 "\n"
@@ -3977,74 +4814,173 @@ msgstr ""
 "\n"
 "&lt;/perl&gt;\n"
 
-#: C/jhbuild.xml:2746(title)
-msgid "waf"
-msgstr "waf"
+#. (itstool) path: section/title
+#: C/index.docbook:3097
+msgid "systemmodule"
+msgstr "systemmodule"
 
-#: C/jhbuild.xml:2748(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3099
 msgid ""
-"The <sgmltag class=\"element\">waf</sgmltag> element is used to define a "
-"module which is built using the Waf build system."
+"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/jhbuild.xml:2751(para)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3104
+#, no-wrap
 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>."
+"\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"
+
+#. (itstool) path: section/para
+#: C/index.docbook:3112
+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/jhbuild.xml:2755(programlisting)
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:3120
+msgid ""
+"<sgmltag class=\"attvalue\">path</sgmltag> value. The path is searched for "
+"the matching program name."
+msgstr ""
+
+#. (itstool) path: listitem/simpara
+#: C/index.docbook:3124
+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 ""
+
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3135
 #, no-wrap
 msgid ""
 "\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"
+"&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;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"
+"&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;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"
+"&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;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"
+"&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"
+
+#. (itstool) path: section/para
+#: C/index.docbook:3151
+msgid ""
+"If the system module may be installed in different locations or installed "
+"with different names by different distributions, <sgmltag class=\"element"
+"\">altdep</sgmltag> tag can be used as subelements of <sgmltag class="
+"\"element\">dep</sgmltag> tag to specify alternative locations or names. "
+"<sgmltag class=\"element\">altdep</sgmltag> tag support the same attributes "
+"as <sgmltag class=\"element\">dep</sgmltag> tag does."
+msgstr ""
+
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3159
+#, 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;altdep type=\"path\" name=\"<replaceable>alternative-executable-name-1</replaceable>\" /&gt;\n"
+"      &lt;altdep type=\"path\" name=\"<replaceable>alternative-executable-name-2</replaceable>\" /&gt;\n"
+"      ...\n"
+"    &lt;dep&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;altdep type=\"c_include\" name=\"<replaceable>alternative-header-name-1</replaceable>\" /&gt;\n"
+"      &lt;altdep type=\"c_include\" name=\"<replaceable>alternative-header-name-2</replaceable>\" /&gt;\n"
+"      ...\n"
+"    &lt;dep&gt;\n"
+"  &lt;/systemdependencies&gt;\n"
+"&lt;/systemmodule&gt;\n"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.docbook:3185
+msgid "waf"
+msgstr "waf"
+
+#. (itstool) path: section/para
+#: C/index.docbook:3187
+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:2776(title)
-msgid "Ant"
-msgstr "Ant"
+#. (itstool) path: section/para
+#: C/index.docbook:3190
+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:2778(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3194
 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\">python-command</sgmltag> attribute is used "
+"to specify the Python executable to use; it defaults to <command>python</"
+"command>. This is useful to build modules against version 3 of Python."
 msgstr ""
 
-#: C/jhbuild.xml:2781(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3199
 #, no-wrap
 msgid ""
 "\n"
-"&lt;ant id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"&lt;waf id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"\t [ python-command=\"<replaceable>python-command</replaceable>\" ]\n"
+"\t [ waf-command=\"<replaceable>waf-command</replaceable>\" ]&gt;\n"
 "  &lt;branch [ ... ] &gt;\n"
 "    [...]\n"
 "  &lt;/branch&gt;\n"
@@ -4057,10 +4993,12 @@ msgid ""
 "    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
 "    ...\n"
 "  &lt;/after&gt;\n"
-"&lt;/ant&gt;\n"
+"&lt;/waf&gt;\n"
 msgstr ""
 "\n"
-"&lt;ant id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"&lt;waf id=\"<replaceable>modulename</replaceable>\"&gt;\n"
+"\t [ python-command=\"<replaceable>python-command</replaceable>\" ]\n"
+"\t [ waf-command=\"<replaceable>waf-command</replaceable>\" ]&gt;\n"
 "  &lt;branch [ ... ] &gt;\n"
 "    [...]\n"
 "  &lt;/branch&gt;\n"
@@ -4073,23 +5011,22 @@ msgstr ""
 "    &lt;dep package=\"<replaceable>modulename</replaceable>\"/&gt;\n"
 "    ...\n"
 "  &lt;/after&gt;\n"
-"&lt;/ant&gt;\n"
-
-#: C/jhbuild.xml:2799(title)
-msgid "Example of a module built with ant"
-msgstr "Beispiel für ein mit Ant erstelltes Modul"
+"&lt;/waf&gt;\n"
 
-#: C/jhbuild.xml:2813(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3220
 msgid "testmodule"
 msgstr "testmodule"
 
-#: C/jhbuild.xml:2815(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3222
 msgid ""
-"The <sgmltag class=\"element\">testmodule</sgmltag> element is used to create "
-"a module which runs a suite of tests using LDTP or Dogtail."
+"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:2819(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3226
 #, no-wrap
 msgid ""
 "\n"
@@ -4138,38 +5075,44 @@ msgstr ""
 "\n"
 "&lt;/testmodule&gt;\n"
 
-#: C/jhbuild.xml:2843(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3250
 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'."
+"tests to be run in the module. 'dogtail' uses python to invoke all .py "
+"files. 'ldtp' invokes 'ldtprunner run.xml'."
 msgstr ""
 
-#: C/jhbuild.xml:2848(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3254
 msgid ""
 "Unless the noxvfb configuration option is set, an Xvfb server is started to "
 "run the tests in"
 msgstr ""
 
-#: C/jhbuild.xml:2854(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3259
 msgid "metamodule"
 msgstr "metamodule"
 
-#: C/jhbuild.xml:2856(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3261
 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:2861(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3265
 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:2865(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3269
 #, no-wrap
 msgid ""
 "\n"
@@ -4196,35 +5139,42 @@ msgstr ""
 "  &lt;/suggests&gt;\n"
 "&lt;/metamodule&gt;\n"
 
-#: C/jhbuild.xml:2877(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3282
 msgid ""
-"The <sgmltag class=\"attribute\">id</sgmltag> attribute gives the name of the "
-"module. The child elements are handled as for <link linkend=\"moduleset-"
-"syntax-defs-autotools\"><sgmltag class=\"element\">autotools</sgmltag></link>."
+"The <sgmltag class=\"attribute\">id</sgmltag> attribute gives the name of "
+"the module. The child elements are handled as for <link linkend=\"moduleset-"
+"syntax-defs-autotools\"><sgmltag class=\"element\">autotools</sgmltag></"
+"link>."
 msgstr ""
 
-#: C/jhbuild.xml:2886(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3290
 msgid "Deprecated Elements"
 msgstr "Veraltete Elemente"
 
-#: C/jhbuild.xml:2892(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3296
 msgid "cvsroot"
 msgstr "cvsroot"
 
-#: C/jhbuild.xml:2894(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3298
 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:2899(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3302
 msgid ""
 "The <sgmltag class=\"element\">cvsroot</sgmltag> element is used to describe "
 "a CVS repository."
 msgstr ""
 
-#: C/jhbuild.xml:2902(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3305
 #, no-wrap
 msgid ""
 "\n"
@@ -4239,19 +5189,22 @@ msgstr ""
 "           root=\"<replaceable>anon-cvsroot</replaceable>\"\n"
 "           password=\"<replaceable>anon-password</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2909(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3312
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute should be a unique "
 "identifier for the CVS repository."
 msgstr ""
 
-#: C/jhbuild.xml:2912(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3315
 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:2916(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3319
 msgid ""
 "The <sgmltag class=\"attribute\">root</sgmltag> attribute lists the CVS root "
 "used for anonymous access to this repository, and the <sgmltag class="
@@ -4259,24 +5212,28 @@ msgid ""
 "anonymous access."
 msgstr ""
 
-#: C/jhbuild.xml:2924(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3326
 msgid "svnroot"
 msgstr "svnroot"
 
-#: C/jhbuild.xml:2926(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3328
 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:2931(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3332
 msgid ""
 "The <sgmltag class=\"element\">svnroot</sgmltag> element is used to describe "
 "a Subversion repository."
 msgstr ""
 
-#: C/jhbuild.xml:2934(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3335
 #, no-wrap
 msgid ""
 "\n"
@@ -4289,104 +5246,71 @@ msgstr ""
 "           [ default=\"<replaceable>yes|no</replaceable>\" ]\n"
 "           href=\"<replaceable>anon-svnroot</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2940(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3341
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute should be a unique "
 "identifier for the Subversion repository."
 msgstr ""
 
-#: C/jhbuild.xml:2944(para) C/jhbuild.xml:2974(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3344
 msgid ""
-"If <sgmltag class=\"attribute\">default</sgmltag> attribute says whether this "
-"is the default module source for this module set file."
+"If <sgmltag class=\"attribute\">default</sgmltag> attribute says whether "
+"this is the default module source for this module set file."
 msgstr ""
 
-#: C/jhbuild.xml:2948(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3348
 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:2955(title)
-msgid "arch-archive"
-msgstr "arch-archive"
-
-#: C/jhbuild.xml:2957(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:2962(para)
-msgid ""
-"The <sgmltag class=\"element\">arch-archive</sgmltag> element is used to "
-"describe a GNU Arch archive."
-msgstr ""
-
-#: C/jhbuild.xml:2965(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 ""
-"\n"
-"  &lt;arch-archive name=\"<replaceable>archivename</replaceable>\"\n"
-"                [ default=\"<replaceable>yes|no</replaceable>\" ]\n"
-"                href=\"<replaceable>mirror-url</replaceable>\"/&gt;\n"
-
-#: C/jhbuild.xml:2971(para)
-msgid ""
-"The <sgmltag class=\"attribute\">name</sgmltag> attribute should be the Arch "
-"archive name."
-msgstr ""
-
-#: C/jhbuild.xml:2978(para)
-msgid ""
-"The <sgmltag class=\"attribute\">href</sgmltag> attribute lists a public "
-"mirror URL for the archive."
-msgstr ""
-
-#: C/jhbuild.xml:2984(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3358
 msgid "Deprecated Module Types"
 msgstr "Veraltete Modultypen"
 
-#: C/jhbuild.xml:2987(para)
+#. (itstool) path: warning/para
+#: C/index.docbook:3361
 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 ""
 "Dieser Abschnitt beschreibt veraltete Elemente, die in vorhandenen "
-"Modulsätzen noch verwendet werden können, was allerdings nicht mehr empfohlen "
-"wird."
+"Modulsätzen noch verwendet werden können, was allerdings nicht mehr "
+"empfohlen wird."
 
-#: C/jhbuild.xml:2993(title)
+#. (itstool) path: section/title
+#: C/index.docbook:3367
 msgid "tarball"
 msgstr "tarball"
 
-#: C/jhbuild.xml:2996(para)
+#. (itstool) path: important/para
+#: C/index.docbook:3370
 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:3002(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3375
 msgid ""
 "The <sgmltag class=\"element\">tarball</sgmltag> element is used to define a "
 "module that is to be built from a tarball."
 msgstr ""
 
-#: C/jhbuild.xml:3006(programlisting)
+#. (itstool) path: section/programlisting
+#: C/index.docbook:3378
 #, no-wrap
 msgid ""
 "\n"
 "  &lt;tarball id=\"<replaceable>modulename</replaceable>\"\n"
 "              [ version=\"<replaceable>version</replaceable>\" ]\n"
-"              [ checkourdir=\"<replaceable>checkoutdir</replaceable>\" ]\n"
+"              [ checkoutdir=\"<replaceable>checkoutdir</replaceable>\" ]\n"
 "              [ autogenargs=\"<replaceable>autogenargs</replaceable>\" ]\n"
 "              [ makeargs=\"<replaceable>makeargs</replaceable>\" ]\n"
 "              [ autogen-sh=\"<replaceable>autogen-sh</replaceable>\" ]\n"
@@ -4412,7 +5336,7 @@ msgstr ""
 "\n"
 "  &lt;tarball id=\"<replaceable>modulename</replaceable>\"\n"
 "              [ version=\"<replaceable>version</replaceable>\" ]\n"
-"              [ checkourdir=\"<replaceable>checkoutdir</replaceable>\" ]\n"
+"              [ checkoutdir=\"<replaceable>checkoutdir</replaceable>\" ]\n"
 "              [ autogenargs=\"<replaceable>autogenargs</replaceable>\" ]\n"
 "              [ makeargs=\"<replaceable>makeargs</replaceable>\" ]\n"
 "              [ autogen-sh=\"<replaceable>autogen-sh</replaceable>\" ]\n"
@@ -4435,300 +5359,40 @@ msgstr ""
 "    &lt;/suggests&gt;\n"
 "  &lt;/tarball&gt;\n"
 
-#: C/jhbuild.xml:3032(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3405
 msgid ""
 "The <sgmltag class=\"attribute\">id</sgmltag> and <sgmltag class=\"attribute"
 "\">version</sgmltag> attributes are used to identify the module."
 msgstr ""
 
-#: C/jhbuild.xml:3036(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3409
 msgid ""
-"The <sgmltag class=\"element\">source</sgmltag> element specifies the file to "
-"download and compile. The <sgmltag class=\"attribute\">href</sgmltag> "
-"attribute is mandatory, while the <sgmltag class=\"attribute\">size</sgmltag> "
-"and <sgmltag class=\"attribute\">hash</sgmltag>, as well as the obsolete "
-"<sgmltag class=\"attribute\">md5sum</sgmltag>, attributes are optional. If "
-"these last two attributes are present, they are used to check that the source "
-"package was downloaded correctly."
+"The <sgmltag class=\"element\">source</sgmltag> element specifies the file "
+"to download and compile. The <sgmltag class=\"attribute\">href</sgmltag> "
+"attribute is mandatory, while the <sgmltag class=\"attribute\">size</"
+"sgmltag> and <sgmltag class=\"attribute\">hash</sgmltag>, as well as the "
+"obsolete <sgmltag class=\"attribute\">md5sum</sgmltag>, attributes are "
+"optional. If these last two attributes are present, they are used to check "
+"that the source package was downloaded correctly."
 msgstr ""
 
-#: C/jhbuild.xml:3063(para)
+#. (itstool) path: section/para
+#: C/index.docbook:3418
+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 ""
+
+#. (itstool) path: section/para
+#: C/index.docbook:3433
 msgid ""
 "The other attributes and the <sgmltag class=\"element\">dependencies</"
 "sgmltag>, <sgmltag class=\"element\">suggests</sgmltag> and <sgmltag class="
 "\"element\">after</sgmltag> elements are processed as for <link linkend="
 "\"moduleset-syntax-defs-autotools\">autotools</link>."
 msgstr ""
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/jhbuild.xml:0(None)
-msgid "translator-credits"
-msgstr "Mario Blättermann <mariobl gnome org>, 2009"
-
-#~ 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 ""
-#~ "Bevor Sie JHBuild herunterladen, stellen Sie sicher, dass auf Ihrem System "
-#~ "Python in Version 2.0 oder neuer installiert ist. Außerdem ist es von "
-#~ "grundlegender Bedeutung, dass die XML-Parser-Erweiterung Expat vorhanden "
-#~ "ist. Expat wird mit Python ab Version 2.3 mitgeliefert. Um zu überprüfen, "
-#~ "ob Expat installiert ist, führen Sie die folgenden Befehle aus:"
-
-#~ msgid "python"
-#~ msgstr "python"
-
-#~ msgid "&gt;&gt;&gt;"
-#~ msgstr "&gt;&gt;&gt;"
-
-#~ msgid "import xml.parsers.expat"
-#~ msgstr "import xml.parsers.expat"
-
-#~ 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 ""
-#~ "Falls die obige Ausgabe ohne Ausnahme erscheint, ist Expat-XML korrekt "
-#~ "installiert."
-
-#~ msgid ""
-#~ "\n"
-#~ "&lt;branch repo=\"git.freedesktop.org\" module=\"swfdec/swfdec\"\n"
-#~ "    checkoutdir=\"swfdec\"/&gt;\n"
-#~ msgstr ""
-#~ "\n"
-#~ "&lt;branch repo=\"git.freedesktop.org\" module=\"swfdec/swfdec\"\n"
-#~ "    checkoutdir=\"swfdec\"/&gt;\n"
-
-#~ msgid "Frequently Asked Questions"
-#~ msgstr "Häufig gestellte Fragen"
-
-#~ msgid "General JHBuild Questions"
-#~ msgstr "Allgemeine Fragen zu JHBuild"
-
-#~ msgid ""
-#~ "The <command>wget</command> command can't download any tarballs. How do I "
-#~ "get it to work with my firewall?"
-#~ msgstr ""
-#~ "Der Befehl <command>wget</command> kann keine Tar-Archive herunterladen. "
-#~ "Wie kann ich erreichen, dass dies mit meiner Firewall funktioniert?"
-
-#~ 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 ""
-#~ "Erstellen Sie eine Datei namens <filename>~/.wgetrc</filename>. Falls ein "
-#~ "HTTP-Proxy zum Zugriff auf FTP-Seiten verwendet wird, fügen Sie folgende "
-#~ "Zeile zur Datei hinzu:"
-
-#~ msgid ""
-#~ "ftp_proxy = http://<replaceable>hostname</replaceable>:<replaceable>port</"
-#~ "replaceable>/"
-#~ msgstr ""
-#~ "ftp_proxy = http://<replaceable>Rechnername</replaceable>:"
-#~ "<replaceable>Port</replaceable>/"
-
-#~ msgid ""
-#~ "If passive FTP connections are required (sometimes needed with NAT "
-#~ "firewalls), add the following line:"
-#~ msgstr ""
-#~ "Falls passive FTP-Verbindungen notwendig sind (z.B. manchmal mit NAT-"
-#~ "Firewalls), fügen Sie folgende Zeile hinzu:"
-
-#~ msgid "passive_ftp = on"
-#~ msgstr "passive_ftp = on"
-
-#~ msgid "Building is slow. Is there any way I can speed it up?"
-#~ msgstr ""
-#~ "Die Erstellung ist langsam. Gibt es eine Möglichkeit, diese zu "
-#~ "beschleunigen?"
-
-#~ 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 ""
-#~ "<ulink url=\"http://ccache.samba.org/\";>CCache</ulink> kann "
-#~ "Kompiliervorgänge beschleunigen, indem es Kompilierergebnisse "
-#~ "zwischenspeichert. <command>CCache</command> ist für die meisten "
-#~ "Distributionen verfügbar."
-
-#~ msgid "Set the cache size with the following command:"
-#~ msgstr "Legen Sie die Größe des Zwischenspeichers mit folgendem Befehl fest:"
-
-#~ msgid "ccache -M 2G"
-#~ msgstr "ccache -M 2G"
-
-#~ msgid ""
-#~ "cd ~/bin\n"
-#~ "for cmd in cc gcc c++ g++; do\n"
-#~ "  ln -s /usr/bin/ccache $cmd\n"
-#~ "done"
-#~ msgstr ""
-#~ "cd ~/bin\n"
-#~ "for cmd in cc gcc c++ g++; do\n"
-#~ "  ln -s /usr/bin/ccache $cmd\n"
-#~ "done"
-
-#~ msgid "ccache -s"
-#~ msgstr "ccache -s"
-
-#~ msgid ""
-#~ "Is there a better way to monitor the status of the build than looking at "
-#~ "terminal window?"
-#~ msgstr ""
-#~ "Gibt es eine bessere Möglichkeit zum Überwachen des Status von JHBuild als "
-#~ "das Verfolgen in einem Terminalfenster?"
-
-#~ 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 ""
-#~ "Falls <application>Zenity</application> in Version 2.9 oder neuer auf "
-#~ "Ihrem System installiert ist, dann kann JHBuild im Benachrichtigungsfeld "
-#~ "ein Symbol anzeigen. Das Symbol repräsentiert den aktuellen Stand der "
-#~ "Erstellung und eine Minihilfe zeigt die letzte Meldung von JHBuild."
-
-#~ msgid "The icon will also pop up a balloon on error."
-#~ msgstr "Das Symbol zeigt bei Fehlermeldungen außerdem eine Sprechblase an."
-
-#~ msgid "What other prerequisites are needed to build GNOME with JHBuild?"
-#~ msgstr ""
-#~ "Welche anderen Voraussetzungen müssen erfüllt sein, damit GNOME mit "
-#~ "JHBuild erstellt werden kann?"
-
-#~ msgid "fam or gamin (used by gnome-vfs for file monitoring)."
-#~ msgstr "fam oder gamin (von gnome-vfs zur Dateiüberwachung verwendet)."
-
-#~ msgid "I've built GNOME with JHBuild. How do I run it?"
-#~ msgstr "Ich habe GNOME mit JHBuild erstellt. Wie kann ich es ausführen?"
-
-#~ msgid "Two options:"
-#~ msgstr "Zwei Optionen:"
-
-#~ msgid ""
-#~ "#!/bin/sh\n"
-#~ "exec jhbuild run gnome-session"
-#~ msgstr ""
-#~ "#!/bin/sh\n"
-#~ "exec jhbuild run gnome-session"
-
-#~ 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 ""
-#~ "\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"
-
-#~ 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 ""
-#~ "Starten Sie <command>gdm</command> neu und melden Sie sich in »JHBuild "
-#~ "GNOME« an. Wählen Sie die JHBuild-Sitzung, bevor Sie Ihre Anmeldedaten "
-#~ "eingeben. Es ist empfehlenswert, für Testzwecke ein separates "
-#~ "Benutzerkonto zu verwenden."
-
-#~ 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 ""
-#~ "Beim Erstellen von GNOME mit JHBuild habe ich <varname>prefix</varname> "
-#~ "auf <filename>/usr</filename> gesetzt, und nun ist mein System "
-#~ "unbrauchbar. Was soll ich tun?"
-
-#~ msgid "Don't set <varname>prefix</varname> to <filename>/usr</filename>."
-#~ msgstr ""
-#~ "Setzen Sie <varname>prefix</varname> nicht auf <filename>/usr</filename>."
-
-#~ msgid ""
-#~ "mkdir -p $prefix/var/run\n"
-#~ "cd $prefix/var/run\n"
-#~ "ln -s /var/run/dbus dbus"
-#~ msgstr ""
-#~ "mkdir -p $prefix/var/run\n"
-#~ "cd $prefix/var/run\n"
-#~ "ln -s /var/run/dbus dbus"
-
-#~ msgid ""
-#~ "You will have to restart D-Bus, which usually means logging out or a "
-#~ "complete reboot."
-#~ msgstr ""
-#~ "Sie werden D-Bus neu starten müssen, was normalerweise das Abmelden oder "
-#~ "einen vollständigen Neustart des Systems erfordert."
-
-#~ msgid ""
-#~ "The <filename>~/.jhbuildrc</filename> file uses Python syntax to set a "
-#~ "number of configuration variables for JHBuild. A minimal configuration "
-#~ "file might look something like this:"
-#~ msgstr ""
-#~ "Die Datei <filename>~/.jhbuildrc</filename> verwendet die Python-Syntax "
-#~ "zum Festlegen einer Reihe von Konfigurationsvariablen für JHBuild. Eine "
-#~ "minimale Konfiguration könnte folgendermaßen aussehen:"
-
-#~ msgid ""
-#~ "\n"
-#~ "moduleset = 'gnome-2.22'\n"
-#~ "modules = [ 'meta-gnome-desktop' ]\n"
-#~ "checkoutroot = os.path.join(os.environ['HOME'], 'checkout', 'gnome2')\n"
-#~ "prefix = os.path.join(os.environ['HOME'], 'prefix')\n"
-#~ msgstr ""
-#~ "\n"
-#~ "moduleset = 'gnome-2.22'\n"
-#~ "modules = [ 'meta-gnome-desktop' ]\n"
-#~ "checkoutroot = os.path.join(os.environ['HOME'], 'checkout', 'gnome2')\n"
-#~ "prefix = os.path.join(os.environ['HOME'], 'prefix')\n"
-
-#~ msgid ""
-#~ "Example: <option>--min-time=2h</option> will skip modules that have been "
-#~ "built less than two hours ago."
-#~ msgstr ""
-#~ "Beispiel: <option>--min-time=2h</option> überspringt Module, die vor "
-#~ "weńiger als zwei Stunden erstellt worden sind."
-
-#~ msgid ""
-#~ "<option>s</option>, <option>--skip</option>=<replaceable>module,...</"
-#~ "replaceable>"
-#~ msgstr ""
-#~ "<option>s</option>, <option>--skip</option>=<replaceable>Modul, …</"
-#~ "replaceable>"
-
-#~ msgid "Do not list soft dependencies."
-#~ msgstr "Keine weichen Abhängigkeiten auflisten."
-
-#~ msgid "cvsroots"
-#~ msgstr "cvsroots"
-
-#~ msgid "svnroots"
-#~ msgstr "svnroots"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]