[jhbuild] [i18n] Updated German doc translation



commit 45f3762a4934b6affd46af76065686e73d76389d
Author: Mario Blättermann <mariobl gnome org>
Date:   Sun Oct 24 15:05:57 2010 +0200

    [i18n] Updated German doc translation

 doc/de/de.po | 2537 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1464 insertions(+), 1073 deletions(-)
---
diff --git a/doc/de/de.po b/doc/de/de.po
index b28cc5e..c5cd929 100644
--- a/doc/de/de.po
+++ b/doc/de/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: jhbuild master\n"
-"POT-Creation-Date: 2010-01-06 16:35+0000\n"
-"PO-Revision-Date: 2010-01-16 12:46+0100\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"
 "Language-Team: German <gnome-de gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/jhbuild.xml:929(None)
+#: C/jhbuild.xml:1171(None)
 msgid ""
 "@@image: 'figures/jhbuild_sample_dot_output.png'; "
 "md5=af9fe7edb29fcaefeadfb2f5987aa6e4"
@@ -178,107 +178,63 @@ msgid "Installing JHBuild"
 msgstr "Installieren von JHBuild"
 
 #: C/jhbuild.xml:97(para)
-msgid ""
-"Before downloading JHBuild, verify a copy of Python &gt;= 2.0 is installed. "
-"It is essential that the Expat XML parser extension is installed. Expat XML "
-"is supplied with Python &gt;= 2.3. To verify Expat XML is installed run the "
-"following commands:"
-msgstr ""
-"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:"
-
-#: C/jhbuild.xml:103(prompt)
-msgid "#"
-msgstr "#"
-
-#: C/jhbuild.xml:103(userinput)
-#, no-wrap
-msgid "python"
-msgstr "python"
-
-#: C/jhbuild.xml:107(prompt) C/jhbuild.xml:108(prompt)
-msgid "&gt;&gt;&gt;"
-msgstr "&gt;&gt;&gt;"
-
-#: C/jhbuild.xml:107(userinput)
-#, no-wrap
-msgid "import xml.parsers.expat"
-msgstr "import xml.parsers.expat"
-
-#: C/jhbuild.xml:103(screen)
-#, no-wrap
-msgid ""
-"<placeholder-1/> <placeholder-2/>\n"
-"Python 2.6.2+ (release26-maint, Sep 13 2009, 21:26:06) \n"
-"[GCC 4.4.1] on linux2\n"
-"Type \"help\", \"copyright\", \"credits\" or \"license\" for more information.\n"
-"<placeholder-3/> <placeholder-4/>\n"
-"<placeholder-5/>"
-msgstr ""
-"<placeholder-1/> <placeholder-2/>\n"
-"Python 2.6.2+ (release26-maint, Sep 13 2009, 21:26:06) \n"
-"[GCC 4.4.1] on linux2\n"
-"Type \"help\", \"copyright\", \"credits\" or \"license\" for more information.\n"
-"<placeholder-3/> <placeholder-4/>\n"
-"<placeholder-5/>"
-
-#: C/jhbuild.xml:110(para)
-msgid ""
-"If the above completes without an exception, then Expat XML is installed "
-"correctly."
+msgid "JHBuild requires a Python runtime. Verify Python &gt;= 2.3 is installed."
 msgstr ""
-"Falls die obige Ausgabe ohne Ausnahme erscheint, ist Expat-XML korrekt "
-"installiert."
+"JHBuild benötigt eine Python-Laufzeitumgebung. Stellen Sie sicher, dass "
+"Python &gt;= 2.3 installiert ist."
 
-#: C/jhbuild.xml:113(para)
+#: C/jhbuild.xml:100(para)
 msgid ""
-"The only way to download JHBuild is via the version control system, "
+"The recommended way to download JHBuild is via the version control system, "
 "<command>git</command>. This can be achieved with the following command. It "
 "is recommended to run the command from a new directory where all source code "
-"will be installed, for example, <filename>~/checkout/gnome2</filename>."
+"will be installed, for example, <filename>~/checkout/gnome</filename>."
 msgstr ""
-"Der einzige Weg zum Herunterladen von JHBuild führt über das "
+"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/gnome2</filename>."
-
-#: C/jhbuild.xml:119(prompt) C/jhbuild.xml:121(prompt)
-#: C/jhbuild.xml:127(prompt) C/jhbuild.xml:128(prompt)
-#: C/jhbuild.xml:130(prompt) C/jhbuild.xml:132(prompt)
-#: C/jhbuild.xml:134(prompt) C/jhbuild.xml:139(prompt)
-#: C/jhbuild.xml:140(prompt) C/jhbuild.xml:142(prompt)
-#: C/jhbuild.xml:144(prompt) C/jhbuild.xml:151(prompt)
-#: C/jhbuild.xml:152(prompt) C/jhbuild.xml:159(prompt)
-#: C/jhbuild.xml:160(prompt) C/jhbuild.xml:290(prompt)
-#: C/jhbuild.xml:308(prompt) C/jhbuild.xml:337(prompt)
-#: C/jhbuild.xml:366(prompt) C/jhbuild.xml:372(prompt)
-#: C/jhbuild.xml:380(prompt) C/jhbuild.xml:386(prompt)
-#: C/jhbuild.xml:391(prompt) C/jhbuild.xml:399(prompt)
-#: C/jhbuild.xml:404(prompt) C/jhbuild.xml:409(prompt)
-#: C/jhbuild.xml:414(prompt) C/jhbuild.xml:445(prompt)
-#: C/jhbuild.xml:861(prompt) C/jhbuild.xml:863(prompt)
-#: C/jhbuild.xml:918(prompt) C/jhbuild.xml:922(prompt)
-#: C/jhbuild.xml:1150(prompt)
+"<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:119(userinput)
+#: C/jhbuild.xml:107(userinput)
 #, no-wrap
 msgid "git clone git://git.gnome.org/jhbuild"
 msgstr "git clone git://git.gnome.org/jhbuild"
 
-#: C/jhbuild.xml:120(computeroutput) C/jhbuild.xml:129(computeroutput)
-#: C/jhbuild.xml:131(computeroutput) C/jhbuild.xml:133(computeroutput)
-#: C/jhbuild.xml:141(computeroutput) C/jhbuild.xml:143(computeroutput)
+#: 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)
 #, no-wrap
 msgid "..."
 msgstr "..."
 
-#: C/jhbuild.xml:123(para)
+#: C/jhbuild.xml:111(para)
 msgid ""
 "This will download JHBuild into a new folder named <filename>jhbuild</"
 "filename> under the current directory. Now to build and install JHBuild:"
@@ -287,27 +243,27 @@ msgstr ""
 "filename> unterhalb des aktuellen Ordners heruntergeladen. Nun können Sie "
 "JHBuild erstellen und installieren:"
 
-#: C/jhbuild.xml:127(userinput) C/jhbuild.xml:139(userinput)
+#: C/jhbuild.xml:115(userinput) C/jhbuild.xml:127(userinput)
 #, no-wrap
 msgid "cd jhbuild"
 msgstr "cd jhbuild"
 
-#: C/jhbuild.xml:128(userinput)
+#: C/jhbuild.xml:116(userinput)
 #, no-wrap
 msgid "./autogen.sh"
 msgstr "./autogen.sh"
 
-#: C/jhbuild.xml:130(userinput)
+#: C/jhbuild.xml:118(userinput)
 #, no-wrap
 msgid "make"
 msgstr "make"
 
-#: C/jhbuild.xml:132(userinput)
+#: C/jhbuild.xml:120(userinput)
 #, no-wrap
 msgid "make install"
 msgstr "make install"
 
-#: C/jhbuild.xml:136(para)
+#: C/jhbuild.xml:124(para)
 msgid ""
 "Alternatively, if autotools or gnome-doc-utils is not installed, install "
 "JHBuild as follows:"
@@ -315,17 +271,17 @@ msgstr ""
 "Alternativ installieren Sie JHBuild wie folgt, falls autotools und gnome-doc-"
 "utils nicht vorhanden sind:"
 
-#: C/jhbuild.xml:140(userinput)
+#: C/jhbuild.xml:128(userinput)
 #, no-wrap
 msgid "make -f Makefile.plain"
 msgstr "make -f Makefile.plain"
 
-#: C/jhbuild.xml:142(userinput)
+#: C/jhbuild.xml:130(userinput)
 #, no-wrap
 msgid "make -f Makefile.plain install"
 msgstr "make -f Makefile.plain install"
 
-#: C/jhbuild.xml:146(para)
+#: C/jhbuild.xml:134(para)
 msgid ""
 "If the above steps complete successfully, a small shell script will be "
 "installed in <filename>~/.local/bin</filename> to start JHBuild. Add "
@@ -336,12 +292,12 @@ msgstr ""
 "startet. Fügen Sie <filename>~/.local/bin</filename> zur Variable "
 "<envar>PATH</envar> hinzu:"
 
-#: C/jhbuild.xml:151(userinput)
+#: C/jhbuild.xml:139(userinput)
 #, no-wrap
 msgid "PATH=$PATH:~/.local/bin"
 msgstr "PATH=$PATH:~/.local/bin"
 
-#: C/jhbuild.xml:154(para)
+#: C/jhbuild.xml:142(para)
 msgid ""
 "To permanently add <filename>~/.local/bin</filename> to the <envar>PATH</"
 "envar> variable, run the following command:"
@@ -349,12 +305,12 @@ msgstr ""
 "Um <filename>~/.local/bin</filename> dauerhaft zur Variable <envar>PATH</"
 "envar> hinzuzufügen, führen Sie folgenden Befehl aus:"
 
-#: C/jhbuild.xml:159(userinput)
+#: C/jhbuild.xml:147(userinput) C/jhbuild.xml:497(userinput)
 #, no-wrap
 msgid "echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc"
 msgstr "echo PATH=$PATH:~/.local/bin &gt;&gt; ~/.bashrc"
 
-#: C/jhbuild.xml:162(para)
+#: C/jhbuild.xml:150(para)
 msgid ""
 "Before running JHBuild, it is necessary to set up a configuration file "
 "located at <filename>~/.jhbuildrc</filename>."
@@ -362,11 +318,11 @@ msgstr ""
 "Bevor JHBuild ausgeführt werden kann, muss eine Konfiguration eingerichtet "
 "werden, die sich in der Datei <filename>~/.jhbuildrc</filename> befindet."
 
-#: C/jhbuild.xml:169(title)
+#: C/jhbuild.xml:157(title)
 msgid "Configuring JHBuild"
 msgstr "Konfiguriere von JHBuild"
 
-#: C/jhbuild.xml:171(para)
+#: 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 "
@@ -381,22 +337,23 @@ msgstr ""
 "<filename>~/.jhbuildrc</filename> und passen Sie die Datei nach Ihren "
 "Wünschen an."
 
-#: C/jhbuild.xml:179(para)
+#: C/jhbuild.xml:167(para)
 msgid ""
 "The sample configuration will make JHBuild build the <application>meta-gnome-"
-"desktop</application> module and its dependencies from the <systemitem>gnome-"
-"2.30</systemitem> module set. JHBuild will unpack source trees to <filename>~/"
-"checkout/gnome2</filename> and install all files to subdirectories of "
-"<filename>/opt/gnome2</filename>. The two directories must be writable."
+"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/gnome2</filename> und installiert alle Dateien in "
-"Unterordner von <filename>/opt/gnome2</filename>. Diese zwei Ordner müssen "
+"<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:187(para)
+#: C/jhbuild.xml:175(para)
 msgid ""
 "Configuration variables are documented in <xref linkend=\"config-reference\"/"
 ">. The most commonly used variables are:"
@@ -404,11 +361,11 @@ msgstr ""
 "Konfigurationsvariablen sind in <xref linkend=\"config-reference\"/> "
 "dokumentiert. Einige der am häufigsten verwendeten Variablen sind:"
 
-#: C/jhbuild.xml:194(varname) C/jhbuild.xml:1698(varname)
+#: C/jhbuild.xml:182(varname) C/jhbuild.xml:1959(varname)
 msgid "repos"
 msgstr "repos"
 
-#: C/jhbuild.xml:196(simpara)
+#: C/jhbuild.xml:184(simpara)
 msgid ""
 "A dictionary that can be used to specify an alternative repository location "
 "for a particular repository. This configuration variable is useful to a "
@@ -418,16 +375,16 @@ msgid ""
 "For example:"
 msgstr ""
 
-#: C/jhbuild.xml:203(programlisting)
+#: C/jhbuild.xml:191(programlisting)
 #, 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:207(varname) C/jhbuild.xml:1582(varname)
+#: C/jhbuild.xml:195(varname) C/jhbuild.xml:1843(varname)
 msgid "moduleset"
 msgstr "moduleset"
 
-#: C/jhbuild.xml:209(simpara) C/jhbuild.xml:1584(simpara)
+#: C/jhbuild.xml:197(simpara) C/jhbuild.xml:1845(simpara)
 msgid ""
 "A string or list of strings specifying the name(s) of the module set(s) to "
 "use. This can either be the filename of a moduleset included with JHBuild "
@@ -438,12 +395,12 @@ msgid ""
 "current GNOME development release."
 msgstr ""
 
-#: C/jhbuild.xml:221(varname) C/jhbuild.xml:918(replaceable)
-#: C/jhbuild.xml:922(replaceable) C/jhbuild.xml:1571(varname)
+#: C/jhbuild.xml:209(varname) C/jhbuild.xml:1160(replaceable)
+#: C/jhbuild.xml:1164(replaceable) C/jhbuild.xml:1832(varname)
 msgid "modules"
 msgstr "modules"
 
-#: C/jhbuild.xml:223(simpara) C/jhbuild.xml:1573(simpara)
+#: C/jhbuild.xml:211(simpara) C/jhbuild.xml:1834(simpara)
 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 "
@@ -452,33 +409,33 @@ msgid ""
 "literal>."
 msgstr ""
 
-#: C/jhbuild.xml:234(varname) C/jhbuild.xml:1379(varname)
+#: C/jhbuild.xml:222(varname) C/jhbuild.xml:1638(varname)
 msgid "checkoutroot"
 msgstr "checkoutroot"
 
-#: C/jhbuild.xml:236(simpara)
+#: C/jhbuild.xml:224(simpara)
 msgid ""
 "A string specifying the directory to unpack source trees to. Unless <link "
 "linkend=\"cfg-buildroot\"><varname>buildroot</varname></link> is set, builds "
-"will occur in this directory too. Defaults to <filename>~/checkout/gnome2</"
+"will occur in this directory too. Defaults to <filename>~/checkout/gnome</"
 "filename>."
 msgstr ""
 
-#: C/jhbuild.xml:244(varname) C/jhbuild.xml:1665(varname)
+#: C/jhbuild.xml:232(varname) C/jhbuild.xml:1926(varname)
 msgid "prefix"
 msgstr "prefix"
 
-#: C/jhbuild.xml:246(simpara) C/jhbuild.xml:1667(simpara)
+#: C/jhbuild.xml:234(simpara) C/jhbuild.xml:1928(simpara)
 msgid ""
 "A string specifying the prefix to install modules to. This directory must be "
-"writable. Defaults to <literal>'/opt/gnome2'</literal>."
+"writable. Defaults to <literal>'/opt/gnome'</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:252(varname) C/jhbuild.xml:1300(varname)
+#: C/jhbuild.xml:240(varname) C/jhbuild.xml:1559(varname)
 msgid "autogenargs"
 msgstr "autogenargs"
 
-#: C/jhbuild.xml:254(simpara)
+#: C/jhbuild.xml:242(simpara)
 msgid ""
 "A string containing arguments passed to the <command>autogen.sh</command> "
 "script of all modules. Can be overridden for particular modules using the "
@@ -486,21 +443,21 @@ msgid ""
 "varname></link> dictionary."
 msgstr ""
 
-#: C/jhbuild.xml:263(varname) C/jhbuild.xml:1450(varname)
+#: C/jhbuild.xml:251(varname) C/jhbuild.xml:1711(varname)
 msgid "makeargs"
 msgstr "makeargs"
 
-#: C/jhbuild.xml:265(simpara) C/jhbuild.xml:1452(simpara)
+#: C/jhbuild.xml:253(simpara) C/jhbuild.xml:1713(simpara)
 msgid ""
 "A string listing additional arguments to be passed to <command>make</"
 "command>. Defaults to <literal>''</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:274(title)
+#: C/jhbuild.xml:262(title)
 msgid "Build Prerequisites"
 msgstr "Voraussetzungen zur Erstellung"
 
-#: C/jhbuild.xml:276(para)
+#: C/jhbuild.xml:264(para)
 msgid ""
 "Before any modules can be built, it is necessary to have certain build tools "
 "installed. Common build tools include the GNU Autotools "
@@ -518,7 +475,7 @@ msgstr ""
 "<application>gcc</application>, <application>g++</application>), pkg-config "
 "und Python, je nachdem, welche Module erstellt werden sollen."
 
-#: C/jhbuild.xml:287(para)
+#: C/jhbuild.xml:275(para)
 msgid ""
 "JHBuild can check the tools are installed using the <command>sanitycheck</"
 "command> command:"
@@ -526,12 +483,12 @@ msgstr ""
 "JHBuild kann das Vorhandensein dieser Werkzeuge mit dem Befehl "
 "<command>sanitycheck</command> überprüfen:"
 
-#: C/jhbuild.xml:290(userinput) C/jhbuild.xml:1110(command)
+#: C/jhbuild.xml:278(userinput) C/jhbuild.xml:1352(command)
 #, no-wrap
 msgid "jhbuild sanitycheck"
 msgstr "jhbuild sanitycheck"
 
-#: C/jhbuild.xml:292(para)
+#: C/jhbuild.xml:280(para)
 msgid ""
 "If this command displays any messages, the errors can be fixed in one of two "
 "ways:"
@@ -539,7 +496,7 @@ msgstr ""
 "Falls dieser Befehl Fehlermeldungen ausgibt, können die Fehler auf folgende "
 "Arten behoben werden:"
 
-#: C/jhbuild.xml:297(simpara)
+#: 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</"
@@ -554,7 +511,7 @@ msgstr ""
 "command> nach der Installation der Distributionspakete erneut aus, um "
 "sicherzustellen, dass die benötigten Werkzeuge vorhanden sind."
 
-#: C/jhbuild.xml:306(simpara)
+#: C/jhbuild.xml:294(simpara)
 msgid ""
 "Run the <command>bootstrap</command> command to download, build and install "
 "the build prerequisites:"
@@ -563,12 +520,12 @@ msgstr ""
 "Voraussetzungen zur Erstellung herunterzuladen, zu erstellen und zu "
 "installieren:"
 
-#: C/jhbuild.xml:308(userinput) C/jhbuild.xml:596(command)
+#: C/jhbuild.xml:296(userinput) C/jhbuild.xml:838(command)
 #, no-wrap
 msgid "jhbuild bootstrap"
 msgstr "jhbuild bootstrap"
 
-#: C/jhbuild.xml:309(para)
+#: C/jhbuild.xml:297(para)
 msgid ""
 "When complete, run the <command>sanitycheck</command> command to verify the "
 "required tools are present."
@@ -577,7 +534,7 @@ msgstr ""
 "command> aus, um sicherzustellen, dass die benötigten Werkzeuge vorhanden "
 "sind."
 
-#: C/jhbuild.xml:314(para)
+#: 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 "
@@ -589,7 +546,7 @@ msgstr ""
 "nicht alle benötigten Pakete bereitstellt, müssen diese au�erhalb der JHBuild-"
 "Umgebung erstellt werden."
 
-#: C/jhbuild.xml:320(para)
+#: C/jhbuild.xml:308(para)
 msgid ""
 "The build tools dependencies include <application>m4</application>, "
 "<application>perl</application> and a C compiler (for example, "
@@ -599,11 +556,11 @@ msgstr ""
 "<application>perl</application> und ein C-Compiler (zum Beispiel "
 "<application>gcc</application>)."
 
-#: C/jhbuild.xml:331(title)
+#: C/jhbuild.xml:319(title)
 msgid "Using JHBuild"
 msgstr "Verwendung von JHBuild"
 
-#: C/jhbuild.xml:333(para)
+#: C/jhbuild.xml:321(para)
 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 "
@@ -614,12 +571,12 @@ msgstr ""
 "<filename>~/.jhbuildrc</filename> ausgewählten Module den folgenden Befehl "
 "aus:"
 
-#: C/jhbuild.xml:337(userinput) C/jhbuild.xml:616(command)
+#: C/jhbuild.xml:325(userinput) C/jhbuild.xml:858(command)
 #, no-wrap
 msgid "jhbuild build"
 msgstr "jhbuild build"
 
-#: C/jhbuild.xml:339(para)
+#: C/jhbuild.xml:327(para)
 msgid ""
 "JHBuild will download, configure, compile and install each of the modules. If "
 "an error occurs at any stage, JHBuild will present a menu asking what to do. "
@@ -634,22 +591,22 @@ msgstr ""
 "Ausführung aus verschiedenen Stufen, Aufgeben oder Ignorieren des Fehlers und "
 "Fortsetzen."
 
-#: C/jhbuild.xml:346(simpara)
+#: C/jhbuild.xml:334(simpara)
 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:349(para)
+#: C/jhbuild.xml:337(para)
 msgid "Below is an example of the menu displayed:"
 msgstr "Es folgt ein Beispiel des angezeigten Menüs:"
 
-#: C/jhbuild.xml:359(prompt)
+#: C/jhbuild.xml:347(prompt)
 msgid "choice:"
 msgstr "Auswahl:"
 
-#: C/jhbuild.xml:350(screen)
+#: C/jhbuild.xml:338(screen)
 #, no-wrap
 msgid ""
 "  [1] Rerun phase build\n"
@@ -664,7 +621,7 @@ msgid ""
 "<placeholder-1/> "
 msgstr ""
 
-#: C/jhbuild.xml:361(para)
+#: C/jhbuild.xml:349(para)
 msgid ""
 "It is also possible to build a different set of modules and their "
 "dependencies by passing the module names as arguments to the <command>build</"
@@ -674,23 +631,23 @@ msgstr ""
 "indem Sie die Modulnamen als Argumente an den <command>build</command>-Befehl "
 "übergeben. So erstellen Sie beispielsweise gtk+:"
 
-#: C/jhbuild.xml:366(userinput)
+#: C/jhbuild.xml:354(userinput)
 #, no-wrap
 msgid "jhbuild build gtk+"
 msgstr "jhbuild build gtk+"
 
-#: C/jhbuild.xml:368(para)
+#: C/jhbuild.xml:356(para)
 msgid ""
 "If JHBuild is cancelled part way through a build, it is possible to resume "
 "the build at a particular module using the <option>--start-at</option> option:"
 msgstr ""
 
-#: C/jhbuild.xml:372(userinput)
+#: C/jhbuild.xml:360(userinput)
 #, no-wrap
 msgid "jhbuild build --start-at=pango"
 msgstr "jhbuild build --start-at=pango"
 
-#: C/jhbuild.xml:374(para)
+#: C/jhbuild.xml:362(para)
 msgid ""
 "To build one or more modules, ignoring their dependencies, JHBuild provides "
 "the <command>buildone</command> command. For the <command>buildone</command> "
@@ -698,23 +655,23 @@ msgid ""
 "and installed or provided by distribution packages."
 msgstr ""
 
-#: C/jhbuild.xml:380(userinput)
+#: C/jhbuild.xml:368(userinput)
 #, no-wrap
 msgid "jhbuild buildone gtk+"
 msgstr "jhbuild buildone gtk+"
 
-#: C/jhbuild.xml:382(para)
+#: C/jhbuild.xml:370(para)
 msgid ""
 "To get a list of the modules and dependencies JHBuild will build, and the "
 "order they will be built, use the <command>list</command> command:"
 msgstr ""
 
-#: C/jhbuild.xml:386(userinput) C/jhbuild.xml:982(command)
+#: C/jhbuild.xml:374(userinput) C/jhbuild.xml:1224(command)
 #, no-wrap
 msgid "jhbuild list"
 msgstr "jhbuild list"
 
-#: C/jhbuild.xml:388(para)
+#: C/jhbuild.xml:376(para)
 msgid ""
 "To get information about a particular module, use the <command>info</command> "
 "command:"
@@ -722,12 +679,12 @@ msgstr ""
 "Um Informationen über ein bestimmtes Modul anzuzeigen, verwenden Sie den "
 "Befehl <command>info</command>:"
 
-#: C/jhbuild.xml:391(userinput)
+#: C/jhbuild.xml:379(userinput)
 #, no-wrap
 msgid "jhbuild info gtk+"
 msgstr "jhbuild info gtk+"
 
-#: C/jhbuild.xml:393(para)
+#: C/jhbuild.xml:381(para)
 msgid ""
 "To download or update all the software sources without building, use the "
 "<command>update</command> command. The <command>update</command> command "
@@ -735,12 +692,12 @@ msgid ""
 "useful if internet bandwidth varies."
 msgstr ""
 
-#: C/jhbuild.xml:399(userinput) C/jhbuild.xml:1218(command)
+#: C/jhbuild.xml:387(userinput) C/jhbuild.xml:1477(command)
 #, no-wrap
 msgid "jhbuild update"
 msgstr "jhbuild update"
 
-#: C/jhbuild.xml:401(para)
+#: C/jhbuild.xml:389(para)
 msgid ""
 "Later, JHBuild can build everything without downloading or updating the "
 "sources:"
@@ -748,12 +705,12 @@ msgstr ""
 "Später kann JHBuild alles ohne Herunterladen oder Aktualisieren der Quellen "
 "erstellen:"
 
-#: C/jhbuild.xml:404(userinput)
+#: C/jhbuild.xml:392(userinput)
 #, no-wrap
 msgid "jhbuild build --no-network"
 msgstr "jhbuild build --no-network"
 
-#: C/jhbuild.xml:406(para)
+#: C/jhbuild.xml:394(para)
 msgid ""
 "To run a particular command with the same environment used by JHBuild, use "
 "the <command>run</command> command:"
@@ -761,16 +718,16 @@ msgstr ""
 "Um einen Befehl in der auch von JHBuild genutzten Umgebung auszuführen, "
 "benutzen Sie den <command>run</command>-Befehl:"
 
-#: C/jhbuild.xml:409(replaceable) C/jhbuild.xml:1074(replaceable)
+#: C/jhbuild.xml:397(replaceable) C/jhbuild.xml:1316(replaceable)
 msgid "program"
 msgstr "Programm"
 
-#: C/jhbuild.xml:409(userinput)
+#: C/jhbuild.xml:397(userinput)
 #, no-wrap
 msgid "jhbuild run <placeholder-1/>"
 msgstr "jhbuild run <placeholder-1/>"
 
-#: C/jhbuild.xml:411(para)
+#: C/jhbuild.xml:399(para)
 msgid ""
 "To start a shell with the same environment used by JHBuild, use the "
 "<command>shell</command> command:"
@@ -778,16 +735,409 @@ msgstr ""
 "Um eine Shell in der auch von JHBuild genutzten Umgebung auszuführen, "
 "benutzen Sie den <command>shell</command>-Befehl:"
 
-#: C/jhbuild.xml:414(userinput) C/jhbuild.xml:1145(command)
+#: C/jhbuild.xml:402(userinput) C/jhbuild.xml:459(userinput)
+#: C/jhbuild.xml:1387(command)
 #, no-wrap
 msgid "jhbuild shell"
 msgstr "jhbuild shell"
 
-#: C/jhbuild.xml:420(title)
+#: C/jhbuild.xml:408(title)
+msgid "JHBuild and GNOME"
+msgstr "JHBuild und GNOME"
+
+#: C/jhbuild.xml:410(para)
+msgid ""
+"This section provides guidance on building, installing and running GNOME."
+msgstr ""
+
+#: C/jhbuild.xml:413(title)
+msgid "Building GNOME"
+msgstr "GNOME erstellen"
+
+#: C/jhbuild.xml:415(para)
+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)
+msgid ""
+"DocBook XML DTD and XSLT stylesheets. These need to be registered in the XML "
+"catalog (<filename>/etc/xml/catalog</filename>)."
+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)
+msgid "X libraries"
+msgstr "X-Bibliotheken"
+
+#: C/jhbuild.xml:427(simpara)
+msgid ""
+"<filename>libsmbclient</filename> from Samba (used for browsing Windows "
+"networks)."
+msgstr ""
+"<filename>libsmbclient</filename> aus Samba (wird zum Durchsuchen von Windows-"
+"Netzwerken verwendet)."
+
+#: C/jhbuild.xml:431(simpara)
+msgid "<filename>libbz2</filename> from bzip2."
+msgstr "<filename>libbz2</filename> aus bzip2."
+
+#: C/jhbuild.xml:434(simpara)
+msgid ""
+"<filename>libpng</filename>, <filename>libjpeg</filename> and "
+"<filename>libtiff</filename> (used for image loading)."
+msgstr ""
+"<filename>libpng</filename>, <filename>libjpeg</filename> und "
+"<filename>libtiff</filename> (verwendet zum Laden von Bildern)."
+
+#: C/jhbuild.xml:440(para)
+msgid ""
+"If installing distribution packages, and if applicable for your distribution, "
+"install the corresponding <quote>dev</quote> or <quote>devel</quote> "
+"packages. A list of <ulink url=\"http://live.gnome.org/JhbuildDependencies";
+"\">package names</ulink> for different distributions is maintained on the "
+"GNOME wiki."
+msgstr ""
+
+#: C/jhbuild.xml:449(title)
+msgid "Running a Single GNOME Application"
+msgstr "Ausführung einer einzelnen GNOME-Anwendung"
+
+#: C/jhbuild.xml:451(para)
+msgid ""
+"This section details how to run a single GNOME application. The application "
+"will run within the current desktop environment. To run the application "
+"within the complete JHBuild GNOME see <xref linkend=\"running-gnome\"/>."
+msgstr ""
+
+#: C/jhbuild.xml:456(para)
+msgid ""
+"Launch a JHBuild shell. The JHBuild shell has all the necessary environment "
+"variables set."
+msgstr ""
+"Starten Sie eine JHBuild-Shell. In der JHBuild-Shell sind bereits alle "
+"nötigen Umgebungsvariablen gesetzt."
+
+#: C/jhbuild.xml:461(para)
+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)
+#, no-wrap
+msgid ""
+"<placeholder-1/><placeholder-2/>\n"
+"/opt/gnome/bin/gedit"
+msgstr ""
+"<placeholder-1/><placeholder-2/>\n"
+"/opt/gnome/bin/gedit"
+
+#: C/jhbuild.xml:467(para)
+msgid "Run the application:"
+msgstr "Die Anwendung ausführen:"
+
+#: C/jhbuild.xml:469(userinput)
+#, no-wrap
+msgid "gedit &amp;"
+msgstr "gedit &amp;"
+
+#: C/jhbuild.xml:471(para)
+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)
+#, no-wrap
+msgid "jhbuild run gedit"
+msgstr "jhbuild run gedit"
+
+#: C/jhbuild.xml:478(title)
+msgid "Running the GNOME Desktop Environment"
+msgstr "Ausführung der GNOME-Arbeitsumgebung"
+
+#: C/jhbuild.xml:480(para)
+msgid ""
+"Create a new user account to run the JHBuild GNOME. Running JHBuild GNOME "
+"using different user account is recommended to avoid problems caused by user "
+"settings stored in the home directory. This manual refers to the new account "
+"as <systemitem class=\"username\">gnomedev</systemitem>."
+msgstr ""
+
+#: C/jhbuild.xml:486(para)
+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."
+msgstr ""
+
+#: C/jhbuild.xml:491(para)
+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:"
+
+#: C/jhbuild.xml:499(para)
+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)
+#, no-wrap
+msgid ""
+"<placeholder-1/> <placeholder-2/>\n"
+"2.20.1"
+msgstr ""
+"<placeholder-1/> <placeholder-2/>\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"
+
+#: C/jhbuild.xml:519(para) C/jhbuild.xml:590(para)
+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)
+msgid ""
+"Enable system services. JHBuild GNOME will use the <filename>/usr/bin</"
+"filename> system <application>D-Bus</application> daemon and the system "
+"services within <filename>/usr/share/dbus-1/system-services/</filename>. "
+"JHBuild GNOME will use the JHBuild session <application>D-Bus</application> "
+"daemon and the services within <filename><replaceable>/opt/gnome</"
+"replaceable>/share/dbus-1/services/</filename>. Replace <filename>/opt/gnome</"
+"filename> with GNOME install <varname>prefix</varname> in the command below:"
+msgstr ""
+
+#: C/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)
+#, no-wrap
+msgid "ln -s /var/run/dbus <placeholder-1/>/var/run"
+msgstr "ln -s /var/run/dbus <placeholder-1/>/var/run"
+
+#: C/jhbuild.xml:551(para)
+msgid ""
+"Create a GNOME startup script at <filename>~/.local/bin/gnome-jhbuild-xephyr-"
+"session</filename> with the following, replacing <filename>/opt/gnome</"
+"filename> with GNOME install <varname>prefix</varname>:"
+msgstr ""
+
+#: C/jhbuild.xml:557(programlisting) C/jhbuild.xml:613(programlisting)
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"\n"
+"GNOME=<replaceable>/opt/gnome</replaceable>\n"
+" \n"
+"GDK_USE_XFT=1\n"
+"XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME/share\n"
+"XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOME/etc/xdg\n"
+"\n"
+"jhbuild run gnome-session\n"
+msgstr ""
+"#!/bin/sh\n"
+"\n"
+"GNOME=<replaceable>/opt/gnome</replaceable>\n"
+" \n"
+"GDK_USE_XFT=1\n"
+"XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME/share\n"
+"XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOME/etc/xdg\n"
+"\n"
+"jhbuild run gnome-session\n"
+
+#: C/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)
+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)
+#, no-wrap
+msgid "chmod a+x /usr/bin/gnome-jhbuild-session"
+msgstr "chmod a+x /usr/bin/gnome-jhbuild-session"
+
+#: C/jhbuild.xml:630(para)
+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:"
+
+#: C/jhbuild.xml:635(programlisting)
+#, no-wrap
+msgid ""
+"[Desktop Entry]\n"
+"Name=GNOME (JHBuild)\n"
+"Comment=This session logs you into GNOME testing session\n"
+"TryExec=/usr/bin/gnome-jhbuild-session\n"
+"Exec=/usr/bin/gnome-jhbuild-session\n"
+"Icon=\n"
+"Type=Application"
+msgstr ""
+"[Desktop Entry]\n"
+"Name=GNOME (JHBuild)\n"
+"Comment=This session logs you into GNOME testing session\n"
+"TryExec=/usr/bin/gnome-jhbuild-session\n"
+"Exec=/usr/bin/gnome-jhbuild-session\n"
+"Icon=\n"
+"Type=Application"
+
+#: C/jhbuild.xml:643(para)
+msgid "Restart <command>gdm</command>."
+msgstr "Starten Sie <command>gdm</command> neu."
+
+#: C/jhbuild.xml:648(title)
+msgid "Running GNOME from the display manager"
+msgstr "GNOME über das Anmeldefenster ausführen"
+
+#: C/jhbuild.xml:650(para)
+msgid ""
+"To run the JHBuild GNOME, select the GNOME (JHBuild) session at the display "
+"manager before entering <systemitem class=\"username\">gnomedev</systemitem> "
+"login credentials. If successful, JHBuild GNOME will be displayed. If "
+"unsuccessful, check the log within the <filename>~gnomedev/.xsession-errors</"
+"filename> file."
+msgstr ""
+
+#: C/jhbuild.xml:662(title)
 msgid "Buildbot Integration"
 msgstr "Integration von Buildbot"
 
-#: C/jhbuild.xml:422(para)
+#: C/jhbuild.xml:664(para)
 msgid ""
 "Coupled with the <ulink url=\"http://buildbot.net\";>Buildbot</ulink> project, "
 "JHBuild can also function as a continuous integration tool. The Buildbot "
@@ -795,11 +1145,11 @@ msgid ""
 "org\">build.gnome.org</ulink>."
 msgstr ""
 
-#: C/jhbuild.xml:430(title)
+#: C/jhbuild.xml:672(title)
 msgid "Configuring a Buildbot Slave"
 msgstr "Konfigurieren eines Buildbot-Slaves"
 
-#: C/jhbuild.xml:432(para)
+#: C/jhbuild.xml:674(para)
 msgid ""
 "A Buildbot slave is a variation of a normal JHBuild installation that serves "
 "the requests of a Buildbot master. It is recommended to set up JHBuild and "
@@ -807,7 +1157,7 @@ msgid ""
 "Buildbot customizations."
 msgstr ""
 
-#: C/jhbuild.xml:439(para)
+#: C/jhbuild.xml:681(para)
 msgid ""
 "Buildbot commands are options to the <command>bot</command> command. To "
 "download and install the extra required software, run the following command:"
@@ -816,12 +1166,12 @@ msgstr ""
 "zusätzlich benötigte Software herunterzuladen und zu installieren, führen Sie "
 "den folgenden Befehl aus:"
 
-#: C/jhbuild.xml:445(userinput)
+#: C/jhbuild.xml:687(userinput)
 #, no-wrap
 msgid "jhbuild bot --setup"
 msgstr "jhbuild bot --setup"
 
-#: C/jhbuild.xml:447(para)
+#: C/jhbuild.xml:689(para)
 msgid ""
 "Once this step has completed successfully, three new configuration variables "
 "are required in <filename>~/.jhbuildrc</filename>."
@@ -829,7 +1179,7 @@ msgstr ""
 "Sobald dieser Schritt erfolgreich abgeschlossen ist, sind drei neue "
 "Konfigurationsvariablen in der <filename>~/.jhbuildrc</filename> erforderlich."
 
-#: C/jhbuild.xml:453(para)
+#: C/jhbuild.xml:695(para)
 msgid ""
 "It is not possible to use an alternate configuration file, the <link linkend="
 "\"option-file\"><option>--file</option></link> will not get desired effects."
@@ -838,7 +1188,7 @@ msgstr ""
 "Option <link linkend=\"option-file\"><option>--file</option></link> wird "
 "nicht die gewünschten Effekte erzielen."
 
-#: C/jhbuild.xml:460(programlisting)
+#: C/jhbuild.xml:702(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -851,7 +1201,7 @@ msgstr ""
 "jhbuildbot_slavename = 'slavename'\n"
 "jhbuildbot_password = 'password'\n"
 
-#: C/jhbuild.xml:466(para)
+#: C/jhbuild.xml:708(para)
 msgid ""
 "<varname>jhbuildbot_master</varname> is a string specifying the Buildbot "
 "master server; it defaults to <literal>'build.gnome.org:9070'</literal>. "
@@ -860,7 +1210,7 @@ msgid ""
 "administrators to obtain the slave name and password."
 msgstr ""
 
-#: C/jhbuild.xml:477(para)
+#: C/jhbuild.xml:719(para)
 msgid ""
 "The administrators of <ulink url=\"http://build.gnome.org\";>build.gnome.org</"
 "ulink> can be reached on the <ulink url=\"mailto:build-brigade-list gnome org"
@@ -870,43 +1220,43 @@ msgstr ""
 "ulink> sind über die <ulink url=\"mailto:build-brigade-list gnome org"
 "\">Mailingliste der Build Brigade</ulink> erreichbar."
 
-#: C/jhbuild.xml:497(title)
+#: C/jhbuild.xml:739(title)
 msgid "Command Reference"
 msgstr "Befehlsreferenz"
 
-#: C/jhbuild.xml:499(para)
+#: C/jhbuild.xml:741(para)
 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:502(command)
+#: C/jhbuild.xml:744(command)
 msgid "jhbuild"
 msgstr "jhbuild"
 
-#: C/jhbuild.xml:503(replaceable)
+#: C/jhbuild.xml:745(replaceable)
 msgid "global-options"
 msgstr "global-options"
 
-#: C/jhbuild.xml:504(replaceable)
+#: C/jhbuild.xml:746(replaceable)
 msgid "command"
 msgstr "command"
 
-#: C/jhbuild.xml:505(replaceable)
+#: C/jhbuild.xml:747(replaceable)
 msgid "command-arguments"
 msgstr "command-arguments"
 
-#: C/jhbuild.xml:508(para)
+#: C/jhbuild.xml:750(para)
 msgid "The global JHBuild options are:"
 msgstr "Folgende globale Optionen stehen für JHBuild zur Verfügung:"
 
-#: C/jhbuild.xml:512(term)
+#: C/jhbuild.xml:754(term)
 msgid ""
 "<option>-f</option>, <option>--file</option><replaceable>config</replaceable>"
 msgstr ""
 "<option>-f</option>, <option>--file</option><replaceable>Konfigurationsdatei</"
 "replaceable>"
 
-#: C/jhbuild.xml:515(simpara)
+#: C/jhbuild.xml:757(simpara)
 msgid ""
 "Use an alternative configuration file instead of the default <filename>~/."
 "jhbuildrc</filename>."
@@ -914,7 +1264,7 @@ msgstr ""
 "Eine alternative Konfiguration anstelle der vorgegebenen <filename>~/."
 "jhbuildrc</filename> verwenden."
 
-#: C/jhbuild.xml:521(term)
+#: C/jhbuild.xml:763(term)
 msgid ""
 "<option>-m</option>, <option>--moduleset</option><replaceable>moduleset</"
 "replaceable>"
@@ -922,32 +1272,32 @@ msgstr ""
 "<option>-m</option>, <option>--moduleset</option><replaceable>Modulsatz</"
 "replaceable>"
 
-#: C/jhbuild.xml:524(simpara)
+#: C/jhbuild.xml:766(simpara)
 msgid ""
 "Use a module set other than the module set listed in the configuration file. "
 "This option can be a relative path if the module set is located in the "
 "JHBuild moduleset folder, or an absolute path if located elsewhere."
 msgstr ""
 
-#: C/jhbuild.xml:532(option)
+#: C/jhbuild.xml:774(option)
 msgid "--no-interact"
 msgstr "--no-interact"
 
-#: C/jhbuild.xml:534(simpara)
+#: C/jhbuild.xml:776(simpara)
 msgid ""
 "Do not prompt the user for any input. This option is useful if leaving a "
 "build unattended, in order to ensure the build is not interrupted."
 msgstr ""
 
-#: C/jhbuild.xml:541(para)
+#: C/jhbuild.xml:783(para)
 msgid "Command specific options are listed below."
 msgstr "Befehlsspezifische Optionen werden nachstehend aufgelistet."
 
-#: C/jhbuild.xml:544(title)
+#: C/jhbuild.xml:786(title)
 msgid "autobuild"
 msgstr "autobuild"
 
-#: C/jhbuild.xml:546(para)
+#: C/jhbuild.xml:788(para)
 msgid ""
 "The <command>autobuild</command> command automatically builds the modules as "
 "specified in the configuration file, and then upload the results to "
@@ -957,56 +1307,57 @@ msgstr ""
 "Konfigurationsdatei angegebenen Module und überträgt die Ergebnisse zu "
 "JHAutobuild."
 
-#: C/jhbuild.xml:551(command)
+#: C/jhbuild.xml:793(command)
 msgid "jhbuild autobuild"
 msgstr "jhbuild autobuild"
 
-#: C/jhbuild.xml:552(arg) C/jhbuild.xml:617(arg) C/jhbuild.xml:815(arg)
-#: C/jhbuild.xml:1164(arg)
+#: 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:553(arg) C/jhbuild.xml:618(arg) C/jhbuild.xml:816(arg)
-#: C/jhbuild.xml:1165(arg)
+#: 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:554(replaceable) C/jhbuild.xml:555(replaceable)
-#: C/jhbuild.xml:624(replaceable) C/jhbuild.xml:625(replaceable)
-#: C/jhbuild.xml:634(arg) C/jhbuild.xml:824(arg) C/jhbuild.xml:875(replaceable)
-#: C/jhbuild.xml:876(replaceable) C/jhbuild.xml:902(arg) C/jhbuild.xml:960(arg)
-#: C/jhbuild.xml:986(replaceable) C/jhbuild.xml:990(arg)
-#: C/jhbuild.xml:1042(arg) C/jhbuild.xml:1168(replaceable)
-#: C/jhbuild.xml:1169(replaceable) C/jhbuild.xml:1174(arg)
-#: C/jhbuild.xml:1205(arg) C/jhbuild.xml:1219(replaceable)
-#: C/jhbuild.xml:1220(replaceable) C/jhbuild.xml:1224(arg)
-#: C/jhbuild.xml:1245(arg)
+#: 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:554(arg) C/jhbuild.xml:624(arg) C/jhbuild.xml:875(arg)
-#: C/jhbuild.xml:1168(arg) C/jhbuild.xml:1219(arg)
+#: 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:555(arg) C/jhbuild.xml:625(arg) C/jhbuild.xml:876(arg)
-#: C/jhbuild.xml:986(arg) C/jhbuild.xml:1169(arg) C/jhbuild.xml:1220(arg)
+#: 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:556(replaceable)
+#: C/jhbuild.xml:798(replaceable)
 msgid "reporturl"
 msgstr "reporturl"
 
-#: C/jhbuild.xml:556(arg)
+#: C/jhbuild.xml:798(arg)
 msgid "--report-url=<placeholder-1/>"
 msgstr "--report-url=<placeholder-1/>"
 
-#: C/jhbuild.xml:557(arg)
+#: C/jhbuild.xml:799(arg)
 msgid "--verbose"
 msgstr "--verbose"
 
-#: C/jhbuild.xml:560(para)
+#: 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 "
@@ -1018,7 +1369,7 @@ msgstr ""
 "linkend=\"command-reference-build\"><command>build</command></link> "
 "verarbeitet."
 
-#: C/jhbuild.xml:568(term)
+#: C/jhbuild.xml:810(term)
 msgid ""
 "<option>--report-url=<replaceable>reporturl</replaceable></option>, <option>-"
 "r <replaceable>reporturl</replaceable></option>"
@@ -1026,37 +1377,37 @@ msgstr ""
 "<option>--report-url=<replaceable>reporturl</replaceable></option>, <option>-"
 "r <replaceable>Berichtsadresse</replaceable></option>"
 
-#: C/jhbuild.xml:571(simpara)
+#: C/jhbuild.xml:813(simpara)
 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:577(term)
+#: C/jhbuild.xml:819(term)
 msgid "<option>--verbose</option>, <option>-v</option>"
 msgstr "<option>--verbose</option>, <option>-v</option>"
 
-#: C/jhbuild.xml:579(simpara)
+#: C/jhbuild.xml:821(simpara)
 msgid "If specified, JHBuild's output will be more verbose."
-msgstr ""
+msgstr "Falls angegeben, sind die Ausgaben von JHBuild ausführlicher."
 
-#: C/jhbuild.xml:588(title)
+#: C/jhbuild.xml:830(title)
 msgid "bootstrap"
 msgstr "bootstrap"
 
-#: C/jhbuild.xml:590(para)
+#: C/jhbuild.xml:832(para)
 msgid ""
 "The <command>bootstrap</command> command installs a set of build utilities "
 "required to build most modules (e.g. <application>autoconf</application>, "
 "<application>automake</application>, etc)."
 msgstr ""
 
-#: C/jhbuild.xml:599(para)
+#: C/jhbuild.xml:841(para)
 msgid ""
 "The <command>bootstrap</command> command builds modules using the same method "
 "as the <command>build</command> command, but uses the <filename>bootstrap."
 "modules</filename> moduleset."
 msgstr ""
 
-#: C/jhbuild.xml:603(para)
+#: C/jhbuild.xml:845(para)
 msgid ""
 "See the <link linkend=\"command-reference-build\"><command>build</command></"
 "link> command documentation for available options."
@@ -1064,11 +1415,11 @@ msgstr ""
 "Die verfügbaren Optionen finden Sie in der <link linkend=\"command-reference-"
 "build\">Dokumentation zu <command>build</command></link>."
 
-#: C/jhbuild.xml:610(title)
+#: C/jhbuild.xml:852(title)
 msgid "build"
 msgstr "build"
 
-#: C/jhbuild.xml:612(para)
+#: C/jhbuild.xml:854(para)
 msgid ""
 "The <command>build</command> command builds one or more packages, including "
 "their dependencies."
@@ -1076,78 +1427,77 @@ msgstr ""
 "Der Befehl <command>build</command> erstellt ein oder mehrere Pakete "
 "einschlie�lich deren Abhängigkeiten."
 
-#: C/jhbuild.xml:619(arg) C/jhbuild.xml:663(option) C/jhbuild.xml:817(arg)
-#| msgid "--distcheck"
+#: C/jhbuild.xml:861(arg) C/jhbuild.xml:905(option) C/jhbuild.xml:1059(arg)
 msgid "--check"
 msgstr "--check"
 
-#: C/jhbuild.xml:620(arg)
+#: C/jhbuild.xml:862(arg)
 msgid "--dist"
 msgstr "--dist"
 
-#: C/jhbuild.xml:621(arg) C/jhbuild.xml:679(option) C/jhbuild.xml:818(arg)
+#: C/jhbuild.xml:863(arg) C/jhbuild.xml:921(option) C/jhbuild.xml:1060(arg)
 msgid "--distcheck"
 msgstr "--distcheck"
 
-#: C/jhbuild.xml:622(arg) C/jhbuild.xml:687(option) C/jhbuild.xml:988(arg)
-#: C/jhbuild.xml:1222(arg)
+#: 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:623(arg) C/jhbuild.xml:819(arg) C/jhbuild.xml:1166(arg)
+#: C/jhbuild.xml:865(arg) C/jhbuild.xml:1061(arg) C/jhbuild.xml:1425(arg)
 msgid "--no-network"
 msgstr "--no-network"
 
-#: C/jhbuild.xml:626(replaceable) C/jhbuild.xml:987(replaceable)
-#: C/jhbuild.xml:1221(replaceable)
+#: C/jhbuild.xml:868(replaceable) C/jhbuild.xml:1229(replaceable)
+#: C/jhbuild.xml:1480(replaceable)
 msgid "tags"
 msgstr "tags"
 
-#: C/jhbuild.xml:626(arg) C/jhbuild.xml:987(arg) C/jhbuild.xml:1221(arg)
+#: 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:627(replaceable) C/jhbuild.xml:735(replaceable)
-#: C/jhbuild.xml:820(replaceable) C/jhbuild.xml:1170(replaceable)
-#: C/jhbuild.xml:1223(replaceable) C/jhbuild.xml:1244(replaceable)
+#: 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:627(arg) C/jhbuild.xml:820(arg) C/jhbuild.xml:1170(arg)
-#: C/jhbuild.xml:1223(arg) C/jhbuild.xml:1244(arg)
+#: 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:628(arg) C/jhbuild.xml:821(arg)
+#: C/jhbuild.xml:870(arg) C/jhbuild.xml:1063(arg)
 msgid "--no-xvfb"
 msgstr "--no-xvfb"
 
-#: C/jhbuild.xml:629(arg)
+#: C/jhbuild.xml:871(arg)
 msgid "--try-checkout"
 msgstr "--try-checkout"
 
-#: C/jhbuild.xml:630(arg)
+#: C/jhbuild.xml:872(arg)
 msgid "--no-poison"
 msgstr "--no-poison"
 
-#: C/jhbuild.xml:631(arg) C/jhbuild.xml:822(arg)
+#: C/jhbuild.xml:873(arg) C/jhbuild.xml:1064(arg)
 msgid "--force"
 msgstr "--force"
 
-#: C/jhbuild.xml:632(arg) C/jhbuild.xml:781(option)
+#: C/jhbuild.xml:874(arg) C/jhbuild.xml:1023(option)
 msgid "--build-optional-modules"
 msgstr "--build-optional-modules"
 
-#: C/jhbuild.xml:633(replaceable) C/jhbuild.xml:823(replaceable)
+#: C/jhbuild.xml:875(replaceable) C/jhbuild.xml:1065(replaceable)
 msgid "time"
 msgstr "time"
 
-#: C/jhbuild.xml:633(arg) C/jhbuild.xml:823(arg)
+#: C/jhbuild.xml:875(arg) C/jhbuild.xml:1065(arg)
 msgid "--min-age=<placeholder-1/>"
 msgstr "--min-age=<placeholder-1/>"
 
-#: C/jhbuild.xml:637(para) C/jhbuild.xml:879(para) C/jhbuild.xml:905(para)
-#: C/jhbuild.xml:993(para)
+#: C/jhbuild.xml:879(para) C/jhbuild.xml:1121(para) C/jhbuild.xml:1147(para)
+#: C/jhbuild.xml:1235(para)
 msgid ""
 "If no module names are provided on the command line, the <link linkend=\"cfg-"
 "modules\">modules</link> list from the configuration file will be used."
@@ -1156,11 +1506,11 @@ msgstr ""
 "linkend=\"cfg-modules\">Modulliste</link> aus der Konfigurationsdatei "
 "verwendet."
 
-#: C/jhbuild.xml:643(term)
+#: C/jhbuild.xml:885(term)
 msgid "<option>-a</option>, <option>--autogen</option>"
 msgstr "<option>-a</option>, <option>--autogen</option>"
 
-#: C/jhbuild.xml:645(simpara)
+#: 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 "
@@ -1168,42 +1518,41 @@ msgid ""
 "configure needs to be rebuilt or rerun."
 msgstr ""
 
-#: C/jhbuild.xml:655(term)
+#: C/jhbuild.xml:897(term)
 msgid "<option>-c</option>, <option>--clean</option>"
 msgstr "<option>-c</option>, <option>--clean</option>"
 
-#: C/jhbuild.xml:657(simpara)
+#: C/jhbuild.xml:899(simpara)
 msgid "Run <command>make clean</command> before building modules."
 msgstr "<command>make clean</command> vor der Erstellung von Modulen ausführen."
 
-#: C/jhbuild.xml:665(simpara)
-#| msgid "Run <command>make distcheck</command> after building modules."
+#: C/jhbuild.xml:907(simpara)
 msgid "Run <command>make check</command> after building modules."
 msgstr ""
 "<command>make check</command> nach der Erstellung von Modulen ausführen."
 
-#: C/jhbuild.xml:671(term)
+#: C/jhbuild.xml:913(term)
 msgid "<option>-d</option>, <option>--dist</option>"
 msgstr "<option>-d</option>, <option>--dist</option>"
 
-#: C/jhbuild.xml:673(simpara)
+#: C/jhbuild.xml:915(simpara)
 msgid "Run <command>make dist</command> after building modules."
 msgstr "<command>make dist</command> nach der Erstellung von Modulen ausführen."
 
-#: C/jhbuild.xml:681(simpara)
+#: C/jhbuild.xml:923(simpara)
 msgid "Run <command>make distcheck</command> after building modules."
 msgstr ""
 "<command>make distcheck</command> nach der Erstellung von Modulen ausführen."
 
-#: C/jhbuild.xml:689(simpara)
+#: C/jhbuild.xml:931(simpara)
 msgid "Do not build soft dependencies."
 msgstr "Keine weichen Abhängigkeiten erstellen."
 
-#: C/jhbuild.xml:694(term)
+#: C/jhbuild.xml:936(term)
 msgid "<option>-n</option>, <option>--no-network</option>"
 msgstr "<option>-n</option>, <option>--no-network</option>"
 
-#: C/jhbuild.xml:696(simpara)
+#: C/jhbuild.xml:938(simpara)
 msgid ""
 "Do not access the network when building modules. This will skip download or "
 "update stages in a build. If a module can't be built without network access, "
@@ -1214,7 +1563,7 @@ msgstr ""
 "Falls das Modul ohne Netzwerkzugriff nicht erstellt werden kann, wird die "
 "Erstellung des Moduls scheitern."
 
-#: C/jhbuild.xml:704(term)
+#: C/jhbuild.xml:946(term)
 msgid ""
 "<option>-s</option>, <option>--skip</option>=<replaceable>module,...</"
 "replaceable>"
@@ -1222,7 +1571,7 @@ msgstr ""
 "<option>-s</option>, <option>--skip</option>=<replaceable>Modul,â?¦</"
 "replaceable>"
 
-#: C/jhbuild.xml:707(simpara)
+#: C/jhbuild.xml:949(simpara)
 msgid ""
 "Do not build the listed modules. Used to skip the building of specified "
 "dependencies."
@@ -1230,17 +1579,17 @@ msgstr ""
 "Die aufgelisteten Module nicht erstellen. Wird benutzt, um die Erstellung "
 "spezifischer Abhängigkeiten zu überspringen."
 
-#: C/jhbuild.xml:713(term)
+#: C/jhbuild.xml:955(term)
 msgid "<option>--tags</option>=<replaceable>tag,...</replaceable>"
 msgstr "<option>--tags</option>=<replaceable>Tag, â?¦</replaceable>"
 
-#: C/jhbuild.xml:716(simpara)
+#: C/jhbuild.xml:958(simpara)
 msgid ""
 "Ignore modules that do not match <replaceable>tag</replaceable>. Modules are "
 "automatically attributed a tag matching the name of the module's module set."
 msgstr ""
 
-#: C/jhbuild.xml:724(term)
+#: C/jhbuild.xml:966(term)
 msgid ""
 "<option>-t</option>, <option>--start-at</option>=<replaceable>module</"
 "replaceable>"
@@ -1248,7 +1597,7 @@ msgstr ""
 "<option>-t</option>, <option>--start-at</option>=<replaceable>Modul</"
 "replaceable>"
 
-#: C/jhbuild.xml:727(simpara)
+#: C/jhbuild.xml:969(simpara)
 msgid ""
 "Start at the named module rather than at the beginning of the list. This "
 "option is useful if the build was interrupted."
@@ -1256,41 +1605,41 @@ msgstr ""
 "Beim genannten Modul anstatt am Beginn der Liste starten. Diese Option ist "
 "sinnvoll, wenn die Erstellung zuvor unterbrochen wurde."
 
-#: C/jhbuild.xml:734(option)
+#: C/jhbuild.xml:976(option)
 msgid "-D"
 msgstr "-D"
 
-#: C/jhbuild.xml:737(simpara)
+#: C/jhbuild.xml:979(simpara)
 msgid ""
 "If supported by the underlying version control system, update the source tree "
 "to the specified date before building. An ISO date format is required, e.g. "
 "<literal>\"2009-09-18 02:32Z\"</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:745(term)
+#: C/jhbuild.xml:987(term)
 msgid "<option>-x</option>, <option>--no-xvfb</option>"
 msgstr "<option>-x</option>, <option>--no-xvfb</option>"
 
-#: C/jhbuild.xml:747(simpara)
+#: C/jhbuild.xml:989(simpara)
 msgid ""
 "Run graphical tests on the actual X server rather than in a simulated Xvfb."
 msgstr ""
 
-#: C/jhbuild.xml:753(term)
+#: C/jhbuild.xml:995(term)
 msgid "<option>-C</option>, <option>--try-checkout</option>"
 msgstr "<option>-C</option>, <option>--try-checkout</option>"
 
-#: C/jhbuild.xml:756(simpara)
+#: C/jhbuild.xml:998(simpara)
 msgid ""
 "If the build fails, and if supported by the version control system, force a "
 "checkout and run <command>autogen.sh</command> before retrying the build."
 msgstr ""
 
-#: C/jhbuild.xml:764(term)
+#: C/jhbuild.xml:1006(term)
 msgid "<option>-N</option>, <option>--no-poison</option>"
 msgstr "<option>-N</option>, <option>--no-poison</option>"
 
-#: C/jhbuild.xml:766(simpara)
+#: C/jhbuild.xml:1008(simpara)
 msgid ""
 "If one or more of a module's dependencies failed, this option forces JHBuild "
 "to try to build the module anyway."
@@ -1298,16 +1647,16 @@ msgstr ""
 "Falls die Abhängigkeiten eines oder mehrerer Module scheitern, erzwingt dies "
 "die Erstellung des Moduls durch JHBuild."
 
-#: C/jhbuild.xml:773(term)
+#: C/jhbuild.xml:1015(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: C/jhbuild.xml:775(simpara)
+#: C/jhbuild.xml:1017(simpara)
 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:783(simpara)
+#: C/jhbuild.xml:1025(simpara)
 msgid ""
 "Modules listed as optional dependencies, may not be required to build the "
 "module. This option forces JHBuild to build optional dependencies."
@@ -1316,11 +1665,11 @@ msgstr ""
 "Erstellung des Zielmoduls notwendig. Diese Option zwingt JHBuild, diese "
 "Module trotzdem einzuschlieÃ?en."
 
-#: C/jhbuild.xml:790(term)
+#: C/jhbuild.xml:1032(term)
 msgid "<option>--min-time</option>=<replaceable>time</replaceable>"
 msgstr "<option>--min-time</option>=<replaceable>Zeit</replaceable>"
 
-#: C/jhbuild.xml:792(simpara)
+#: C/jhbuild.xml:1034(simpara)
 msgid ""
 "Skip modules installed more recently than the specified relative time. The "
 "<replaceable>time</replaceable> string format is a number followed by a unit. "
@@ -1329,11 +1678,11 @@ msgid ""
 "less than two hours ago."
 msgstr ""
 
-#: C/jhbuild.xml:807(title)
+#: C/jhbuild.xml:1049(title)
 msgid "buildone"
 msgstr "buildone"
 
-#: C/jhbuild.xml:809(para)
+#: C/jhbuild.xml:1051(para)
 msgid ""
 "The <command>buildone</command> command is similar to <command>build</"
 "command>, but it does not build the dependent modules. It is useful for "
@@ -1343,17 +1692,11 @@ msgstr ""
 "command>, erstellt jedoch keine abhängigen Module. Dies ist nützlich für das "
 "erneute Erstellen eines oder mehrerer Module."
 
-#: C/jhbuild.xml:814(command)
+#: C/jhbuild.xml:1056(command)
 msgid "jhbuild buildone"
 msgstr "jhbuild buildone"
 
-#: C/jhbuild.xml:827(para)
-#| msgid ""
-#| "The <option>--autogen</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."
+#: C/jhbuild.xml:1069(para)
 msgid ""
 "The <option>--autogen</option>, <option>--check</option>, <option>--clean</"
 "option>, <option>-d</option>, <option>--distcheck</option>, <option>--no-"
@@ -1367,34 +1710,34 @@ msgstr ""
 "wie für <link linkend=\"command-reference-build\"><command>build</command></"
 "link> verarbeitet."
 
-#: C/jhbuild.xml:835(para) C/jhbuild.xml:1252(para)
+#: C/jhbuild.xml:1077(para) C/jhbuild.xml:1511(para)
 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:841(title)
+#: C/jhbuild.xml:1083(title)
 msgid "checkbranches"
 msgstr "checkbranches"
 
-#: C/jhbuild.xml:843(para)
+#: C/jhbuild.xml:1085(para)
 msgid ""
 "The <command>checkbranches</command> checks the module's branches are defined "
 "correctly within the version control system and the branches are consistent "
 "with the module set."
 msgstr ""
 
-#: C/jhbuild.xml:848(command)
+#: C/jhbuild.xml:1090(command)
 msgid "jhbuild checkbranches"
 msgstr "jhbuild checkbranches"
 
-#: C/jhbuild.xml:849(replaceable)
+#: C/jhbuild.xml:1091(replaceable)
 msgid "branch"
 msgstr "branch"
 
-#: C/jhbuild.xml:849(arg)
+#: C/jhbuild.xml:1091(arg)
 msgid "--branch=<placeholder-1/>"
 msgstr "--branch=<placeholder-1/>"
 
-#: C/jhbuild.xml:854(term)
+#: C/jhbuild.xml:1096(term)
 msgid ""
 "<option>--branch</option>=<replaceable>branch</replaceable>, <option>-b</"
 "option><replaceable>branch</replaceable>"
@@ -1402,16 +1745,16 @@ msgstr ""
 "<option>--branch</option>=<replaceable>branch</replaceable>, <option>-b</"
 "option><replaceable>branch</replaceable>"
 
-#: C/jhbuild.xml:856(simpara)
+#: C/jhbuild.xml:1098(simpara)
 msgid "The branch to check."
 msgstr "Der auszucheckende Zweig."
 
-#: C/jhbuild.xml:861(userinput)
+#: C/jhbuild.xml:1103(userinput)
 #, no-wrap
 msgid "jhbuild -m gnome-2.20 checkbranches"
 msgstr "jhbuild -m gnome-2.20 checkbranches"
 
-#: C/jhbuild.xml:861(screen)
+#: C/jhbuild.xml:1103(screen)
 #, no-wrap
 msgid ""
 "<placeholder-1/> <placeholder-2/>\n"
@@ -1422,11 +1765,11 @@ msgstr ""
 "libgnomecanvas is missing branch definition for gnome-2-20\n"
 "<placeholder-3/>"
 
-#: C/jhbuild.xml:868(title)
+#: C/jhbuild.xml:1110(title)
 msgid "clean"
 msgstr "clean"
 
-#: C/jhbuild.xml:870(para)
+#: C/jhbuild.xml:1112(para)
 msgid ""
 "The <command>clean</command> command cleans the build directories of one or "
 "more modules."
@@ -1434,11 +1777,11 @@ msgstr ""
 "Der Befehl <command>clean</command> leert die Erstellungsordner von einem "
 "oder mehreren Modulen."
 
-#: C/jhbuild.xml:874(command)
+#: C/jhbuild.xml:1116(command)
 msgid "jhbuild clean"
 msgstr "jhbuild clean"
 
-#: C/jhbuild.xml:883(para)
+#: C/jhbuild.xml:1125(para)
 msgid ""
 "See the <link linkend=\"command-reference-build\"><command>build</command></"
 "link> command documentation for a description of available options."
@@ -1447,11 +1790,11 @@ msgstr ""
 "\"><command>build</command></link> finden Sie eine Beschreibung der "
 "verfügbaren Optionen."
 
-#: C/jhbuild.xml:890(title)
+#: C/jhbuild.xml:1132(title)
 msgid "dot"
 msgstr "dot"
 
-#: C/jhbuild.xml:892(para)
+#: C/jhbuild.xml:1134(para)
 msgid ""
 "The <command>dot</command> command generates a file describing the directed "
 "graph formed by the dependencies between a set of modules. This file can then "
@@ -1459,19 +1802,19 @@ msgid ""
 "ulink> software to produce a diagram."
 msgstr ""
 
-#: C/jhbuild.xml:899(command)
+#: C/jhbuild.xml:1141(command)
 msgid "jhbuild dot"
 msgstr "jhbuild dot"
 
-#: C/jhbuild.xml:900(arg)
+#: C/jhbuild.xml:1142(arg)
 msgid "--soft-deps"
 msgstr "--soft-deps"
 
-#: C/jhbuild.xml:901(arg)
+#: C/jhbuild.xml:1143(arg)
 msgid "--clusters"
 msgstr "--clusters"
 
-#: C/jhbuild.xml:909(para)
+#: C/jhbuild.xml:1151(para)
 msgid ""
 "The <option>--soft-deps</option> option adds dotted lines from the modules to "
 "the soft dependencies. The <option>--clusters</option> option groups modules "
@@ -1479,7 +1822,7 @@ msgid ""
 "together."
 msgstr ""
 
-#: C/jhbuild.xml:915(para)
+#: C/jhbuild.xml:1157(para)
 msgid ""
 "The output of the dot command can be piped to the dot utility to generate a "
 "PostScript file:"
@@ -1487,29 +1830,29 @@ msgstr ""
 "Die Ausgabe dieses Befehls kann leicht zum Befehl <command>dot</command> "
 "weitergeleitet werden, um eine PostScript-Datei zu erstellen:"
 
-#: C/jhbuild.xml:918(userinput)
+#: C/jhbuild.xml:1160(userinput)
 #, no-wrap
 msgid "jhbuild dot <placeholder-1/> | dot -Tps &gt; dependencies.ps"
 msgstr "jhbuild dot <placeholder-1/> | dot -Tps &gt; dependencies.ps"
 
-#: C/jhbuild.xml:920(para)
+#: C/jhbuild.xml:1162(para)
 msgid "Or a PNG image:"
 msgstr "Oder ein PNG-Bild:"
 
-#: C/jhbuild.xml:922(userinput)
+#: C/jhbuild.xml:1164(userinput)
 #, no-wrap
 msgid "jhbuild dot <placeholder-1/> | dot -Tpng &gt; dependencies.png"
 msgstr "jhbuild dot <placeholder-1/> | dot -Tpng &gt; dependencies.png"
 
-#: C/jhbuild.xml:925(title)
+#: C/jhbuild.xml:1167(title)
 msgid "Sample JHBuild dot output"
 msgstr "Beispielausgabe von dot in JHBuild"
 
-#: C/jhbuild.xml:938(title)
+#: C/jhbuild.xml:1180(title)
 msgid "gui"
 msgstr "gui"
 
-#: C/jhbuild.xml:940(para)
+#: C/jhbuild.xml:1182(para)
 msgid ""
 "The <command>gui</command> command starts a graphical interface to JHBuild "
 "which can be used to select modules to build and change some options."
@@ -1518,11 +1861,11 @@ msgstr ""
 "JHBuild, in welcher Module ausgewählt und einige Optionen angepasst werden "
 "können."
 
-#: C/jhbuild.xml:945(command)
+#: C/jhbuild.xml:1187(command)
 msgid "jhbuild gui"
 msgstr "jhbuild gui"
 
-#: C/jhbuild.xml:948(para)
+#: C/jhbuild.xml:1190(para)
 msgid ""
 "The graphical interface is rendered using GTK, so extra support libraries are "
 "required."
@@ -1530,11 +1873,11 @@ msgstr ""
 "Die erzeugte grafische Oberfläche benötigt GTK zur Darstellung, so dass "
 "einige unterstützende Bibliotheken erforderlich sein werden."
 
-#: C/jhbuild.xml:953(title)
+#: C/jhbuild.xml:1195(title)
 msgid "info"
 msgstr "info"
 
-#: C/jhbuild.xml:955(para)
+#: C/jhbuild.xml:1197(para)
 msgid ""
 "The <command>info</command> command displays information about one or more "
 "modules."
@@ -1542,23 +1885,24 @@ msgstr ""
 "Der Befehl <command>info</command> wird dazu verwendet, um Informationen über "
 "ein oder mehrere Module anzuzeigen."
 
-#: C/jhbuild.xml:959(command)
+#: C/jhbuild.xml:1201(command)
 msgid "jhbuild info"
 msgstr "jhbuild info"
 
-#: C/jhbuild.xml:963(para)
+#: C/jhbuild.xml:1205(para)
 msgid ""
 "The command displays the module name, type, dependencies, dependent packages, "
-"and the time it was last installed with JHBuild. If available, information "
-"specific to the module type such as the CVS repository or download URL will "
-"also be displayed."
+"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 und die Zeit der letzten Erstellung mit JHBuild aus. Falls "
-"verfügbar, können au�erdem Informationen bezüglich des Modultyps ausgegeben "
-"werden, wie den CVS-Softwarebestand oder die Downloadadresse."
+"abhängenden Pakete, den Quellordner und die Zeit der letzten Erstellung mit "
+"JHBuild aus. Falls verfügbar, können au�erdem Informationen bezüglich des "
+"Modultyps ausgegeben werden, wie den CVS-Softwarebestand oder die "
+"Downloadadresse."
 
-#: C/jhbuild.xml:969(para)
+#: C/jhbuild.xml:1211(para)
 msgid ""
 "If there is no module specified the command will display information about "
 "all the modules defined in the module set."
@@ -1566,38 +1910,33 @@ msgstr ""
 "Falls kein Modul angegeben wird, dann werden Informationen über alle im "
 "Modulsatz definierten Module ausgegeben."
 
-#: C/jhbuild.xml:975(title)
+#: C/jhbuild.xml:1217(title)
 msgid "list"
 msgstr "list"
 
-#: C/jhbuild.xml:977(para)
+#: C/jhbuild.xml:1219(para)
 msgid ""
 "The <command>list</command> command displays the expanded list of modules the "
 "<command>build</command> command would build."
 msgstr ""
 
-#: C/jhbuild.xml:983(arg)
+#: C/jhbuild.xml:1225(arg)
 msgid "-a"
 msgstr "-a"
 
-#: C/jhbuild.xml:984(arg)
+#: C/jhbuild.xml:1226(arg)
 msgid "-r"
 msgstr "-r"
 
-#: C/jhbuild.xml:985(arg)
+#: C/jhbuild.xml:1227(arg)
 msgid "-s"
 msgstr "-s"
 
-#: C/jhbuild.xml:989(arg) C/jhbuild.xml:1024(option)
+#: C/jhbuild.xml:1231(arg) C/jhbuild.xml:1266(option)
 msgid "--list-optional-modules"
 msgstr "--list-optional-modules"
 
-#: C/jhbuild.xml:997(para)
-#| msgid ""
-#| "The <option>--skip</option>, <option>--start-at</option>, <option>--tags</"
-#| "option>, <option>--start-at</option> and <option>--ignore-suggests</"
-#| "option> options are processed as per the <link linkend=\"command-reference-"
-#| "build\"><command>build</command></link> command."
+#: C/jhbuild.xml:1239(para)
 msgid ""
 "The <option>--skip</option>, <option>--start-at</option>, <option>--tags</"
 "option>, and <option>--ignore-suggests</option> options are processed as per "
@@ -1609,33 +1948,33 @@ msgstr ""
 "<link linkend=\"command-reference-build\"><command>build</command></link> "
 "verarbeitet."
 
-#: C/jhbuild.xml:1006(term)
+#: C/jhbuild.xml:1248(term)
 msgid "<option>-a</option>, <option>--all-modules</option>"
 msgstr "<option>-a</option>, <option>--all-modules</option>"
 
-#: C/jhbuild.xml:1009(simpara)
+#: C/jhbuild.xml:1251(simpara)
 msgid ""
 "List all the modules from the module set regardless of the build dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:1015(term)
+#: C/jhbuild.xml:1257(term)
 msgid "<option>-r</option>, <option>--show-revision</option>"
 msgstr "<option>-r</option>, <option>--show-revision</option>"
 
-#: C/jhbuild.xml:1018(simpara)
+#: C/jhbuild.xml:1260(simpara)
 msgid ""
 "If a module is set to a branch, show the branch name with the module name."
 msgstr ""
 
-#: C/jhbuild.xml:1026(simpara)
+#: C/jhbuild.xml:1268(simpara)
 msgid "This option forces JHBuild to list optional dependencies."
 msgstr "Diese Option zwingt JHBuild, optionale Abhängigkeiten aufzulisten."
 
-#: C/jhbuild.xml:1035(title)
+#: C/jhbuild.xml:1277(title)
 msgid "rdepends"
 msgstr "rdepends"
 
-#: C/jhbuild.xml:1037(para)
+#: C/jhbuild.xml:1279(para)
 msgid ""
 "The <command>rdepends</command> command displays the reverse dependencies of "
 "a module."
@@ -1643,53 +1982,53 @@ msgstr ""
 "Der Befehl <command>rdepends</command> zeigt die rekursiven Abhängigkeiten "
 "eines Moduls an."
 
-#: C/jhbuild.xml:1041(command)
+#: C/jhbuild.xml:1283(command)
 msgid "jhbuild rdepends"
 msgstr "jhbuild rdepends"
 
-#: C/jhbuild.xml:1047(option)
+#: C/jhbuild.xml:1289(option)
 msgid "--dependencies"
 msgstr "--dependencies"
 
-#: C/jhbuild.xml:1049(simpara)
+#: C/jhbuild.xml:1291(simpara)
 msgid "Show dependency path next to modules."
 msgstr "Zeigt den Abhängigkeitspfad neben den Modulen an."
 
-#: C/jhbuild.xml:1054(option)
+#: C/jhbuild.xml:1296(option)
 msgid "--direct"
 msgstr "--direct"
 
-#: C/jhbuild.xml:1056(simpara)
+#: C/jhbuild.xml:1298(simpara)
 msgid "Limit display to modules directly depending on specified module."
 msgstr ""
 
-#: C/jhbuild.xml:1064(title)
+#: C/jhbuild.xml:1306(title)
 msgid "run"
 msgstr "run"
 
-#: C/jhbuild.xml:1066(para)
+#: C/jhbuild.xml:1308(para)
 msgid ""
 "The <command>run</command> command runs the specified command using the same "
 "environment that JHBuild uses when building modules."
 msgstr ""
 
-#: C/jhbuild.xml:1071(command)
+#: C/jhbuild.xml:1313(command)
 msgid "jhbuild run"
 msgstr "jhbuild run"
 
-#: C/jhbuild.xml:1072(arg)
+#: C/jhbuild.xml:1314(arg)
 msgid "--in-builddir"
 msgstr "--in-builddir"
 
-#: C/jhbuild.xml:1073(arg)
+#: C/jhbuild.xml:1315(arg)
 msgid "--in-checkoutdir"
 msgstr "--in-checkoutdir"
 
-#: C/jhbuild.xml:1075(replaceable)
+#: C/jhbuild.xml:1317(replaceable)
 msgid "argument"
 msgstr "argument"
 
-#: C/jhbuild.xml:1078(para)
+#: C/jhbuild.xml:1320(para)
 msgid ""
 "If using JHBuild to build GNOME, this command can be useful in X startup "
 "scripts."
@@ -1697,27 +2036,27 @@ msgstr ""
 "Falls Sie JHBuild zur Erstellung von GNOME verwenden, kann dieser Befehl in X-"
 "Startskripten nützlich sein."
 
-#: C/jhbuild.xml:1083(term)
+#: C/jhbuild.xml:1325(term)
 msgid "<option>--in-builddir</option>=<replaceable>module</replaceable>"
 msgstr "<option>--in-builddir</option>=<replaceable>Modul</replaceable>"
 
-#: C/jhbuild.xml:1085(simpara)
+#: C/jhbuild.xml:1327(simpara)
 msgid "Run the command in the build directory of the specified module."
 msgstr "Führen Sie den Befehl im Erstellungesordner des angegebenen Moduls aus."
 
-#: C/jhbuild.xml:1093(term)
+#: C/jhbuild.xml:1335(term)
 msgid "<option>--in-checkoutdir</option>=<replaceable>module</replaceable>"
 msgstr "<option>--in-checkoutdir</option>=<replaceable>Modul</replaceable>"
 
-#: C/jhbuild.xml:1095(simpara)
+#: C/jhbuild.xml:1337(simpara)
 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:1104(title)
+#: C/jhbuild.xml:1346(title)
 msgid "sanitycheck"
 msgstr "sanitycheck"
 
-#: C/jhbuild.xml:1106(para)
+#: C/jhbuild.xml:1348(para)
 msgid ""
 "The <command>sanitycheck</command> command performs a number of checks to "
 "verify the build environment is okay."
@@ -1725,19 +2064,19 @@ 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:1113(para)
+#: C/jhbuild.xml:1355(para)
 msgid "Some of the checks include:"
 msgstr "Beispielsweise wird Folgendes überprüft:"
 
-#: C/jhbuild.xml:1117(simpara)
+#: C/jhbuild.xml:1359(simpara)
 msgid "The checkout and install prefixes are writable."
 msgstr "Ob die Präfixes für Checkout und Installation schreibbar sind."
 
-#: C/jhbuild.xml:1121(simpara)
+#: C/jhbuild.xml:1363(simpara)
 msgid "The required build tools are installed."
 msgstr "Ob die benötigten Erstellungswerkzeuge installiert sind."
 
-#: C/jhbuild.xml:1124(simpara)
+#: C/jhbuild.xml:1366(simpara)
 msgid ""
 "Some commonly used macros are available in the search paths of the "
 "<command>aclocal</command> commands associated with the various versions of "
@@ -1747,34 +2086,65 @@ msgstr ""
 "Versionen von <command>automake</command> zugeordneten <command>aclocal</"
 "command>-Befehle vorhanden sind."
 
-#: C/jhbuild.xml:1130(simpara)
+#: C/jhbuild.xml:1372(simpara)
 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:1138(title)
+#: C/jhbuild.xml:1380(title)
 msgid "shell"
 msgstr "shell"
 
-#: C/jhbuild.xml:1140(para)
+#: C/jhbuild.xml:1382(para)
 msgid ""
 "The <command>shell</command> command starts the user's shell with the same "
 "environment as JHBuild uses when building modules."
 msgstr ""
 
-#: C/jhbuild.xml:1148(para)
+#: C/jhbuild.xml:1390(para)
 msgid "This command is equivalent to the following:"
-msgstr ""
+msgstr "Dieser Befehl entspricht dem Folgenden:"
 
-#: C/jhbuild.xml:1150(userinput)
+#: C/jhbuild.xml:1392(userinput)
 #, no-wrap
 msgid "jhbuild run $SHELL"
 msgstr "jhbuild run $SHELL"
 
-#: C/jhbuild.xml:1154(title)
+#: C/jhbuild.xml:1394(para)
+msgid ""
+"The <envar>UNDER_JHBUILD</envar> environment variable will be set to \"true\" "
+"when this shell is active. You can use the presence of that variable to "
+"customize your shell's prompt to indicate that you indeed are under a jhbuild-"
+"controlled shell. For example, you may want to put this in your <filename>."
+"bashrc</filename>:"
+msgstr ""
+
+#: C/jhbuild.xml:1400(screen)
+#, no-wrap
+msgid ""
+"\n"
+"\tif [ -n \"$UNDER_JHBUILD\" ]; then\n"
+"\t    PS1=\"[jhbuild] $PS1\"\n"
+"\tfi\n"
+"      "
+msgstr ""
+"\n"
+"\tif [ -n \"$UNDER_JHBUILD\" ]; then\n"
+"\t    PS1=\"[jhbuild] $PS1\"\n"
+"\tfi\n"
+"      "
+
+#: C/jhbuild.xml:1406(para)
+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"
 
-#: C/jhbuild.xml:1156(para)
+#: C/jhbuild.xml:1415(para)
 msgid ""
 "The <command>tinderbox</command> command is similar to <command>build</"
 "command>, but writes all terminal output to HTML files suitable for "
@@ -1782,31 +2152,31 @@ msgid ""
 "Mozilla's Tinderbox, or Debian's Buildd."
 msgstr ""
 
-#: C/jhbuild.xml:1163(command)
+#: C/jhbuild.xml:1422(command)
 msgid "jhbuild tinderbox"
 msgstr "jhbuild tinderbox"
 
-#: C/jhbuild.xml:1167(replaceable)
+#: C/jhbuild.xml:1426(replaceable)
 msgid "directory"
 msgstr "directory"
 
-#: C/jhbuild.xml:1167(arg)
+#: C/jhbuild.xml:1426(arg)
 msgid "--output=<placeholder-1/>"
 msgstr "--output=<placeholder-1/>"
 
-#: C/jhbuild.xml:1171(arg)
+#: C/jhbuild.xml:1430(arg)
 msgid "-C"
 msgstr "-C"
 
-#: C/jhbuild.xml:1172(arg)
+#: C/jhbuild.xml:1431(arg)
 msgid "-N"
 msgstr "-N"
 
-#: C/jhbuild.xml:1173(arg)
+#: C/jhbuild.xml:1432(arg)
 msgid "-f"
 msgstr "-f"
 
-#: C/jhbuild.xml:1177(para)
+#: C/jhbuild.xml:1436(para)
 msgid ""
 "The <option>--autogen</option>, <option>--clean</option>, <option>--no-"
 "network</option>, <option>--skip</option>, <option>--start-at</option>, "
@@ -1820,7 +2190,7 @@ msgstr ""
 "option> werden ebenso wie für <link linkend=\"command-reference-build"
 "\"><command>build</command></link> verarbeitet."
 
-#: C/jhbuild.xml:1187(term)
+#: C/jhbuild.xml:1446(term)
 msgid ""
 "<option>-o</option>, <option>--output</option>=<replaceable>directory</"
 "replaceable>"
@@ -1828,35 +2198,35 @@ msgstr ""
 "<option>-o</option>, <option>--output</option>=<replaceable>Ordner</"
 "replaceable>"
 
-#: C/jhbuild.xml:1190(simpara)
+#: C/jhbuild.xml:1449(simpara)
 msgid "The directory to write the HTML files."
 msgstr "Der Ordner zum Speichern der HTML-Dateien."
 
-#: C/jhbuild.xml:1198(title)
+#: C/jhbuild.xml:1457(title)
 msgid "uninstall"
 msgstr "uninstall"
 
-#: C/jhbuild.xml:1200(para)
+#: C/jhbuild.xml:1459(para)
 msgid "The <command>uninstall</command> command uninstalls one or more modules."
 msgstr ""
 "Der Befehl <command>uninstall</command> deinstalliert ein oder mehrere Module."
 
-#: C/jhbuild.xml:1204(command)
+#: C/jhbuild.xml:1463(command)
 msgid "jhbuild uninstall"
 msgstr "jhbuild uninstall"
 
-#: C/jhbuild.xml:1211(title)
+#: C/jhbuild.xml:1470(title)
 msgid "update"
 msgstr "update"
 
-#: C/jhbuild.xml:1213(para)
+#: C/jhbuild.xml:1472(para)
 msgid ""
 "The <command>update</command> command is similar to <command>build</command>, "
 "but only performs the download or update stage for modules without building "
 "them."
 msgstr ""
 
-#: C/jhbuild.xml:1227(para)
+#: C/jhbuild.xml:1486(para)
 msgid ""
 "The <option>--skip</option>, <option>--start-at</option>, <option>--tags</"
 "option>, <option>--ignore-suggests</option> and <option>-D</option> options "
@@ -1868,32 +2238,32 @@ msgstr ""
 "werden ebenso wie für <link linkend=\"command-reference-build"
 "\"><command>build</command></link> verarbeitet."
 
-#: C/jhbuild.xml:1236(title)
+#: C/jhbuild.xml:1495(title)
 msgid "updateone"
 msgstr "updateone"
 
-#: C/jhbuild.xml:1238(para)
+#: C/jhbuild.xml:1497(para)
 msgid ""
 "The <command>updateone</command> command is similar to <command>update</"
 "command>, but it does not update the dependent modules. It is useful for "
 "updating one or more modules."
 msgstr ""
 
-#: C/jhbuild.xml:1243(command)
+#: C/jhbuild.xml:1502(command)
 msgid "jhbuild updateone"
 msgstr "jhbuild updateone"
 
-#: C/jhbuild.xml:1248(para)
+#: C/jhbuild.xml:1507(para)
 msgid ""
 "The <option>-D</option> option is processed as per the <link linkend="
 "\"command-reference-build\"><command>build</command></link> command."
 msgstr ""
 
-#: C/jhbuild.xml:1259(title)
+#: C/jhbuild.xml:1518(title)
 msgid "Configuration File Reference"
 msgstr "Referenz der Konfigurationsdatei"
 
-#: C/jhbuild.xml:1261(para)
+#: C/jhbuild.xml:1520(para)
 msgid ""
 "The <filename>~/.jhbuildrc</filename> file uses standard Python syntax. The "
 "file is run, and the resulting variables defined in the namespace are used to "
@@ -1901,59 +2271,59 @@ msgid ""
 "namespace before running the user's configuration file."
 msgstr ""
 
-#: C/jhbuild.xml:1267(para)
+#: C/jhbuild.xml:1526(para)
 msgid ""
 "Boolean configuration variables are set using syntax as demonstrated in the "
 "following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1269(programlisting)
+#: C/jhbuild.xml:1528(programlisting)
 #, no-wrap
 msgid "use_local_modulesets = True"
 msgstr "use_local_modulesets = True"
 
-#: C/jhbuild.xml:1271(para)
+#: C/jhbuild.xml:1530(para)
 msgid ""
 "String configuration variables are set using syntax as demonstrated in the "
 "following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1273(programlisting)
+#: C/jhbuild.xml:1532(programlisting)
 #, no-wrap
 msgid "autogenargs = '--disable-static --disable-gtk-doc'"
 msgstr "autogenargs = '--disable-static --disable-gtk-doc'"
 
-#: C/jhbuild.xml:1275(para)
+#: C/jhbuild.xml:1534(para)
 msgid ""
 "List configuration variables are set using syntax as demonstrated in the "
 "following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1277(programlisting)
+#: C/jhbuild.xml:1536(programlisting)
 #, no-wrap
 msgid "skip = ['mozilla', 'pulseaudio']"
 msgstr "skip = ['mozilla', 'pulseaudio']"
 
-#: C/jhbuild.xml:1279(para)
+#: C/jhbuild.xml:1538(para)
 msgid ""
 "Dictionary configuration variables are set using syntax as demonstrated in "
 "the following example:"
 msgstr ""
 
-#: C/jhbuild.xml:1281(programlisting) C/jhbuild.xml:1707(programlisting)
+#: C/jhbuild.xml:1540(programlisting) C/jhbuild.xml:1968(programlisting)
 #, 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:1284(title)
+#: C/jhbuild.xml:1543(title)
 msgid "Configuration Variables"
 msgstr "Konfigurationsvariablen"
 
-#: C/jhbuild.xml:1289(varname)
+#: C/jhbuild.xml:1548(varname)
 msgid "alwaysautogen"
 msgstr "alwaysautogen"
 
-#: C/jhbuild.xml:1291(simpara)
+#: C/jhbuild.xml:1550(simpara)
 msgid ""
 "A boolean value if set to <constant>True</constant>, always run "
 "<command>autogen.sh</command> before <command>make</command>, even if a "
@@ -1961,18 +2331,18 @@ msgid ""
 "option> option to JHBuild. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1302(simpara)
+#: C/jhbuild.xml:1561(simpara)
 msgid ""
 "A string containing arguments passed to the <command>autogen.sh</command> "
 "script of all modules. Can be overridden for particular modules using the "
 "<varname>module_autogenargs</varname> dictionary."
 msgstr ""
 
-#: C/jhbuild.xml:1310(varname)
+#: C/jhbuild.xml:1569(varname)
 msgid "branches"
 msgstr "branches"
 
-#: C/jhbuild.xml:1312(simpara)
+#: C/jhbuild.xml:1571(simpara)
 msgid ""
 "A dictionary that can be used to override the branch used for a particular "
 "module. This is useful if you are making some changes on a branch of a module "
@@ -1980,17 +2350,17 @@ msgid ""
 "set."
 msgstr ""
 
-#: C/jhbuild.xml:1317(simpara)
+#: C/jhbuild.xml:1576(simpara)
 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:"
 
-#: C/jhbuild.xml:1320(simpara)
+#: C/jhbuild.xml:1579(simpara)
 msgid "CVS: revision. E.g. <literal>'BRANCH-PROJECT-0_8'</literal>"
 msgstr "CVS: Revision. Beispielsweise <literal>'BRANCH-PROJECT-0_8'</literal>"
 
-#: C/jhbuild.xml:1323(simpara)
+#: C/jhbuild.xml:1582(simpara)
 msgid ""
 "Bazaar: URI of module branch. E.g. <literal>'http://bzr.example.net/project/";
 "gnome-2-28'</literal>"
@@ -1998,14 +2368,14 @@ msgstr ""
 "Bazaar: Adresse des Modulzweiges. Beispielsweise <literal>'http://bzr.example.";
 "net/project/gnome-2-28'</literal>"
 
-#: C/jhbuild.xml:1326(simpara)
+#: C/jhbuild.xml:1585(simpara)
 msgid ""
 "Git: tuple, with first part being an optional repository (or the None value) "
 "and the second part the name of the branch. E.g. <literal>('git://git.example."
 "net/project', 'gnome-2-28')</literal>"
 msgstr ""
 
-#: C/jhbuild.xml:1331(simpara)
+#: C/jhbuild.xml:1590(simpara)
 msgid ""
 "Subversion: URI of module branch E.g. <literal>'svn://svn.example.net/project/"
 "gnome-2-28'</literal>"
@@ -2013,11 +2383,11 @@ msgstr ""
 "Subversion: Adresse des Modulzweiges. Beispielsweise <literal>'svn://svn."
 "example.net/project/gnome-2-28'</literal>"
 
-#: C/jhbuild.xml:1338(varname)
+#: C/jhbuild.xml:1597(varname)
 msgid "builddir_pattern"
 msgstr "builddir_pattern"
 
-#: C/jhbuild.xml:1340(simpara)
+#: C/jhbuild.xml:1599(simpara)
 msgid ""
 "A <function>printf</function> style formatting pattern used to generate build "
 "directory names. This is only used when using separate source and build "
@@ -2025,33 +2395,33 @@ msgid ""
 "the source directory name. Defaults to <literal>'%s'</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1349(varname)
+#: C/jhbuild.xml:1608(varname)
 msgid "buildroot"
 msgstr "buildroot"
 
-#: C/jhbuild.xml:1351(simpara)
+#: C/jhbuild.xml:1610(simpara)
 msgid ""
 "A string specifying the parent directory to place build trees. Defaults to "
 "<constant>None</constant>, which causes builds to be performed within the "
 "source trees."
 msgstr ""
 
-#: C/jhbuild.xml:1358(varname)
+#: C/jhbuild.xml:1617(varname)
 msgid "buildscript"
 msgstr "buildscript"
 
-#: C/jhbuild.xml:1360(simpara)
+#: C/jhbuild.xml:1619(simpara)
 msgid ""
 "A string specifying which buildscript to use. The recommended setting is the "
 "default, <literal>terminal</literal>. In particular, do not set to "
 "<literal>gtk</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1367(varname)
+#: C/jhbuild.xml:1626(varname)
 msgid "build_policy"
 msgstr "build_policy"
 
-#: C/jhbuild.xml:1369(simpara)
+#: C/jhbuild.xml:1628(simpara)
 msgid ""
 "A string specifying which modules to build. The three possible options are "
 "<literal>all</literal>, to build all modules requested, <literal>updated</"
@@ -2060,18 +2430,18 @@ msgid ""
 "have changed. Defaults to <literal>all</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1381(simpara)
+#: C/jhbuild.xml:1640(simpara)
 msgid ""
 "A string specifying the directory to unpack source trees to. Unless "
 "<varname>buildroot</varname> is set, builds will occur in this directory too. "
-"Defaults to <filename>~/checkout/gnome2</filename>."
+"Defaults to <filename>~/checkout/gnome</filename>."
 msgstr ""
 
-#: C/jhbuild.xml:1388(varname)
+#: C/jhbuild.xml:1647(varname)
 msgid "checkout_mode"
 msgstr "checkout_mode"
 
-#: C/jhbuild.xml:1390(simpara)
+#: C/jhbuild.xml:1649(simpara)
 msgid ""
 "A string specifying how the checkout is performed for directories in version "
 "control. Defaults to <literal>update</literal>. This can be set per module "
@@ -2083,32 +2453,33 @@ msgid ""
 "different from the one it will build)."
 msgstr ""
 
-#: C/jhbuild.xml:1404(varname)
+#: C/jhbuild.xml:1663(varname)
 msgid "copy_dir"
 msgstr "copy_dir"
 
-#: C/jhbuild.xml:1406(simpara)
+#: C/jhbuild.xml:1665(simpara)
 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."
 msgstr ""
 
-#: C/jhbuild.xml:1413(varname)
+#: C/jhbuild.xml:1672(varname)
 msgid "cvs_program"
 msgstr "cvs_program"
 
-#: C/jhbuild.xml:1415(simpara)
+#: C/jhbuild.xml:1674(simpara)
 msgid ""
-"A string specifying which program to use for CVS support. Defaults to "
+"A string specifying which program to use for CVS support. This can be "
+"<literal>git-cvsimport</literal>, or <literal>cvs</literal>. Defaults to "
 "<literal>cvs</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1420(varname)
+#: C/jhbuild.xml:1681(varname)
 msgid "installprog"
 msgstr "installprog"
 
-#: C/jhbuild.xml:1422(simpara)
+#: C/jhbuild.xml:1683(simpara)
 msgid ""
 "A string specifying a program to use as replacement for <literal>/usr/bin/"
 "install</literal>. If available, defaults to the <literal>install-check</"
@@ -2116,85 +2487,85 @@ msgid ""
 "wrapper optimizes header installation to reduce the time taken for rebuilds."
 msgstr ""
 
-#: C/jhbuild.xml:1432(varname)
+#: C/jhbuild.xml:1693(varname)
 msgid "ignore_suggests"
 msgstr "ignore_suggests"
 
-#: C/jhbuild.xml:1434(simpara)
+#: C/jhbuild.xml:1695(simpara)
 msgid ""
 "A boolean value specifying whether to ignore soft dependencies when "
 "calculating the dependency tree. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1440(varname)
+#: C/jhbuild.xml:1701(varname)
 msgid "interact"
 msgstr "interact"
 
-#: C/jhbuild.xml:1442(simpara)
+#: C/jhbuild.xml:1703(simpara)
 msgid ""
 "A boolean value specifying whether to interact with the user. Setting this "
 "value to <constant>False</constant> is equivalent to passing the <option>--no-"
 "interact</option> option. Defaults to <constant>True</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1458(varname)
+#: C/jhbuild.xml:1719(varname)
 msgid "makecheck"
 msgstr "makecheck"
 
-#: C/jhbuild.xml:1460(simpara)
+#: C/jhbuild.xml:1721(simpara)
 msgid ""
 "A boolean value specifying whether to run <command>make check</command> after "
 "<command>make</command>. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1467(varname)
+#: C/jhbuild.xml:1728(varname)
 msgid "makecheck_advisory"
 msgstr "makecheck_advisory"
 
-#: C/jhbuild.xml:1469(simpara)
+#: C/jhbuild.xml:1730(simpara)
 msgid ""
 "A boolean value specifying whether failures when running <command>make check</"
 "command> should be advisory only and not cause a build failure. Defaults to "
 "<constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1475(varname)
+#: C/jhbuild.xml:1736(varname)
 msgid "makeclean"
 msgstr "makeclean"
 
-#: C/jhbuild.xml:1477(simpara)
+#: C/jhbuild.xml:1738(simpara)
 msgid ""
 "A boolean value specifying whether to run <command>make clean</command> "
 "before <command>make</command>. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1484(varname)
+#: C/jhbuild.xml:1745(varname)
 msgid "makedist"
 msgstr "makedist"
 
-#: C/jhbuild.xml:1486(simpara)
+#: C/jhbuild.xml:1747(simpara)
 msgid ""
 "A boolean value specifying whether to run <command>make dist</command> after "
 "<command>make</command>. Defaults to <constant>False</constant>. This setting "
 "is equivalent to passing the <option>--dist</option> option."
 msgstr ""
 
-#: C/jhbuild.xml:1494(varname)
+#: C/jhbuild.xml:1755(varname)
 msgid "makedistcheck"
 msgstr "makedistcheck"
 
-#: C/jhbuild.xml:1496(simpara)
+#: C/jhbuild.xml:1757(simpara)
 msgid ""
 "A boolean value specifying whether to run <command>make distcheck</command> "
 "after <command>make</command>. Defaults to <constant>False</constant>. This "
 "setting is equivalent to passing the <option>--distcheck</option> option."
 msgstr ""
 
-#: C/jhbuild.xml:1504(varname)
+#: C/jhbuild.xml:1765(varname)
 msgid "module_autogenargs"
 msgstr "module_autogenargs"
 
-#: C/jhbuild.xml:1506(simpara)
+#: C/jhbuild.xml:1767(simpara)
 msgid ""
 "A dictionary mapping module names to strings specifying the arguments to be "
 "passed to <command>autogen.sh</command>. The setting in "
@@ -2203,21 +2574,21 @@ msgid ""
 "in the dictionary, the global <varname>autogenargs</varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1516(varname)
+#: C/jhbuild.xml:1777(varname)
 msgid "module_checkout_mode"
 msgstr "module_checkout_mode"
 
-#: C/jhbuild.xml:1518(simpara)
+#: C/jhbuild.xml:1779(simpara)
 msgid ""
 "A dictionary specifying which checkout mode to use for modules. This "
 "overrides the global <varname>checkout_mode</varname> setting."
 msgstr ""
 
-#: C/jhbuild.xml:1524(varname)
+#: C/jhbuild.xml:1785(varname)
 msgid "module_makeargs"
 msgstr "module_makeargs"
 
-#: C/jhbuild.xml:1526(simpara)
+#: C/jhbuild.xml:1787(simpara)
 msgid ""
 "A dictionary mapping module names to strings specifying the arguments to pass "
 "to <command>make</command>. The setting in <varname>module_makeargs</varname> "
@@ -2226,12 +2597,11 @@ msgid ""
 "be used."
 msgstr ""
 
-#: C/jhbuild.xml:1536(varname)
-#| msgid "makecheck"
+#: C/jhbuild.xml:1797(varname)
 msgid "module_makecheck"
 msgstr "module_makecheck"
 
-#: C/jhbuild.xml:1538(simpara)
+#: C/jhbuild.xml:1799(simpara)
 msgid ""
 "A dictionary mapping module names to boolean values specifying whether to run "
 "<command>make check</command> after <command>make</command>. The setting in "
@@ -2240,12 +2610,11 @@ msgid ""
 "<varname>makecheck</varname> will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1549(varname)
-#| msgid "nopoison"
+#: C/jhbuild.xml:1810(varname)
 msgid "module_nopoison"
 msgstr "module_nopoison"
 
-#: C/jhbuild.xml:1551(simpara)
+#: C/jhbuild.xml:1812(simpara)
 msgid ""
 "A dictionary mapping module names to boolean values. If a module is set to "
 "<constant>True</constant>, JHBuild will attempt to build dependent modules "
@@ -2255,42 +2624,42 @@ msgid ""
 "will be used."
 msgstr ""
 
-#: C/jhbuild.xml:1562(varname)
+#: C/jhbuild.xml:1823(varname)
 msgid "module_extra_env"
 msgstr "module_extra_env"
 
-#: C/jhbuild.xml:1564(simpara)
+#: C/jhbuild.xml:1825(simpara)
 msgid ""
 "A dictionary mapping module names to dictionaries with extra environment "
 "variables to pass when executing commands for the module."
 msgstr ""
 
-#: C/jhbuild.xml:1596(varname)
+#: C/jhbuild.xml:1857(varname)
 msgid "modulesets_dir"
 msgstr "modulesets_dir"
 
-#: C/jhbuild.xml:1598(simpara)
+#: C/jhbuild.xml:1859(simpara)
 msgid ""
 "A string specifying the directory containing the modulesets to use. Defaults "
 "to the <filename>modulesets/</filename> directory in JHBuild sources."
 msgstr ""
 
-#: C/jhbuild.xml:1605(varname)
+#: C/jhbuild.xml:1866(varname)
 msgid "nobuild"
 msgstr "nobuild"
 
-#: C/jhbuild.xml:1607(simpara)
+#: C/jhbuild.xml:1868(simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> JHBuild will not build "
 "modules, but just download and unpack the sources. The default vale is "
 "<constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1614(varname)
+#: C/jhbuild.xml:1875(varname)
 msgid "nonetwork"
 msgstr "nonetwork"
 
-#: C/jhbuild.xml:1616(simpara)
+#: C/jhbuild.xml:1877(simpara)
 msgid ""
 "A boolean value specifying whether to access the network. This affects "
 "checking out or updating CVS modules, downloading tarballs and updating "
@@ -2299,11 +2668,11 @@ msgid ""
 "<constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1625(varname)
+#: C/jhbuild.xml:1886(varname)
 msgid "nonotify"
 msgstr "nonotify"
 
-#: C/jhbuild.xml:1627(simpara)
+#: C/jhbuild.xml:1888(simpara)
 msgid ""
 "A boolean value specifying whether to emit notifications using the "
 "notification daemon. If set to <constant>True</constant>, notifications are "
@@ -2311,11 +2680,11 @@ msgid ""
 "defaults to <constant>True</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1635(varname)
+#: C/jhbuild.xml:1896(varname)
 msgid "nopoison"
 msgstr "nopoison"
 
-#: C/jhbuild.xml:1637(simpara)
+#: C/jhbuild.xml:1898(simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> JHBuild attempts to "
 "build modules even if one or more of the module's dependencies failed to "
@@ -2323,11 +2692,11 @@ msgid ""
 "argument. The default value is <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1645(varname)
+#: C/jhbuild.xml:1906(varname)
 msgid "notrayicon"
 msgstr "notrayicon"
 
-#: C/jhbuild.xml:1647(simpara)
+#: C/jhbuild.xml:1908(simpara)
 msgid ""
 "A boolean value specifying whether to show an icon in the system tray using "
 "Zenity. If set to <constant>True</constant>, notifications are not emitted. "
@@ -2335,11 +2704,11 @@ msgid ""
 "defaults to <constant>True</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1655(varname)
+#: C/jhbuild.xml:1916(varname)
 msgid "noxvfb"
 msgstr "noxvfb"
 
-#: C/jhbuild.xml:1657(simpara)
+#: C/jhbuild.xml:1918(simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> JHBuild will run any "
 "graphical tests on the real X server, rather than using <command>Xvfb</"
@@ -2347,39 +2716,39 @@ msgid ""
 "The default value is <constant>False</constant>"
 msgstr ""
 
-#: C/jhbuild.xml:1673(varname)
+#: C/jhbuild.xml:1934(varname)
 msgid "pretty_print"
 msgstr "pretty_print"
 
-#: C/jhbuild.xml:1675(simpara)
+#: C/jhbuild.xml:1936(simpara)
 msgid ""
 "A boolean value specifying whether to pretty format the subprocess output. "
 "Only CVS output supports pretty printing. Disable if the pretty printing "
 "causes problems. Defaults to <literal>True</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1682(varname)
+#: C/jhbuild.xml:1943(varname)
 msgid "progress_bar"
 msgstr "progress_bar"
 
-#: C/jhbuild.xml:1684(simpara)
+#: C/jhbuild.xml:1945(simpara)
 msgid ""
 "A boolean value specifying whether to display a progress bar during <link "
 "linkend=\"cfg-quiet-mode\">quiet mode </link>. Defaults to <literal>True</"
 "literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1690(varname)
+#: C/jhbuild.xml:1951(varname)
 msgid "quiet_mode"
 msgstr "quiet_mode"
 
-#: C/jhbuild.xml:1692(simpara)
+#: C/jhbuild.xml:1953(simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> disables the output of "
 "running commands. Defaults to <literal>False</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1700(simpara)
+#: C/jhbuild.xml:1961(simpara)
 msgid ""
 "A dictionary specifying an alternative repository location for a particular "
 "repository. This configuration variable is useful to a module developer. By "
@@ -2388,21 +2757,21 @@ msgid ""
 "values are the alternative repository location strings. For example:"
 msgstr ""
 
-#: C/jhbuild.xml:1711(varname)
+#: C/jhbuild.xml:1972(varname)
 msgid "skip"
 msgstr "skip"
 
-#: C/jhbuild.xml:1713(simpara)
+#: C/jhbuild.xml:1974(simpara)
 msgid ""
 "A list of modules to skip. This <option>--skip</option> command line option "
 "extends the list. This list is empty by default."
 msgstr ""
 
-#: C/jhbuild.xml:1719(varname)
+#: C/jhbuild.xml:1980(varname)
 msgid "sticky_date"
 msgstr "sticky_date"
 
-#: C/jhbuild.xml:1721(simpara)
+#: C/jhbuild.xml:1982(simpara)
 msgid ""
 "A string if set, and if supported by the underlying version control system, "
 "JHBuild will update the source tree to the specified date before building. An "
@@ -2411,22 +2780,22 @@ msgid ""
 "Defaults to <constant>None</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1730(varname)
+#: C/jhbuild.xml:1991(varname)
 msgid "svn_program"
 msgstr "svn_program"
 
-#: C/jhbuild.xml:1732(simpara)
+#: C/jhbuild.xml:1993(simpara)
 msgid ""
 "A string specifying which program to use for subversion support. This can be "
-"<literal>svn</literal> or <literal>bzr</literal>. Defaults to <literal>svn</"
-"literal>."
+"<literal>svn</literal>, <literal>git-svn</literal> or <literal>bzr</literal>. "
+"Defaults to <literal>svn</literal>."
 msgstr ""
 
-#: C/jhbuild.xml:1739(varname)
+#: C/jhbuild.xml:2000(varname)
 msgid "tarballdir"
 msgstr "tarballdir"
 
-#: C/jhbuild.xml:1741(simpara)
+#: C/jhbuild.xml:2002(simpara)
 msgid ""
 "A string if set, tarballs will be downloaded to the specified directory "
 "instead of <varname>checkoutroot</varname>. This is useful if you have "
@@ -2434,11 +2803,11 @@ msgid ""
 "varname> and want to reduce bandwidth usage."
 msgstr ""
 
-#: C/jhbuild.xml:1749(varname)
+#: C/jhbuild.xml:2010(varname)
 msgid "tinderbox_outputdir"
 msgstr "tinderbox_outputdir"
 
-#: C/jhbuild.xml:1751(simpara)
+#: C/jhbuild.xml:2012(simpara)
 msgid ""
 "A string specifying the directory to store <command>jhbuild tinderbox</"
 "command> output. This string can be overridden by the <option>--output</"
@@ -2447,11 +2816,11 @@ msgid ""
 "file."
 msgstr ""
 
-#: C/jhbuild.xml:1760(varname)
+#: C/jhbuild.xml:2021(varname)
 msgid "trycheckout"
 msgstr "trycheckout"
 
-#: C/jhbuild.xml:1762(simpara)
+#: C/jhbuild.xml:2023(simpara)
 msgid ""
 "A boolean value, if set to <constant>True</constant> JHBuild will "
 "automatically try to solve failures by 1) running <command>autogen.sh</"
@@ -2460,11 +2829,11 @@ msgid ""
 "option> option."
 msgstr ""
 
-#: C/jhbuild.xml:1771(varname)
+#: C/jhbuild.xml:2032(varname)
 msgid "use_lib64"
 msgstr "use_lib64"
 
-#: C/jhbuild.xml:1773(simpara)
+#: C/jhbuild.xml:2034(simpara)
 msgid ""
 "A boolean value that specifies whether to install libraries to "
 "<filename>lib64</filename> directories. If set, <literal>--libdir=\\"
@@ -2474,66 +2843,66 @@ msgid ""
 "<constant>False</constant> on other systems."
 msgstr ""
 
-#: C/jhbuild.xml:1784(varname)
+#: C/jhbuild.xml:2045(varname)
 msgid "use_local_modulesets"
 msgstr "use_local_modulesets"
 
-#: C/jhbuild.xml:1786(simpara)
+#: C/jhbuild.xml:2047(simpara)
 msgid ""
 "A boolean value that specifies to use modulesets that were checked out along "
 "the JHBuild source code; instead of downloading them on-the-fly from GNOME "
 "version control system. Defaults to <constant>False</constant>."
 msgstr ""
 
-#: C/jhbuild.xml:1794(varname)
+#: C/jhbuild.xml:2055(varname)
 msgid "xvfbargs"
 msgstr "xvfbargs"
 
-#: C/jhbuild.xml:1796(simpara)
+#: C/jhbuild.xml:2057(simpara)
 msgid ""
 "A string listing arguments to pass to <command>Xvfb</command> if running "
 "graphical tests."
 msgstr ""
 
-#: C/jhbuild.xml:1804(title)
+#: C/jhbuild.xml:2065(title)
 msgid "Other Configuration File Structures"
 msgstr "Weitere Strukturen der Konfigurationsdatei"
 
-#: C/jhbuild.xml:1806(para)
+#: C/jhbuild.xml:2067(para)
 msgid ""
 "In addition to the above variables, there are other settings that can be set "
 "in the configuration file:"
 msgstr ""
 
-#: C/jhbuild.xml:1811(varname)
+#: C/jhbuild.xml:2072(varname)
 msgid "os.environ"
 msgstr "os.environ"
 
-#: C/jhbuild.xml:1813(para)
+#: C/jhbuild.xml:2074(para)
 msgid ""
 "A dictionary representing the environment. This environment is passed to "
 "processes that JHBuild spawns."
 msgstr ""
 
-#: C/jhbuild.xml:1815(para)
+#: C/jhbuild.xml:2076(para)
 msgid ""
 "Some influential environment variables include <envar>CPPFLAGS</envar>, "
 "<envar>CFLAGS</envar>, <envar>INSTALL</envar> and <envar>LDFLAGS</envar>. For "
 "example:"
 msgstr ""
 
-#: C/jhbuild.xml:1819(programlisting)
+#: C/jhbuild.xml:2080(programlisting)
 #, no-wrap
 msgid "os.environ['CFLAGS'] = '-O0 -g'"
 msgstr "os.environ['CFLAGS'] = '-O0 -g'"
 
-#: C/jhbuild.xml:1823(term)
+#: C/jhbuild.xml:2084(term)
 msgid ""
 "<function>addpath</function>(<parameter>envvar</parameter>, "
 "<parameter>pathname</parameter>)"
 msgstr ""
 
-#: C/jhbuild.xml:1826(para)
+#: C/jhbuild.xml:2087(para)
 msgid ""
 "This will add a directory to the <envar>PATH</envar> environment variable. "
 "<function>addpath</function> will correctly handle the case when the "
@@ -2541,20 +2910,20 @@ msgid ""
 "beginning or end of an environment variable can have unexpected consequences)."
 msgstr ""
 
-#: C/jhbuild.xml:1832(para)
+#: 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>."
 msgstr ""
 
-#: C/jhbuild.xml:1839(term)
+#: C/jhbuild.xml:2100(term)
 msgid ""
 "<function>prependpath</function>(<parameter>envvar</parameter>, "
 "<parameter>pathname</parameter>)"
 msgstr ""
 
-#: C/jhbuild.xml:1842(para)
+#: C/jhbuild.xml:2103(para)
 msgid ""
 "After processing the configuration file, JHBuild will alter some paths based "
 "on variables such as <varname>prefix</varname> (e.g. adding <literal>$prefix/"
@@ -2564,18 +2933,18 @@ 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:1847(para)
+#: C/jhbuild.xml:2108(para)
 msgid ""
 "The <function>prependpath</function> function works like <function>addpath</"
 "function>, except that the environment variable is modified after JHBuild has "
 "made its changes to the environment."
 msgstr ""
 
-#: C/jhbuild.xml:1858(title)
+#: C/jhbuild.xml:2119(title)
 msgid "Module Set File Syntax"
 msgstr "Die Syntax der Modulsatz-Datei"
 
-#: C/jhbuild.xml:1860(para)
+#: C/jhbuild.xml:2121(para)
 msgid ""
 "JHBuild uses XML files to describe the dependencies between modules. A RELAX-"
 "NG schema and Document Type Definition are included with JHBuild in the "
@@ -2583,7 +2952,7 @@ msgid ""
 "to edit module set files using <literal>nxml-mode</literal> in Emacs."
 msgstr ""
 
-#: C/jhbuild.xml:1866(para)
+#: C/jhbuild.xml:2127(para)
 msgid ""
 "The top-level element in a module set file is <sgmltag class=\"element"
 "\">moduleset</sgmltag> element. No XML namespace is used. The elements below "
@@ -2591,11 +2960,11 @@ msgid ""
 "module definitions."
 msgstr ""
 
-#: C/jhbuild.xml:1872(title) C/jhbuild.xml:2495(title)
+#: C/jhbuild.xml:2133(title) C/jhbuild.xml:2889(title)
 msgid "Module Sources"
 msgstr "Modulquellen"
 
-#: C/jhbuild.xml:1874(para)
+#: C/jhbuild.xml:2135(para)
 msgid ""
 "Rather than listing the full location of every module, a number of \"module "
 "sources\" are listed in the module set, and then referenced by name in the "
@@ -2605,13 +2974,15 @@ msgid ""
 "and users to use different repository access methods)."
 msgstr ""
 
-#: C/jhbuild.xml:1883(para)
+#: C/jhbuild.xml:2144(para)
 msgid ""
 "The <sgmltag class=\"element\">repository</sgmltag> element is used to "
-"describe all types of repository."
+"describe all types of repository. The <sgmltag class=\"element\">branch</"
+"sgmltag> element is used inside module definition to specify additional "
+"settings."
 msgstr ""
 
-#: C/jhbuild.xml:1886(programlisting)
+#: C/jhbuild.xml:2149(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2625,6 +2996,9 @@ msgid ""
 "  [ server=\"<replaceable>server</replaceable>\" ]\n"
 "  [ database=\"<replaceable>database</replaceable>\" ]\n"
 "  [ defbranch=\"<replaceable>defbranch</replaceable>\" ]\n"
+"  [ trunk-template=\"<replaceable>trunk-template</replaceable>\" ]\n"
+"  [ branches-template=\"<replaceable>branches-template</replaceable>\" ]\n"
+"  [ tags-template=\"<replaceable>tags-template</replaceable>\" ]\n"
 "  [ developer-href-example=\"<replaceable>developer-href-example</replaceable>\" ] /&gt;\n"
 msgstr ""
 "\n"
@@ -2638,60 +3012,132 @@ msgstr ""
 "  [ server=\"<replaceable>server</replaceable>\" ]\n"
 "  [ database=\"<replaceable>database</replaceable>\" ]\n"
 "  [ defbranch=\"<replaceable>defbranch</replaceable>\" ]\n"
+"  [ trunk-template=\"<replaceable>trunk-template</replaceable>\" ]\n"
+"  [ branches-template=\"<replaceable>branches-template</replaceable>\" ]\n"
+"  [ tags-template=\"<replaceable>tags-template</replaceable>\" ]\n"
 "  [ developer-href-example=\"<replaceable>developer-href-example</replaceable>\" ] /&gt;\n"
 
-#: C/jhbuild.xml:1900(para)
+#: C/jhbuild.xml:2166(para)
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute is a unique "
 "identifier for the repository."
 msgstr ""
 
-#: C/jhbuild.xml:1903(para)
+#: C/jhbuild.xml:2169(para)
 msgid ""
 "The <sgmltag class=\"attribute\">default</sgmltag> attribute specifies "
 "whether this repository is the default source for this module set."
 msgstr ""
 
-#: C/jhbuild.xml:1907(para)
+#: C/jhbuild.xml:2173(para)
 msgid ""
 "The <sgmltag class=\"attribute\">type</sgmltag> attribute specifies the type "
 "of repository. It can be one of: <literal>arch</literal>, <literal>bzr</"
-"literal>, <literal>cvs</literal>, <literal>darcs</literal>, <literal>git</"
-"literal>, <literal>hg</literal>, <literal>mtr</literal>, <literal>svn</"
-"literal>, <literal>tarball</literal>. Other attributes depends on the "
-"<sgmltag class=\"attribute\">type</sgmltag>, as well as the <sgmltag class="
-"\"element\">branch</sgmltag> used inside module definitions. Those are "
-"described below."
+"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:1918(para)
+#: C/jhbuild.xml:2184(para)
 msgid ""
 "The <sgmltag class=\"attribute\">developer-href-example</sgmltag> attribute "
 "is used to specify the format of the URL for the repository used by "
 "developers. This is informational only."
 msgstr ""
 
-#: C/jhbuild.xml:1923(title)
+#: C/jhbuild.xml:2188(para)
+msgid ""
+"The <sgmltag class=\"element\">branch</sgmltag> element is used inside module "
+"definitions."
+msgstr ""
+
+#: C/jhbuild.xml:2191(programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;branch\n"
+"  [ repo=\"<replaceable>repository</replaceable>\" ]\n"
+"  [ module=\"<replaceable>module name</replaceable>\" ]\n"
+"  [ checkoutdir=\"<replaceable>checkoutdir</replaceable>\" ]\n"
+"  [ revision=\"<replaceable>revision</replaceable>\" ]\n"
+"  [ tag=\"<replaceable>tag</replaceable>\" ]\n"
+"  [ update-new-dirs=\"<replaceable>update-new-dirs</replaceable>\" ]\n"
+"  [ override-checkoutdir=\"<replaceable>override-checkoutdir</replaceable>\" ]\n"
+"  [ subdir=\"<replaceable>subdir</replaceable>\" ]\n"
+"  [ branch=\"<replaceable>branch</replaceable>\" ]\n"
+"  [ version=\"<replaceable>version</replaceable>\" ]\n"
+"  [ size=\"<replaceable>size</replaceable>\" ]\n"
+"  [ source-subdir=\"<replaceable>source-subdir</replaceable>\" ]\n"
+"  [ hash=\"<replaceable>hash</replaceable>\" ]/&gt;\n"
+msgstr ""
+"\n"
+"&lt;branch\n"
+"  [ repo=\"<replaceable>repository</replaceable>\" ]\n"
+"  [ module=\"<replaceable>module name</replaceable>\" ]\n"
+"  [ checkoutdir=\"<replaceable>checkoutdir</replaceable>\" ]\n"
+"  [ revision=\"<replaceable>revision</replaceable>\" ]\n"
+"  [ tag=\"<replaceable>tag</replaceable>\" ]\n"
+"  [ update-new-dirs=\"<replaceable>update-new-dirs</replaceable>\" ]\n"
+"  [ override-checkoutdir=\"<replaceable>override-checkoutdir</replaceable>\" ]\n"
+"  [ subdir=\"<replaceable>subdir</replaceable>\" ]\n"
+"  [ branch=\"<replaceable>branch</replaceable>\" ]\n"
+"  [ version=\"<replaceable>version</replaceable>\" ]\n"
+"  [ size=\"<replaceable>size</replaceable>\" ]\n"
+"  [ source-subdir=\"<replaceable>source-subdir</replaceable>\" ]\n"
+"  [ hash=\"<replaceable>hash</replaceable>\" ]/&gt;\n"
+
+#: C/jhbuild.xml:2208(para)
+msgid ""
+"All atributes have sensible defaults and depend on the module and repository "
+"definitions. Common attributes are described here."
+msgstr ""
+
+#: C/jhbuild.xml:2211(para)
+msgid ""
+"The <sgmltag class=\"attribute\">repo</sgmltag> attribute is used to specify "
+"non-default repository name."
+msgstr ""
+
+#: C/jhbuild.xml:2214(para)
+msgid ""
+"The <sgmltag class=\"attribute\">module</sgmltag> attribute is used to "
+"specify module name to checkout from the repository. Defaults to module id."
+msgstr ""
+
+#: C/jhbuild.xml:2218(para)
+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)
+msgid "Other attributes are described below"
+msgstr ""
+
+#: C/jhbuild.xml:2224(title)
 msgid "Arch"
 msgstr "Arch"
 
-#: C/jhbuild.xml:1925(para)
+#: C/jhbuild.xml:2226(para)
 msgid "This repository type is used to define a Arch repository."
 msgstr ""
 
-#: C/jhbuild.xml:1927(para)
+#: 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:1930(para)
+#: 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:1933(programlisting)
+#: C/jhbuild.xml:2234(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2704,67 +3150,168 @@ msgstr ""
 "    archive=\"rhythmbox-devel gnome org--2004\"\n"
 "    href=\"http://web.rhythmbox.org/arch/2004\"/&gt;\n";
 
-#: C/jhbuild.xml:1942(title)
+#: C/jhbuild.xml:2243(title)
 msgid "Bazaar"
 msgstr "Bazaar"
 
-#: C/jhbuild.xml:1943(para)
-msgid "This repository type is used to define a Bazaar repository."
+#: C/jhbuild.xml:2244(para)
+msgid ""
+"This repository type is used to define a Bazaar repository. It is recommended "
+"to have Bazaar 1.16 or higher."
 msgstr ""
 
-#: C/jhbuild.xml:1945(programlisting)
+#: C/jhbuild.xml:2247(programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"bzr\" name=\"launchpad.net\"\n"
-"      href=\"http://bazaar.launchpad.net/\"/&gt;\n";
+"      href=\"lp:\"/&gt;\n"
+"        "
 msgstr ""
 "\n"
 "&lt;repository type=\"bzr\" name=\"launchpad.net\"\n"
-"      href=\"http://bazaar.launchpad.net/\"/&gt;\n";
+"      href=\"lp:\"/&gt;\n"
+"        "
 
-#: C/jhbuild.xml:1952(title)
+#: C/jhbuild.xml:2252(para)
+msgid ""
+"Additional attributes are: <sgmltag class=\"attribute\">trunk-template</"
+"sgmltag> (defaults to <literal>\"%(module)s\"</literal>) and <sgmltag class="
+"\"attribute\">branches-template</sgmltag> (defaults to <literal>\"%(module)s/"
+"%(branch)s</literal>\"). These attributes are used to specify templates for "
+"constructing URL. A <sgmltag class=\"element\">branch</sgmltag> element in "
+"the module definitions can specify <sgmltag class=\"attribute\">branch</"
+"sgmltag> and <sgmltag class=\"attribute\">user</sgmltag> attributes. These "
+"values will be substitued in the templates. If either of those are defined "
+"<sgmltag class=\"attribute\">branches-template</sgmltag> is used, otherwise "
+"<sgmltag class=\"attribute\">trunk-template</sgmltag> is used. This way you "
+"can ovveride repository to build modules from your personal branch or build "
+"many modules fron a repository with non-standard layout."
+msgstr ""
+
+#: C/jhbuild.xml:2267(para)
+msgid ""
+"An addition <sgmltag class=\"element\">branch</sgmltag> element accepts "
+"<sgmltag class=\"attribute\">revspec</sgmltag> attibute to anchor on a "
+"particular revision. Any valid <literal>bzr revspec</literal> is accepted, "
+"for example <literal>date:yesterday, -5, tag:0.1</literal> to get first "
+"revision since yesterday, 5 commits behind the tip or tag \"0.1\". See "
+"<literal>bzr help revisionspec</literal> for all possible values."
+msgstr ""
+
+#: C/jhbuild.xml:2276(para)
+msgid ""
+"For example repository with <sgmltag class=\"attribute\">template</sgmltag> "
+"attributes defined:"
+msgstr ""
+
+#: C/jhbuild.xml:2279(programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;repository type=\"bzr\" name=\"launchpad.net\"\n"
+"      href=\"lp:\"\n"
+"      trunk-template=\"~bzr-pqm/%(module)s/bzr.dev\"\n"
+"      branches-template=\"~bzr-pqm/%(module)s/%(branch)s\"/&gt;\n"
+"        "
+msgstr ""
+"\n"
+"&lt;repository type=\"bzr\" name=\"launchpad.net\"\n"
+"      href=\"lp:\"\n"
+"      trunk-template=\"~bzr-pqm/%(module)s/bzr.dev\"\n"
+"      branches-template=\"~bzr-pqm/%(module)s/%(branch)s\"/&gt;\n"
+"        "
+
+#: C/jhbuild.xml:2286(para)
+msgid ""
+"Example <sgmltag class=\"element\">branch</sgmltag> elements for the above "
+"repository:"
+msgstr ""
+
+#: C/jhbuild.xml:2289(programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;branch repo=\"launchpad.net\"\n"
+"      module=\"bzr\"\n"
+"      checkoutdir=\"bzr-next\"/&gt;\n"
+"        "
+msgstr ""
+"\n"
+"&lt;branch repo=\"launchpad.net\"\n"
+"      module=\"bzr\"\n"
+"      checkoutdir=\"bzr-next\"/&gt;\n"
+"        "
+
+#: C/jhbuild.xml:2294(programlisting)
+#, no-wrap
+msgid ""
+"\n"
+"&lt;branch repo=\"launchpad.net\"\n"
+"      module=\"bzr\"\n"
+"      branch=\"2.2\"\n"
+"      checkoutdir=\"bzr-beta\"/&gt;\n"
+"        "
+msgstr ""
+"\n"
+"&lt;branch repo=\"launchpad.net\"\n"
+"      module=\"bzr\"\n"
+"      branch=\"2.2\"\n"
+"      checkoutdir=\"bzr-beta\"/&gt;\n"
+"        "
+
+#: C/jhbuild.xml:2304(title)
 msgid "CVS"
 msgstr "CVS"
 
-#: C/jhbuild.xml:1953(para)
+#: C/jhbuild.xml:2305(para)
 msgid "This repository type is used to define a CVS repository."
 msgstr ""
 
-#: C/jhbuild.xml:1955(para)
+#: C/jhbuild.xml:2307(para)
 msgid ""
 "The <sgmltag class=\"attribute\">password</sgmltag> attribute is used to "
 "specify the password to the repository."
 msgstr ""
 
-#: C/jhbuild.xml:1959(para)
+#: C/jhbuild.xml:2311(para)
 msgid ""
 "The <sgmltag class=\"attribute\">cvsroot</sgmltag> attribute is used to "
 "specify the root of the repository."
 msgstr ""
 
-#: C/jhbuild.xml:1963(programlisting)
+#: C/jhbuild.xml:2315(programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"cvs\" name=\"tango.freedesktop.org\"\n"
 "    cvsroot=\":pserver:anoncvs anoncvs freedesktop org:/cvs/tango\"\n"
 "    password=\"\"/&gt;\n"
+"        "
 msgstr ""
 "\n"
 "&lt;repository type=\"cvs\" name=\"tango.freedesktop.org\"\n"
 "    cvsroot=\":pserver:anoncvs anoncvs freedesktop org:/cvs/tango\"\n"
 "    password=\"\"/&gt;\n"
+"        "
+
+#. TODO describe these attributes
+#: C/jhbuild.xml:2322(para)
+msgid ""
+"Additional attributes are: <sgmltag class=\"attribute\">revision</sgmltag>, "
+"<sgmltag class=\"attribute\">update-new-dirs</sgmltag> and <sgmltag class="
+"\"attribute\">override-checkoutdir</sgmltag>."
+msgstr ""
 
-#: C/jhbuild.xml:1972(title)
+#: C/jhbuild.xml:2330(title)
 msgid "Darcs"
 msgstr "Darcs"
 
-#: C/jhbuild.xml:1973(para)
+#: C/jhbuild.xml:2331(para)
 msgid "This repository type is used to define a Darcs repository."
 msgstr ""
 
-#: C/jhbuild.xml:1975(programlisting)
+#: C/jhbuild.xml:2333(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2775,45 +3322,79 @@ msgstr ""
 "&lt;repository type=\"darcs\" name=\"telepathy.freedesktop.org\"\n"
 "      href=\"http://projects.collabora.co.uk/darcs/telepathy/\"/&gt;\n";
 
-#: C/jhbuild.xml:1982(title)
+#: C/jhbuild.xml:2340(title)
 msgid "Git"
 msgstr "Git"
 
-#: C/jhbuild.xml:1983(para)
+#: C/jhbuild.xml:2341(para)
 msgid "This repository type is used to define a Git repository."
 msgstr ""
 
-#: C/jhbuild.xml:1985(programlisting)
+#: C/jhbuild.xml:2343(programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"git\" name=\"git.freedesktop.org\"\n"
 "    href=\"git://anongit.freedesktop.org/git/\"/&gt;\n"
+"        "
 msgstr ""
 "\n"
 "&lt;repository type=\"git\" name=\"git.freedesktop.org\"\n"
 "    href=\"git://anongit.freedesktop.org/git/\"/&gt;\n"
+"        "
+
+#: C/jhbuild.xml:2348(para) C/jhbuild.xml:2453(para)
+msgid ""
+"It allows the following attributes on the <sgmltag class=\"element\">branch</"
+"sgmltag> element:"
+msgstr ""
+
+#: C/jhbuild.xml:2351(para)
+msgid ""
+"The <sgmltag class=\"attribute\">revision</sgmltag> attribute is used to "
+"specify a local or remote-tracking branch to switch to in the update phase. "
+"It defaults to 'master'. It is possible to override this attribute with the "
+"<varname>branches</varname> configuration variable. The switch will only be "
+"performed, if the current branch is tracking a remote branch, to not disturb "
+"your own work."
+msgstr ""
 
-#: C/jhbuild.xml:1990(programlisting)
+#: C/jhbuild.xml:2359(para)
+msgid ""
+"The <sgmltag class=\"attribute\">tag</sgmltag> attribute is used to specify a "
+"revision to unconditionally check out in the update phase. It overrides the "
+"<sgmltag class=\"attribute\">revision</sgmltag> attribute."
+msgstr ""
+
+#. 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)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;branch repo=\"git.freedesktop.org\" module=\"swfdec/swfdec\"\n"
-"    checkoutdir=\"swfdec\"/&gt;\n"
+"        checkoutdir=\"swfdec\"\n"
+"        revision=\"<replaceable>local-or-remote-branch</replaceable>\"\n"
+"        tag=\"<replaceable>tree-ish</replaceable>\"/&gt;\n"
+"        "
 msgstr ""
 "\n"
 "&lt;branch repo=\"git.freedesktop.org\" module=\"swfdec/swfdec\"\n"
-"    checkoutdir=\"swfdec\"/&gt;\n"
+"        checkoutdir=\"swfdec\"\n"
+"        revision=\"<replaceable>lokaler-oder-entfernter-Zweig</replaceable>\"\n"
+"        tag=\"<replaceable>tree-ish</replaceable>\"/&gt;\n"
+"        "
 
-#: C/jhbuild.xml:1999(title)
+#: C/jhbuild.xml:2378(title)
 msgid "Mercurial"
 msgstr "Mercurial"
 
-#: C/jhbuild.xml:2000(para)
+#: C/jhbuild.xml:2379(para)
 msgid "This repository type is used to define a Mercurial repository."
 msgstr ""
 
-#: C/jhbuild.xml:2002(programlisting)
+#: C/jhbuild.xml:2381(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2824,7 +3405,7 @@ msgstr ""
 "&lt;repository type=\"hg\" name=\"hg.gtk-vnc\"\n"
 "    href=\"http://gtk-vnc.codemonkey.ws/hg/\"; /&gt;\n"
 
-#: C/jhbuild.xml:2007(programlisting)
+#: C/jhbuild.xml:2386(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2833,33 +3414,33 @@ msgstr ""
 "\n"
 "&lt;branch repo=\"hg.gtk-vnc\" module=\"outgoing.hg\" checkoutdir=\"gtk-vnc\"/&gt;\n"
 
-#: C/jhbuild.xml:2014(title)
+#: C/jhbuild.xml:2393(title)
 msgid "Monotone"
 msgstr "Monotone"
 
-#: C/jhbuild.xml:2015(para)
+#: C/jhbuild.xml:2394(para)
 msgid "This repository type is used to define a Monotone repository."
 msgstr ""
 
-#: C/jhbuild.xml:2017(para)
+#: C/jhbuild.xml:2396(para)
 msgid ""
 "The <sgmltag class=\"attribute\">server</sgmltag> attribute is used to "
 "specify the repository server."
 msgstr ""
 
-#: C/jhbuild.xml:2020(para)
+#: C/jhbuild.xml:2399(para)
 msgid ""
 "The <sgmltag class=\"attribute\">database</sgmltag> attribute is used to "
 "specify the database to use for the repository."
 msgstr ""
 
-#: C/jhbuild.xml:2024(para)
+#: C/jhbuild.xml:2403(para)
 msgid ""
 "The <sgmltag class=\"attribute\">defbranch</sgmltag> attribute is used "
 "specify the branch of the repository to use."
 msgstr ""
 
-#: C/jhbuild.xml:2028(programlisting)
+#: C/jhbuild.xml:2407(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2872,50 +3453,64 @@ msgstr ""
 "    server=\"pidgin.im\" database=\"pidgin.im.mtn\"\n"
 "    defbranch=\"im.pidgin.pidgin\"/&gt;\n"
 
-#: C/jhbuild.xml:2037(title)
+#: C/jhbuild.xml:2416(title)
 msgid "Subversion"
 msgstr "Subversion"
 
-#: C/jhbuild.xml:2038(para)
+#: C/jhbuild.xml:2417(para)
 msgid "This repository type is used to define a Subversion repository."
 msgstr ""
 
-#: C/jhbuild.xml:2040(programlisting)
+#: C/jhbuild.xml:2419(programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;repository type=\"svn\" name=\"svn.gnome.org\" default=\"yes\"\n"
 "    href=\"http://svn.gnome.org/svn/\"/&gt;\n";
+"        "
 msgstr ""
 "\n"
 "&lt;repository type=\"svn\" name=\"svn.gnome.org\" default=\"yes\"\n"
 "    href=\"http://svn.gnome.org/svn/\"/&gt;\n";
+"        "
 
-#: C/jhbuild.xml:2045(para)
+#. So how do I checkut out branch at a specific revision?
+#: C/jhbuild.xml:2425(para)
 msgid ""
 "It allows a <sgmltag class=\"attribute\">revision</sgmltag> on the <sgmltag "
 "class=\"element\">branch</sgmltag> element. This attribute defines the branch "
 "to checkout or, if it is a number, a specific revision to checkout."
 msgstr ""
 
-#: C/jhbuild.xml:2050(programlisting)
+#: C/jhbuild.xml:2430(programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;branch revision=\"gnome-2-20\"/&gt;\n"
+"        "
 msgstr ""
 "\n"
 "&lt;branch revision=\"gnome-2-20\"/&gt;\n"
+"        "
 
-#: C/jhbuild.xml:2057(title)
+#: C/jhbuild.xml:2434(para)
+msgid ""
+"It is possible to specify custom <literal>svn</literal> layout using <sgmltag "
+"class=\"attribute\">trunk-template</sgmltag> (defaults to \"%(module)s/trunk"
+"\"), <sgmltag class=\"attribute\">branches-template</sgmltag> (defaults to "
+"\"%(module)s/branches/%(branch)s\") and <sgmltag class=\"attribute\">tags-"
+"template</sgmltag> (defaults to \"%(module)s/tags/%(tag)s\")"
+msgstr ""
+
+#: C/jhbuild.xml:2445(title)
 msgid "Tarballs"
 msgstr "Tarballs"
 
-#: C/jhbuild.xml:2058(para)
+#: C/jhbuild.xml:2446(para)
 msgid "This repository type is used to define a tarball repository."
 msgstr ""
 
-#: C/jhbuild.xml:2060(programlisting)
+#: C/jhbuild.xml:2448(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2926,20 +3521,14 @@ msgstr ""
 "&lt;repository type=\"tarball\" name=\"dbus/dbus-python\"\n"
 "    href=\"http://dbus.freedesktop.org/releases/dbus-python/\"/&gt;\n";
 
-#: C/jhbuild.xml:2065(para)
-msgid ""
-"It allows the following attributes on the <sgmltag class=\"element\">branch</"
-"sgmltag> element:"
-msgstr ""
-
-#: C/jhbuild.xml:2068(para)
+#: C/jhbuild.xml:2456(para)
 msgid ""
 "The <sgmltag class=\"attribute\">module</sgmltag> attribute specifies the "
 "file to download and compile, the <sgmltag class=\"attribute\">version</"
 "sgmltag> attribute specifies the module version."
 msgstr ""
 
-#: C/jhbuild.xml:2073(para)
+#: C/jhbuild.xml:2461(para)
 msgid ""
 "The <sgmltag class=\"attribute\">size</sgmltag> and <sgmltag class=\"attribute"
 "\">hash</sgmltag>, as well as the obsolete <sgmltag class=\"attribute"
@@ -2948,7 +3537,7 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: C/jhbuild.xml:2079(para) C/jhbuild.xml:2651(para)
+#: C/jhbuild.xml:2467(para) C/jhbuild.xml:3045(para)
 msgid ""
 "The <sgmltag class=\"element\">patches</sgmltag> element is used to specify "
 "one or more patches to apply to the source tree after unpacking, the <sgmltag "
@@ -2957,7 +3546,7 @@ msgid ""
 "levels of directories to prune when applying the patch."
 msgstr ""
 
-#: C/jhbuild.xml:2087(para) C/jhbuild.xml:2659(para)
+#: C/jhbuild.xml:2475(para) C/jhbuild.xml:3053(para)
 msgid ""
 "For module sets shipped with JHBuild, the patch files are looked up in the "
 "<filename>jhbuild/patches/</filename> directory; for module sets referred by "
@@ -2967,38 +3556,34 @@ msgid ""
 "specify a URI, in which case it will be downloaded from that location."
 msgstr ""
 
-#: C/jhbuild.xml:2096(programlisting)
+#: C/jhbuild.xml:2484(programlisting)
 #, no-wrap
 msgid ""
 "\n"
 "&lt;branch module=\"dbus-python-0.80.2.tar.gz\" version=\"0.80.2\"\n"
 "    repo=\"dbus/dbus-python\"\n"
 "    hash=\"md5:2807bc85215c995bd595e01edd9d2077\" size=\"453499\"&gt;\n"
-"  &lt;patches&gt;\n"
-"    &lt;patch file=\"dbus-glib-build.patch\" strip=\"1\" /&gt;\n"
-"  &lt;/patches&gt;\n"
+"  &lt;patch file=\"dbus-glib-build.patch\" strip=\"1\" /&gt;\n"
 "&lt;branch&gt;\n"
 msgstr ""
 "\n"
 "&lt;branch module=\"dbus-python-0.80.2.tar.gz\" version=\"0.80.2\"\n"
 "    repo=\"dbus/dbus-python\"\n"
 "    hash=\"md5:2807bc85215c995bd595e01edd9d2077\" size=\"453499\"&gt;\n"
-"  &lt;patches&gt;\n"
-"    &lt;patch file=\"dbus-glib-build.patch\" strip=\"1\" /&gt;\n"
-"  &lt;/patches&gt;\n"
+"  &lt;patch file=\"dbus-glib-build.patch\" strip=\"1\" /&gt;\n"
 "&lt;branch&gt;\n"
 
-#: C/jhbuild.xml:2111(title)
+#: C/jhbuild.xml:2497(title)
 msgid "Including Other Module Sets"
 msgstr "Einbinden anderer Modulsätze"
 
-#: C/jhbuild.xml:2113(para)
+#: C/jhbuild.xml:2499(para)
 msgid ""
 "JHBuild allows one module set to include the contents of another by reference "
 "using the <sgmltag class=\"element\">include</sgmltag> element."
 msgstr ""
 
-#: C/jhbuild.xml:2117(programlisting)
+#: C/jhbuild.xml:2503(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3007,32 +3592,32 @@ msgstr ""
 "\n"
 "&lt;include href=\"<replaceable>uri</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2121(para)
+#: C/jhbuild.xml:2507(para)
 msgid ""
 "The <sgmltag class=\"attribute\">href</sgmltag> is a URI reference to the "
 "module set to be included, relative to the file containing the <sgmltag class="
 "\"element\">include</sgmltag> element."
 msgstr ""
 
-#: C/jhbuild.xml:2126(para)
+#: C/jhbuild.xml:2512(para)
 msgid ""
 "Only module definitions are imported from the referenced module set - module "
 "sources are not. Multiple levels of includes are allowed, but include loops "
 "are not (there isn't any code to handle loops at the moment)."
 msgstr ""
 
-#: C/jhbuild.xml:2133(title)
+#: C/jhbuild.xml:2519(title)
 msgid "Module Definitions"
 msgstr "Moduldefinitionen"
 
-#: C/jhbuild.xml:2135(para)
+#: C/jhbuild.xml:2521(para)
 msgid ""
 "There are various types of module definitions that can be used in a module "
 "set file, and the list can easily be extended. Only the most common ones will "
 "be mentioned here."
 msgstr ""
 
-#: C/jhbuild.xml:2139(para)
+#: C/jhbuild.xml:2525(para)
 msgid ""
 "They are all basically composed of a <sgmltag class=\"element\">branch</"
 "sgmltag> element describing how to get the module and <sgmltag class=\"element"
@@ -3041,7 +3626,7 @@ msgid ""
 "dependencies of the module."
 msgstr ""
 
-#: C/jhbuild.xml:2146(para)
+#: C/jhbuild.xml:2532(para)
 msgid ""
 "Any modules listed in the <sgmltag class=\"element\">dependencies</sgmltag> "
 "element will be added to the module list for <command>jhbuild build</command> "
@@ -3049,7 +3634,7 @@ msgid ""
 "first."
 msgstr ""
 
-#: C/jhbuild.xml:2152(para)
+#: C/jhbuild.xml:2538(para)
 msgid ""
 "After generating the modules list, the modules listed in the <sgmltag class="
 "\"element\">suggests</sgmltag> element will be used to further sort the "
@@ -3058,17 +3643,17 @@ msgid ""
 "module."
 msgstr ""
 
-#: C/jhbuild.xml:2160(title)
+#: C/jhbuild.xml:2546(title)
 msgid "autotools"
 msgstr "autotools"
 
-#: C/jhbuild.xml:2162(para)
+#: C/jhbuild.xml:2548(para)
 msgid ""
 "The <sgmltag class=\"element\">autotools</sgmltag> element is used to define "
 "a module which is compiled using the GNU Autotools build system."
 msgstr ""
 
-#: C/jhbuild.xml:2166(programlisting)
+#: C/jhbuild.xml:2552(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3125,7 +3710,7 @@ msgstr ""
 "\n"
 "&lt;/autotools&gt;\n"
 
-#: C/jhbuild.xml:2194(para)
+#: C/jhbuild.xml:2580(para)
 msgid ""
 "The <sgmltag class=\"attribute\">autogenargs</sgmltag> and <sgmltag class="
 "\"attribute\">makeargs</sgmltag> and <sgmltag class=\"attribute"
@@ -3134,7 +3719,7 @@ msgid ""
 "and <command>make install</command> respectively."
 msgstr ""
 
-#: C/jhbuild.xml:2201(para)
+#: C/jhbuild.xml:2587(para)
 msgid ""
 "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies the "
 "name of the autogen.sh script to run. The value <literal>autoreconf</literal> "
@@ -3148,14 +3733,14 @@ msgid ""
 "use."
 msgstr ""
 
-#: C/jhbuild.xml:2216(para)
+#: C/jhbuild.xml:2602(para)
 msgid ""
 "The <sgmltag class=\"attribute\">supports-non-srcdir-builds</sgmltag> "
 "attribute is used to mark modules that can't be cleanly built using a "
 "separate source directory."
 msgstr ""
 
-#: C/jhbuild.xml:2221(para)
+#: C/jhbuild.xml:2607(para)
 msgid ""
 "The <sgmltag class=\"attribute\">autogen-template</sgmltag> attribute can be "
 "used if you need finer control over the autogen command line. It is a python "
@@ -3165,7 +3750,7 @@ msgid ""
 "example, here is the default autogen-template:"
 msgstr ""
 
-#: C/jhbuild.xml:2230(programlisting)
+#: C/jhbuild.xml:2616(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3174,24 +3759,24 @@ msgstr ""
 "\n"
 "%(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s\n"
 
-#: C/jhbuild.xml:2234(para)
+#: C/jhbuild.xml:2620(para)
 msgid ""
 "The <sgmltag class=\"attribute\">check-target</sgmltag> attribute must be "
 "specified (with false as value) for modules that do not have a <command>make "
 "check</command> target."
 msgstr ""
 
-#: C/jhbuild.xml:2241(title)
+#: C/jhbuild.xml:2627(title)
 msgid "cmake"
 msgstr "cmake"
 
-#: C/jhbuild.xml:2243(para)
+#: C/jhbuild.xml:2629(para)
 msgid ""
 "The <sgmltag class=\"element\">cmake</sgmltag> element is used to define a "
 "module which is built using the CMake build system."
 msgstr ""
 
-#: C/jhbuild.xml:2246(programlisting)
+#: C/jhbuild.xml:2632(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3226,17 +3811,17 @@ msgstr ""
 "  &lt;/after&gt;\n"
 "&lt;/cmake&gt;\n"
 
-#: C/jhbuild.xml:2266(title)
+#: C/jhbuild.xml:2652(title)
 msgid "distutils"
 msgstr "distutils"
 
-#: C/jhbuild.xml:2268(para)
+#: C/jhbuild.xml:2654(para)
 msgid ""
 "The <sgmltag class=\"element\">distutils</sgmltag> element is used to define "
 "a module which is built using python's distutils"
 msgstr ""
 
-#: C/jhbuild.xml:2272(programlisting)
+#: C/jhbuild.xml:2658(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3273,18 +3858,18 @@ msgstr ""
 "  &lt;/after&gt;\n"
 "&lt;/distutils&gt;\n"
 
-#: C/jhbuild.xml:2293(title)
+#: C/jhbuild.xml:2679(title)
 msgid "linux"
 msgstr "linux"
 
-#: C/jhbuild.xml:2295(para)
+#: C/jhbuild.xml:2681(para)
 msgid ""
 "The <sgmltag class=\"element\">linux</sgmltag> element defines a module used "
 "to build a linux kernel. In addition, a separate kernel configuration can be "
 "chosen using the <sgmltag class=\"element\">kconfig</sgmltag> subelement."
 msgstr ""
 
-#: C/jhbuild.xml:2301(programlisting)
+#: C/jhbuild.xml:2687(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3335,23 +3920,23 @@ msgstr ""
 "\n"
 "&lt;/linux&gt;\n"
 
-#: C/jhbuild.xml:2329(title)
+#: C/jhbuild.xml:2715(title)
 msgid "perl"
 msgstr "perl"
 
-#: C/jhbuild.xml:2331(para)
+#: C/jhbuild.xml:2717(para)
 msgid ""
 "The <sgmltag class=\"element\">perl</sgmltag> element is used to build perl "
 "modules."
 msgstr ""
 
-#: C/jhbuild.xml:2334(para)
+#: C/jhbuild.xml:2720(para)
 msgid ""
 "The <sgmltag class=\"attribute\">makeargs</sgmltag> attribute is used to "
 "specify additional arguments to pass to <command>make</command>."
 msgstr ""
 
-#: C/jhbuild.xml:2338(programlisting)
+#: C/jhbuild.xml:2724(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3392,23 +3977,23 @@ msgstr ""
 "\n"
 "&lt;/perl&gt;\n"
 
-#: C/jhbuild.xml:2360(title)
+#: C/jhbuild.xml:2746(title)
 msgid "waf"
 msgstr "waf"
 
-#: C/jhbuild.xml:2362(para)
+#: C/jhbuild.xml:2748(para)
 msgid ""
 "The <sgmltag class=\"element\">waf</sgmltag> element is used to define a "
 "module which is built using the Waf build system."
 msgstr ""
 
-#: C/jhbuild.xml:2365(para)
+#: C/jhbuild.xml:2751(para)
 msgid ""
 "The <sgmltag class=\"attribute\">waf-command</sgmltag> attribute is used to "
 "specify the waf command script to use; it defaults to <command>waf</command>."
 msgstr ""
 
-#: C/jhbuild.xml:2369(programlisting)
+#: C/jhbuild.xml:2755(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3445,17 +4030,17 @@ msgstr ""
 "  &lt;/after&gt;\n"
 "&lt;/waf&gt;\n"
 
-#: C/jhbuild.xml:2390(title)
+#: C/jhbuild.xml:2776(title)
 msgid "Ant"
 msgstr "Ant"
 
-#: C/jhbuild.xml:2392(para)
+#: C/jhbuild.xml:2778(para)
 msgid ""
 "The <sgmltag class=\"element\">ant</sgmltag> element is used to define a "
 "module which is built using Ant, the Java based build tool."
 msgstr ""
 
-#: C/jhbuild.xml:2395(programlisting)
+#: C/jhbuild.xml:2781(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3490,21 +4075,21 @@ msgstr ""
 "  &lt;/after&gt;\n"
 "&lt;/ant&gt;\n"
 
-#: C/jhbuild.xml:2413(title)
+#: C/jhbuild.xml:2799(title)
 msgid "Example of a module built with ant"
 msgstr "Beispiel für ein mit Ant erstelltes Modul"
 
-#: C/jhbuild.xml:2427(title)
+#: C/jhbuild.xml:2813(title)
 msgid "testmodule"
 msgstr "testmodule"
 
-#: C/jhbuild.xml:2429(para)
+#: C/jhbuild.xml:2815(para)
 msgid ""
 "The <sgmltag class=\"element\">testmodule</sgmltag> element is used to create "
 "a module which runs a suite of tests using LDTP or Dogtail."
 msgstr ""
 
-#: C/jhbuild.xml:2433(programlisting)
+#: C/jhbuild.xml:2819(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3553,25 +4138,38 @@ msgstr ""
 "\n"
 "&lt;/testmodule&gt;\n"
 
-#: C/jhbuild.xml:2460(title)
+#: C/jhbuild.xml:2843(para)
+msgid ""
+"The <sgmltag class=\"attribute\">type</sgmltag> attribute gives the type of "
+"tests to be run in the module. 'dogtail' uses python to invoke all .py files. "
+"'ldtp' invokes 'ldtprunner run.xml'."
+msgstr ""
+
+#: C/jhbuild.xml:2848(para)
+msgid ""
+"Unless the noxvfb configuration option is set, an Xvfb server is started to "
+"run the tests in"
+msgstr ""
+
+#: C/jhbuild.xml:2854(title)
 msgid "metamodule"
 msgstr "metamodule"
 
-#: C/jhbuild.xml:2462(para)
+#: C/jhbuild.xml:2856(para)
 msgid ""
 "The <sgmltag class=\"element\">metamodule</sgmltag> element defines a module "
 "that doesn't actually do anything. The only purpose of a module of this type "
 "is its dependencies."
 msgstr ""
 
-#: C/jhbuild.xml:2467(para)
+#: C/jhbuild.xml:2861(para)
 msgid ""
 "For example, meta-gnome-desktop depends on all the key components of the "
 "GNOME desktop, therefore telling JHBuild to install it actually installs the "
 "full desktop."
 msgstr ""
 
-#: C/jhbuild.xml:2471(programlisting)
+#: C/jhbuild.xml:2865(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3598,35 +4196,35 @@ msgstr ""
 "  &lt;/suggests&gt;\n"
 "&lt;/metamodule&gt;\n"
 
-#: C/jhbuild.xml:2483(para)
+#: C/jhbuild.xml:2877(para)
 msgid ""
 "The <sgmltag class=\"attribute\">id</sgmltag> attribute gives the name of the "
 "module. The child elements are handled as for <link linkend=\"moduleset-"
 "syntax-defs-autotools\"><sgmltag class=\"element\">autotools</sgmltag></link>."
 msgstr ""
 
-#: C/jhbuild.xml:2492(title)
+#: C/jhbuild.xml:2886(title)
 msgid "Deprecated Elements"
 msgstr "Veraltete Elemente"
 
-#: C/jhbuild.xml:2498(title)
+#: C/jhbuild.xml:2892(title)
 msgid "cvsroot"
 msgstr "cvsroot"
 
-#: C/jhbuild.xml:2500(para)
+#: C/jhbuild.xml:2894(para)
 msgid ""
 "The <sgmltag class=\"element\">cvsroot</sgmltag> element is now deprecated - "
 "the <sgmltag class=\"element\">repository</sgmltag> element should be used "
 "instead."
 msgstr ""
 
-#: C/jhbuild.xml:2505(para)
+#: C/jhbuild.xml:2899(para)
 msgid ""
 "The <sgmltag class=\"element\">cvsroot</sgmltag> element is used to describe "
 "a CVS repository."
 msgstr ""
 
-#: C/jhbuild.xml:2508(programlisting)
+#: C/jhbuild.xml:2902(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3641,19 +4239,19 @@ msgstr ""
 "           root=\"<replaceable>anon-cvsroot</replaceable>\"\n"
 "           password=\"<replaceable>anon-password</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2515(para)
+#: C/jhbuild.xml:2909(para)
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute should be a unique "
 "identifier for the CVS repository."
 msgstr ""
 
-#: C/jhbuild.xml:2518(para)
+#: C/jhbuild.xml:2912(para)
 msgid ""
 "The <sgmltag class=\"attribute\">default</sgmltag> attribute says whether "
 "this is the default module source for this module set file."
 msgstr ""
 
-#: C/jhbuild.xml:2522(para)
+#: C/jhbuild.xml:2916(para)
 msgid ""
 "The <sgmltag class=\"attribute\">root</sgmltag> attribute lists the CVS root "
 "used for anonymous access to this repository, and the <sgmltag class="
@@ -3661,24 +4259,24 @@ msgid ""
 "anonymous access."
 msgstr ""
 
-#: C/jhbuild.xml:2530(title)
+#: C/jhbuild.xml:2924(title)
 msgid "svnroot"
 msgstr "svnroot"
 
-#: C/jhbuild.xml:2532(para)
+#: C/jhbuild.xml:2926(para)
 msgid ""
 "The <sgmltag class=\"element\">svnroot</sgmltag> element is now deprecated - "
 "the <sgmltag class=\"element\">repository</sgmltag> element should be used "
 "instead."
 msgstr ""
 
-#: C/jhbuild.xml:2537(para)
+#: C/jhbuild.xml:2931(para)
 msgid ""
 "The <sgmltag class=\"element\">svnroot</sgmltag> element is used to describe "
 "a Subversion repository."
 msgstr ""
 
-#: C/jhbuild.xml:2540(programlisting)
+#: C/jhbuild.xml:2934(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3691,43 +4289,43 @@ msgstr ""
 "           [ default=\"<replaceable>yes|no</replaceable>\" ]\n"
 "           href=\"<replaceable>anon-svnroot</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2546(para)
+#: C/jhbuild.xml:2940(para)
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute should be a unique "
 "identifier for the Subversion repository."
 msgstr ""
 
-#: C/jhbuild.xml:2550(para) C/jhbuild.xml:2580(para)
+#: C/jhbuild.xml:2944(para) C/jhbuild.xml:2974(para)
 msgid ""
 "If <sgmltag class=\"attribute\">default</sgmltag> attribute says whether this "
 "is the default module source for this module set file."
 msgstr ""
 
-#: C/jhbuild.xml:2554(para)
+#: C/jhbuild.xml:2948(para)
 msgid ""
 "The <sgmltag class=\"attribute\">href</sgmltag> attribute lists the base URL "
 "for the repository. This will probably be either a <literal>http</literal>, "
 "<literal>https</literal> or <literal>svn</literal> URL."
 msgstr ""
 
-#: C/jhbuild.xml:2561(title)
+#: C/jhbuild.xml:2955(title)
 msgid "arch-archive"
 msgstr "arch-archive"
 
-#: C/jhbuild.xml:2563(para)
+#: 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:2568(para)
+#: 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:2571(programlisting)
+#: C/jhbuild.xml:2965(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3740,23 +4338,23 @@ msgstr ""
 "                [ default=\"<replaceable>yes|no</replaceable>\" ]\n"
 "                href=\"<replaceable>mirror-url</replaceable>\"/&gt;\n"
 
-#: C/jhbuild.xml:2577(para)
+#: C/jhbuild.xml:2971(para)
 msgid ""
 "The <sgmltag class=\"attribute\">name</sgmltag> attribute should be the Arch "
 "archive name."
 msgstr ""
 
-#: C/jhbuild.xml:2584(para)
+#: 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:2590(title)
+#: C/jhbuild.xml:2984(title)
 msgid "Deprecated Module Types"
 msgstr "Veraltete Modultypen"
 
-#: C/jhbuild.xml:2593(para)
+#: C/jhbuild.xml:2987(para)
 msgid ""
 "This section describes deprecated elements, they may still be used in "
 "existing module sets but it is advised not to use them anymore."
@@ -3765,24 +4363,24 @@ msgstr ""
 "Modulsätzen noch verwendet werden können, was allerdings nicht mehr empfohlen "
 "wird."
 
-#: C/jhbuild.xml:2599(title)
+#: C/jhbuild.xml:2993(title)
 msgid "tarball"
 msgstr "tarball"
 
-#: C/jhbuild.xml:2602(para)
+#: C/jhbuild.xml:2996(para)
 msgid ""
 "This deprecated element is just a thin wrapper around both <sgmltag class="
 "\"element\">autotools</sgmltag> module type and <sgmltag class=\"element"
 "\">tarball</sgmltag> repository type."
 msgstr ""
 
-#: C/jhbuild.xml:2608(para)
+#: C/jhbuild.xml:3002(para)
 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:2612(programlisting)
+#: C/jhbuild.xml:3006(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3837,13 +4435,13 @@ msgstr ""
 "    &lt;/suggests&gt;\n"
 "  &lt;/tarball&gt;\n"
 
-#: C/jhbuild.xml:2638(para)
+#: C/jhbuild.xml:3032(para)
 msgid ""
 "The <sgmltag class=\"attribute\">id</sgmltag> and <sgmltag class=\"attribute"
 "\">version</sgmltag> attributes are used to identify the module."
 msgstr ""
 
-#: C/jhbuild.xml:2642(para)
+#: C/jhbuild.xml:3036(para)
 msgid ""
 "The <sgmltag class=\"element\">source</sgmltag> element specifies the file to "
 "download and compile. The <sgmltag class=\"attribute\">href</sgmltag> "
@@ -3854,7 +4452,7 @@ msgid ""
 "package was downloaded correctly."
 msgstr ""
 
-#: C/jhbuild.xml:2669(para)
+#: C/jhbuild.xml:3063(para)
 msgid ""
 "The other attributes and the <sgmltag class=\"element\">dependencies</"
 "sgmltag>, <sgmltag class=\"element\">suggests</sgmltag> and <sgmltag class="
@@ -3862,437 +4460,233 @@ msgid ""
 "\"moduleset-syntax-defs-autotools\">autotools</link>."
 msgstr ""
 
-#: C/jhbuild.xml:2681(title)
-msgid "Frequently Asked Questions"
-msgstr "Häufig gestellte Fragen"
-
-#: C/jhbuild.xml:2685(title)
-msgid "General JHBuild Questions"
-msgstr "Allgemeine Fragen zu JHBuild"
-
-#: C/jhbuild.xml:2688(simpara)
-msgid ""
-"The <command>wget</command> command can't download any tarballs. How do I get "
-"it to work with my firewall?"
-msgstr ""
-"Der Befehl <command>wget</command> kann keine Tar-Archive herunterladen. Wie "
-"kann ich erreichen, dass dies mit meiner Firewall funktioniert?"
-
-#: C/jhbuild.xml:2693(para)
-msgid ""
-"Create <filename>~/.wgetrc</filename> file. If an HTTP proxy is used to "
-"access FTP sites, add a line like the following to the file:"
-msgstr ""
-"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:"
-
-#: C/jhbuild.xml:2696(programlisting)
-#, no-wrap
-msgid "ftp_proxy = http://<replaceable>hostname</replaceable>:<replaceable>port</replaceable>/"
-msgstr "ftp_proxy = http://<replaceable>Rechnername</replaceable>:<replaceable>Port</replaceable>/"
-
-#: C/jhbuild.xml:2697(para)
-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:"
-
-#: C/jhbuild.xml:2700(programlisting)
-#, no-wrap
-msgid "passive_ftp = on"
-msgstr "passive_ftp = on"
-
-#: C/jhbuild.xml:2705(simpara)
-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?"
-
-#: C/jhbuild.xml:2709(para)
-msgid ""
-"<ulink url=\"http://ccache.samba.org/\";>CCache</ulink> can speed up "
-"compilations, as it caches compilation results. <command>CCache</command> is "
-"available with most distributions."
-msgstr ""
-"<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."
-
-#: C/jhbuild.xml:2713(para)
-msgid "Set the cache size with the following command:"
-msgstr "Legen Sie die Grö�e des Zwischenspeichers mit folgendem Befehl fest:"
-
-#: C/jhbuild.xml:2714(programlisting)
-#, no-wrap
-msgid "ccache -M 2G"
-msgstr "ccache -M 2G"
-
-#: C/jhbuild.xml:2715(para)
-msgid ""
-"(where <literal>2G</literal> is the size the cache). Create symlinks to "
-"<command>CCache</command> for the compiler in <filename>~/bin</filename>:"
-msgstr ""
-
-#: C/jhbuild.xml:2718(programlisting)
-#, no-wrap
-msgid ""
-"cd ~/bin\n"
-"for cmd in cc gcc c++ g++; do\n"
-"  ln -s /usr/bin/ccache $cmd\n"
-"done"
-msgstr ""
-"cd ~/bin\n"
-"for cmd in cc gcc c++ g++; do\n"
-"  ln -s /usr/bin/ccache $cmd\n"
-"done"
-
-#: C/jhbuild.xml:2722(para)
-msgid ""
-"It is possible to check the status of the cache including cache hit rates "
-"with the following command:"
-msgstr ""
-
-#: C/jhbuild.xml:2724(programlisting)
-#, no-wrap
-msgid "ccache -s"
-msgstr "ccache -s"
-
-#: C/jhbuild.xml:2729(simpara)
-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?"
-
-#: C/jhbuild.xml:2733(para)
-msgid ""
-"If Zenity &gt;= 2.9 is installed on your system, JHBuild will display an icon "
-"in the system tray. The icon will display the current build stage, and the "
-"tooltip will show the last message from JHBuild."
-msgstr ""
-"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."
-
-#: C/jhbuild.xml:2737(para)
-msgid "The icon will also pop up a balloon on error."
-msgstr "Das Symbol zeigt bei Fehlermeldungen auÃ?erdem eine Sprechblase an."
-
-#: C/jhbuild.xml:2742(title)
-msgid "Building GNOME"
-msgstr "GNOME erstellen"
+#. 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"
 
-#: C/jhbuild.xml:2745(simpara)
-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 ""
+#~ "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:"
 
-#: C/jhbuild.xml:2749(para)
-msgid "Some of the packages required include:"
-msgstr "Einige der benötigten Pakete sind:"
+#~ msgid "python"
+#~ msgstr "python"
 
-#: C/jhbuild.xml:2752(simpara)
-msgid ""
-"DocBook XML DTD and XSLT stylesheets. These need to be registered in the XML "
-"catalog (<filename>/etc/xml/catalog</filename>)."
-msgstr ""
-"XML-DTD und XSLT-Stilvorlagen von DocBook. Diese müssen im XML-Katalog "
-"registriert sein (<filename>/etc/xml/catalog</filename>)."
+#~ msgid "&gt;&gt;&gt;"
+#~ msgstr "&gt;&gt;&gt;"
 
-#: C/jhbuild.xml:2757(simpara)
-msgid "X libraries"
-msgstr "X-Bibliotheken"
+#~ msgid "import xml.parsers.expat"
+#~ msgstr "import xml.parsers.expat"
 
-#: C/jhbuild.xml:2760(simpara)
-msgid "fam or gamin (used by gnome-vfs for file monitoring)."
-msgstr "fam oder gamin (von gnome-vfs zur Dateiüberwachung verwendet)."
-
-#: C/jhbuild.xml:2764(simpara)
-msgid ""
-"<filename>libsmbclient</filename> from Samba (used for browsing Windows "
-"networks)."
-msgstr ""
-"<filename>libsmbclient</filename> aus Samba (wird zum Durchsuchen von Windows-"
-"Netzwerken verwendet)."
+#~ msgid ""
+#~ "<placeholder-1/> <placeholder-2/>\n"
+#~ "Python 2.6.2+ (release26-maint, Sep 13 2009, 21:26:06) \n"
+#~ "[GCC 4.4.1] on linux2\n"
+#~ "Type \"help\", \"copyright\", \"credits\" or \"license\" for more "
+#~ "information.\n"
+#~ "<placeholder-3/> <placeholder-4/>\n"
+#~ "<placeholder-5/>"
+#~ msgstr ""
+#~ "<placeholder-1/> <placeholder-2/>\n"
+#~ "Python 2.6.2+ (release26-maint, Sep 13 2009, 21:26:06) \n"
+#~ "[GCC 4.4.1] on linux2\n"
+#~ "Type \"help\", \"copyright\", \"credits\" or \"license\" for more "
+#~ "information.\n"
+#~ "<placeholder-3/> <placeholder-4/>\n"
+#~ "<placeholder-5/>"
 
-#: C/jhbuild.xml:2768(simpara)
-msgid "<filename>libbz2</filename> from bzip2."
-msgstr "<filename>libbz2</filename> aus bzip2."
+#~ 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."
 
-#: C/jhbuild.xml:2772(simpara)
-msgid ""
-"<filename>libpng</filename>, <filename>libjpeg</filename> and "
-"<filename>libtiff</filename> (used for image loading)."
-msgstr ""
-"<filename>libpng</filename>, <filename>libjpeg</filename> und "
-"<filename>libtiff</filename> (verwendet zum Laden von Bildern)."
+#~ 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"
 
-#: C/jhbuild.xml:2778(para)
-msgid ""
-"If installing distribution packages, and if applicable for your distribution, "
-"install the corresponding <quote>dev</quote> or <quote>devel</quote> "
-"packages. A list of <ulink url=\"http://live.gnome.org/JhbuildDependencies";
-"\">package names</ulink> for different distributions is maintained on the "
-"GNOME wiki."
-msgstr ""
+#~ msgid "Frequently Asked Questions"
+#~ msgstr "Häufig gestellte Fragen"
 
-#: C/jhbuild.xml:2788(simpara)
-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 "General JHBuild Questions"
+#~ msgstr "Allgemeine Fragen zu JHBuild"
 
-#: C/jhbuild.xml:2792(para)
-msgid "Two options:"
-msgstr "Zwei Optionen:"
+#~ 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?"
 
-#: C/jhbuild.xml:2795(para)
-msgid ""
-"Without JHBuild <application>HAL</application> and <application>D-Bus</"
-"application>. This method requires support from the display manager (e.g. "
-"<application>GDM</application>, <application>KDM</application>, "
-"<application>XDM</application>). Create a <filename>~/.xsession</filename> "
-"file, with the following contents:"
-msgstr ""
+#~ msgid ""
+#~ "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:"
 
-#: C/jhbuild.xml:2803(programlisting)
-#, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"exec jhbuild run gnome-session"
-msgstr ""
-"#!/bin/sh\n"
-"exec jhbuild run gnome-session"
+#~ msgid ""
+#~ "ftp_proxy = http://<replaceable>hostname</replaceable>:<replaceable>port</"
+#~ "replaceable>/"
+#~ msgstr ""
+#~ "ftp_proxy = http://<replaceable>Rechnername</replaceable>:"
+#~ "<replaceable>Port</replaceable>/"
 
-#: C/jhbuild.xml:2805(para)
-msgid ""
-"Set the <filename>~/.xsession</filename> file to be executable. At log in, "
-"set the session to <guilabel>custom</guilabel>. If the display manager does "
-"not have a <guilabel>custom</guilabel> option, refer to answer <xref linkend="
-"\"faq-built-hal\"/> below."
-msgstr ""
+#~ 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:"
 
-#: C/jhbuild.xml:2814(para)
-msgid ""
-"With JHBuild <application>HAL</application> and <application>D-Bus</"
-"application>. <application>HAL</application> and <application>D-Bus</"
-"application> are daemons provided with your distribution. They are most "
-"likely already running, but may be unusable by the GNOME development version "
-"as they are too old or incompatible."
-msgstr ""
+#~ msgid "passive_ftp = on"
+#~ msgstr "passive_ftp = on"
 
-#: C/jhbuild.xml:2822(para)
-msgid ""
-"Create a session script that is run when you log in using a display manager "
-"(e.g. <application>GDM</application>, <application>KDM</application>, "
-"<application>XDM</application>). The session script starts <command>hal</"
-"command> and <command>d-bus</command> from the JHBuild installation in "
-"addition to the system-wide versions."
-msgstr ""
+#~ 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?"
 
-#: C/jhbuild.xml:2831(programlisting)
-#, no-wrap
-msgid ""
-"\n"
-"GNOME=/opt/gnome2\n"
-" \n"
-"GDK_USE_XFT=1\n"
-"#XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME/share\n"
-"#XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOME/etc/xdg\n"
-"\n"
-"DBUS_LAUNCH=\"$GNOME/bin/dbus-launch --exit-with-session\"\n"
-" \n"
-"sudo su -c \"$GNOME/bin/dbus-daemon --system; \\\n"
-"                   $GNOME/sbin/hald\"\n"
-" \n"
-"jhbuild run $DBUS_LAUNCH gnome-session"
-msgstr ""
-"\n"
-"GNOME=/opt/gnome2\n"
-" \n"
-"GDK_USE_XFT=1\n"
-"#XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME/share\n"
-"#XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOME/etc/xdg\n"
-"\n"
-"DBUS_LAUNCH=\"$GNOME/bin/dbus-launch --exit-with-session\"\n"
-" \n"
-"sudo su -c \"$GNOME/bin/dbus-daemon --system; \\\n"
-"                   $GNOME/sbin/hald\"\n"
-" \n"
-"jhbuild run $DBUS_LAUNCH gnome-session"
+#~ 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."
 
-#: C/jhbuild.xml:2844(para)
-msgid ""
-"Adjust the variable <varname>GNOME</varname> to your local settings. "
-"Uncomment the <varname>XDG_</varname> lines for system-wide program menus in "
-"addition to the menus from the JHBuild GNOME. Save the script as <filename>/"
-"usr/bin/gnome-jhbuild-session</filename> or any other name of your choosing. "
-"Set the file to be executable."
-msgstr ""
+#~ msgid "Set the cache size with the following command:"
+#~ msgstr "Legen Sie die Grö�e des Zwischenspeichers mit folgendem Befehl fest:"
 
-#: C/jhbuild.xml:2852(para)
-msgid ""
-"As the script starts system daemons, root privileges are required obtained "
-"via <command>sudo</command>. The script requires <command>sudo</command> to "
-"be configured so it doesn't prompt for a password. Run <command>visudo</"
-"command> as root and enter the following, changing username and paths as "
-"appropriate:"
-msgstr ""
+#~ msgid "ccache -M 2G"
+#~ msgstr "ccache -M 2G"
 
-#: C/jhbuild.xml:2859(programlisting)
-#, no-wrap
-msgid ""
-"\n"
-"# Cmnd alias specification\n"
-"Cmnd_Alias  GNOME =  /opt/gnome2/bin/dbus-daemon, \\\n"
-"                     /opt/gnome2/sbin/hald\n"
-"\n"
-"# User privilege specification\n"
-"gnometester  ALL = NOPASSWD: GNOME"
-msgstr ""
-"\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 ""
+#~ "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"
 
-#: C/jhbuild.xml:2866(para)
-msgid ""
-"To add a new session entry in the display manager, create <filename>/usr/"
-"share/xsessions/gnome-jhbuild.desktop</filename> and enter:"
-msgstr ""
-"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:"
+#~ msgid "ccache -s"
+#~ msgstr "ccache -s"
 
-#: C/jhbuild.xml:2870(programlisting)
-#, no-wrap
-#| msgid ""
-#| "\n"
-#| "[Desktop Entry]\n"
-#| "Encoding=UTF-8\n"
-#| "Name=GNOME (JHBuild)\n"
-#| "Comment=This session logs you into GNOME testing session\n"
-#| "Exec=/usr/bin/gnome-jhbuild-session\n"
-#| "Icon=\n"
-#| "Type=Application"
-msgid ""
-"\n"
-"[Desktop Entry]\n"
-"Name=GNOME (JHBuild)\n"
-"Comment=This session logs you into GNOME testing session\n"
-"TryExec=/usr/bin/gnome-jhbuild-session\n"
-"Exec=/usr/bin/gnome-jhbuild-session\n"
-"Icon=\n"
-"Type=Application"
-msgstr ""
-"\n"
-"[Desktop Entry]\n"
-"Name=GNOME (JHBuild)\n"
-"Comment=This session logs you into GNOME testing session\n"
-"TryExec=/usr/bin/gnome-jhbuild-session\n"
-"Exec=/usr/bin/gnome-jhbuild-session\n"
-"Icon=\n"
-"Type=Application"
+#~ 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?"
 
-#: C/jhbuild.xml:2878(para)
-msgid ""
-"Restart <command>gdm</command> and log into your JHBuild GNOME. Select the "
-"JHBuild session before entering the login credentials. Using separate user "
-"account is recommended for testing."
-msgstr ""
-"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 ""
+#~ "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."
 
-#: C/jhbuild.xml:2888(simpara)
-msgid ""
-"I built GNOME using JHBuild with <varname>prefix</varname> set to <filename>/"
-"usr</filename>, and now my system is broken. What should I do?"
-msgstr ""
-"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 "The icon will also pop up a balloon on error."
+#~ msgstr "Das Symbol zeigt bei Fehlermeldungen auÃ?erdem eine Sprechblase an."
 
-#: C/jhbuild.xml:2893(para)
-msgid "Don't set <varname>prefix</varname> to <filename>/usr</filename>."
-msgstr ""
-"Setzen Sie <varname>prefix</varname> nicht auf <filename>/usr</filename>."
+#~ 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?"
 
-#: C/jhbuild.xml:2899(simpara)
-msgid ""
-"How do I get <command>gnome-volume-manager</command> to work when running "
-"JHBuild GNOME?"
-msgstr ""
+#~ msgid "fam or gamin (used by gnome-vfs for file monitoring)."
+#~ msgstr "fam oder gamin (von gnome-vfs zur Dateiüberwachung verwendet)."
 
-#: C/jhbuild.xml:2904(para)
-msgid ""
-"The <command>gnome-volume-manager</command> program reacts to messages from "
-"<command>hald</command> over the system message bus, which must be running as "
-"root. Assuming that your distribution comes with <acronym>HAL</acronym>, the "
-"main problem is getting <command>gnome-volume-manager</command> to talk to "
-"the system message bus."
-msgstr ""
+#~ 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?"
 
-#: C/jhbuild.xml:2911(para)
-msgid ""
-"As communication is over a UNIX domain socket, the easiest way is to create a "
-"symlink from <filename>/var/run/dbus</filename> to <filename>$prefix/var/run/"
-"dbus</filename>:"
-msgstr ""
+#~ msgid "Two options:"
+#~ msgstr "Zwei Optionen:"
 
-#: C/jhbuild.xml:2915(programlisting)
-#, no-wrap
-msgid ""
-"mkdir -p $prefix/var/run\n"
-"cd $prefix/var/run\n"
-"ln -s /var/run/dbus dbus"
-msgstr ""
-"mkdir -p $prefix/var/run\n"
-"cd $prefix/var/run\n"
-"ln -s /var/run/dbus dbus"
+#~ msgid ""
+#~ "#!/bin/sh\n"
+#~ "exec jhbuild run gnome-session"
+#~ msgstr ""
+#~ "#!/bin/sh\n"
+#~ "exec jhbuild run gnome-session"
 
-#: C/jhbuild.xml:2918(para)
-msgid ""
-"You may also have trouble building HAL with JHBuild, since it tries to "
-"install some things outside of its build root. Running <userinput>make -k "
-"install</userinput> in the hal directory might help here."
-msgstr ""
+#~ 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"
 
-#: C/jhbuild.xml:2926(simpara)
-msgid "Why doesn't Foobar (activatable D-Bus service) start?"
-msgstr ""
+#~ 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."
 
-#: C/jhbuild.xml:2930(para)
-msgid ""
-"In order to activate a D-Bus service installed within the JHBuild root, while "
-"using the system D-Bus, you have to modify the <filename>/etc/dbus-1/session."
-"conf</filename> file by adding the following line:"
-msgstr ""
+#~ 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?"
 
-#: C/jhbuild.xml:2937(para)
-msgid ""
-"Where @PREFIX@ is the prefix used by JHBuild -- the user's home directory by "
-"default."
-msgstr ""
+#~ msgid "Don't set <varname>prefix</varname> to <filename>/usr</filename>."
+#~ msgstr ""
+#~ "Setzen Sie <varname>prefix</varname> nicht auf <filename>/usr</filename>."
 
-#: C/jhbuild.xml:2942(para)
-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 ""
+#~ "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"
 
-#. 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 ""
+#~ "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 "
@@ -4338,6 +4732,3 @@ msgstr "Mario Blättermann <mariobl gnome org>, 2009"
 
 #~ msgid "svnroots"
 #~ msgstr "svnroots"
-
-#~ msgid "chmod a+x /usr/bin/gnomesvn-session"
-#~ msgstr "chmod a+x /usr/bin/gnomesvn-session"



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