Commits

Anonymous committed 401e360 Merge

merge

Comments (0)

Files changed (2)

 [hostfingerprints]
-hgsubversion.googlecode.com = 34:4b:90:e7:e3:36:81:0d:52:1f:10:c0:4c:98:66:90:4a:9e:05:c9
+hgsubversion.googlecode.com = 6e:a8:09:6a:42:60:d7:81:f7:04:b8:0f:5d:1e:ac:b3:58:db:7e:da
+# Danish translations for aragost Trifork Mercurial Kick Start.
+# Copyright (C) 2011 aragost Trifork
+# This file is distributed under the same license as the aragost Trifork
+# Mercurial Kick Start.
+# Martin Geisler <mg@lazybytes.net>, 2011.
+#
+# Translation dictionary:
+#
+# revision            Revision
+# tag                 Marker
+# working directory   Arbeitsverzeichnis
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: aragost Trifork Mercurial Kick Start\n"
+"Report-Msgid-Bugs-To: <mg@aragost.com>\n"
+"POT-Creation-Date: 2011-03-28 17:41+0100\n"
+"PO-Revision-Date: 2011-05-11 14:12+0200\n"
+"Last-Translator: Martin Geisler <mg@lazybytes.net>\n"
+"Language-Team: Danish\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/about/index.txt:12
+msgid ""
+"=====\n"
+"About\n"
+"====="
+msgstr ""
+"====\n"
+"Über\n"
+"===="
+
+#: src/about/index.txt:16
+msgid ""
+"The Mercurial Kick Start guide is maintained by `Martin Geisler`_.\n"
+"Please get in contact if you have ideas for improvements or if you\n"
+"want to contribute a chapter."
+msgstr ""
+"Der Mercurial Kick-Start-Leitfaden wird von `Martin Geisler`_ verwaltet.\n"
+"Wenn Sie Verbesserungsideen haben oder ein Kapitel beitragen wollen, \n"
+"Kontaktieren Sie uns bitte."
+
+#: src/about/index.txt:20
+msgid ""
+"The source for the guide is `hosted on Bitbucket`_. You can get a copy\n"
+"with::"
+msgstr ""
+"Der Quellcode dieses Leitfadens ist `auf Bitbucket verfügbar`_. Um eine\n"
+"Kopie zu erhalten, nutzen Sie::"
+
+#: src/about/index.txt:23
+msgid "  $ hg clone https://bitbucket.org/aragost/kick-start/"
+msgstr "  $ hg clone https://bitbucket.org/aragost/kick-start/"
+
+#: src/about/index.txt:25
+msgid ""
+"Run ``make`` to build everything. This only works on Linux --- see the\n"
+"``README`` file for information about what you need to install."
+msgstr ""
+"Nutzen Sie  ``make``, um alles zu bauen; funktioniert nur in GNU/linux --- in der\n"
+"\"``README``-Datei finden Sie Informationen, welche Abhängegkeiten sie dafür installieren müssen."
+
+#: src/about/index.txt:28
+msgid ""
+"The guide is licensed under the `GNU GPL`_. You are free to modify it\n"
+"and you can distribute your modifications as long as you distribute\n"
+"the source with them. See the license text for the full details."
+msgstr ""
+"Der Leitfaden ist unter der `GNU GPL` lizensiert. Sie dürfen ihn ändern und ihre \n"
+"veränderte Version weitergeben, solange Sie die Quelldateien mitliefern. Feinheiten\n"
+"finden Sie in der Lizenz."
+
+#: src/about/index.txt:32
+msgid ""
+".. _Martin Geisler: mg@aragost.com\n"
+".. _hosted on Bitbucket: https://bitbucket.org/aragost/kick-start/\n"
+".. _GNU GPL: https://bitbucket.org/aragost/kick-start/src/tip/COPYING"
+msgstr ""
+".. _Martin Geisler: mg@aragost.com\n"
+".. _auf Bitbucket verfügbar: https://bitbucket.org/aragost/kick-start/\n"
+".. _GNU GPL: https://bitbucket.org/aragost/kick-start/src/tip/COPYING"
+
+#: src/about/index.txt:36
+msgid ""
+"Translations\n"
+"============"
+msgstr ""
+"Übersetzungen\n"
+"============="
+
+#: src/about/index.txt:39
+msgid "A big thanks goes to the translators:"
+msgstr "Vielen Dank an die Übersetzer:"
+
+#: src/about/index.txt:41
+msgid "* Czech: Tovim"
+msgstr "* Tschechisch: Tovim"
+
+#: src/basic/index.txt:12
+msgid ""
+"===============\n"
+"Basic Mercurial\n"
+"==============="
+msgstr ""
+"========================\n"
+"Grundlagen von Mercurial\n"
+"========================"
+
+# german:translated the forst 128 lines.
+#: src/basic/index.txt:16
+msgid ""
+"We will begin with the basics of Mercurial. We believe the best way to\n"
+"learn is to do things yourself, so we encourage you to follow along\n"
+"and execute the commands you see \"Alice\" and \"Bob\" execute. You can\n"
+"tell who is executing the command by the color of their terminal:\n"
+"Alice has a pale peach colored terminal, Bob has a pale turquoise\n"
+"color, and Carla (introduced later) has a lavender color."
+msgstr ""
+"Wir beginnen mit den Grundlagen von Mercurial. Wir sind der Ansicht, dass \n"
+"man am Besten lernt, wenn man Dinge selbst ausprobiert, daher möchten wir\n"
+"Sie ermutigen, mitzumachen und die Befehle, die „Alice“ und „Bob“ nutzen \n"
+"auch selbst auszuführen. Die Farben zeigen an, wer den jeweiligen Befehl\n"
+"ausführt: \n"
+"Alice hat eine blass !TODO PEACH! gefärbte Konsole, Bobs Konsole ist blass \n"
+"Türkis, und Carla (die später vorgestellt wird) nutzt Lavendel als Farbe."
+
+#: src/basic/index.txt:23
+msgid ""
+"There are also some exercises later that cover the same things that\n"
+"Alice and Bob did."
+msgstr "Später gibt es Übungen zu den Handlungen von Alice und Bob."
+
+#: src/basic/index.txt:28
+msgid ""
+"Installation & Configuration\n"
+"============================"
+msgstr ""
+"Installation und Konfiguration\n"
+"=============================="
+
+#: src/basic/index.txt:31
+msgid ""
+"Mercurial is available for most platforms, including Windows, Mac OS\n"
+"X, and GNU/Linux:"
+msgstr ""
+"Mercurial ist auf den meisten Plattformen verfügbar, unklusive Windows, Mac OS X,\n"
+"and GNU/Linux:"
+
+#: src/basic/index.txt:34
+msgid ""
+"Windows:\n"
+"  Please only install TortoiseHg_, which gives you a complete\n"
+"  installation with Mercurial and a set of graphical tools for\n"
+"  examining and manipulating the repository."
+msgstr ""
+"Windows:\n"
+"  Bitte installieren sie nur TortoiseHg_, das ihnen eine vollständige\n"
+"  Installation mit Mercurial und einer Sammlung von Grafischen Werkzeugen\n"
+"  bietet."
+
+#: src/basic/index.txt:39
+msgid ""
+"  After installation, you will have a right-click menu in Windows\n"
+"  Explorer that gives you access to the graphical tools. After logging\n"
+"  out and in again, you will also have a `hg` and a `hgtk` program\n"
+"  available in a Command Prompt. You can use the `hgtk` program to\n"
+"  start the graphical TortoiseHg tools."
+msgstr ""
+"  Nach der Installation werden sie im Windows-Explorer ein Rechtsklick-Menü\n"
+"  haben, das Ihnen Zugriff auf die grafischen Werzeuge gibt. Nech Abmeldung \n"
+"  und erneuter Anmeldung werden Sie außerdem auf der Befehlszeile \n"
+"  ein `hg` und ein `hgtk` Programmzur Verfügung haben. Sie können das `hgtk`-\n"
+"  Programm nutzen, um die grafischen TortoiseHg-Werkzeuge zu starten.\n"
+"  "
+
+#: src/basic/index.txt:45
+msgid "  .. tip::"
+msgstr "  .. tip::"
+
+#: src/basic/index.txt:47
+msgid ""
+"     While the examples will use a few Unix commands, you can easily\n"
+"     translate them back to the equivalent commands for the Command\n"
+"     Prompt::"
+msgstr ""
+"     Obwohl die Beispiele einige Unix-Befehle nutzen, können Sie sie\n"
+"     einfach in die Äquivalinten Befehle im Command-Prompt übersetzen::"
+
+#: src/basic/index.txt:51
+msgid ""
+"       ls          -> dir\n"
+"       cat         -> type\n"
+"       echo \"abc\"  -> echo abc"
+msgstr ""
+"       ls          -> dir\n"
+"       cat         -> type\n"
+"       echo \"abc\"  -> echo abc"
+
+#: src/basic/index.txt:55
+msgid ""
+"Linux:\n"
+"  Please install Mercurial_ using either your package manager or from\n"
+"  source. A source install is recommended, which is very easy: execute\n"
+"  ``make local`` and symlink the `hg` script to a directory in your\n"
+"  ``PATH``."
+msgstr ""
+"Linux:\n"
+"  Bitte Installieren Sie Mercurial_ entweder über Ihre Paketverwaltung \n"
+"  oder aus den Quellen. Eine Installation aus den Quellen wird empfohlen \n"
+"  und ist sehr einfach: Führen Sie einfach ``make local`` in Mercurial-Ordner aus\n"
+"  und erstellen sie einen Symling zu dem `hg`-Skript in einem Ordner in ihrem ``PATH``"
+
+#: src/basic/index.txt:61
+msgid ""
+"  To install TortoiseHg, you need the PyGTK bindings. They are\n"
+"  available in most distributions. Then follow `these instructions`__.\n"
+"  That gives you the `hgtk` program."
+msgstr ""
+
+#: src/basic/index.txt:65
+msgid ""
+"Mac OS X:\n"
+"  There are binary packages available for Mercurial_. The PyGTK\n"
+"  bindings are difficult to install on Mac OS X, so instead of\n"
+"  TortoiseHg, recommend using Murky_ to examine the repository\n"
+"  history."
+msgstr ""
+
+#: src/basic/index.txt:71
+msgid ""
+".. _TortoiseHg: http://tortoisehg.org/\n"
+".. _Mercurial: http://mercurial.selenic.com/\n"
+".. __: http://bitbucket.org/tortoisehg/stable/wiki/hgtk\n"
+".. _Murky: http://bitbucket.org/snej/murky/"
+msgstr ""
+".. _TortoiseHg: http://tortoisehg.org/\n"
+".. _Mercurial: http://mercurial.selenic.com/\n"
+".. __: http://bitbucket.org/tortoisehg/stable/wiki/hgtk\n"
+".. _Murky: http://bitbucket.org/snej/murky/"
+
+#: src/basic/index.txt:76
+msgid ""
+"We will be using the command line in our examples but will sometime\n"
+"show the repository state in the Repository Explorer (`hgtk log`) from\n"
+"TortoiseHg."
+msgstr ""
+
+#: src/basic/index.txt:80 src/subrepositories/index.txt:77
+#: src/tasks/index.txt:395
+msgid ".. note::"
+msgstr ""
+
+#: src/basic/index.txt:82
+msgid ""
+"   TortoiseHg version 2.0 was recently released and the `hgtk` program\n"
+"   is now known as `thg`. The guide still uses the `hgtk` program from\n"
+"   TortoiseHg version 1.x. This means that the screenshots shown here\n"
+"   will look different from what you see when you use the latest\n"
+"   version of TortoiseHg."
+msgstr ""
+
+#: src/basic/index.txt:88
+msgid ""
+"   We will update the guide to TortoiseHg 2.0 later and hope the\n"
+"   temporary mismatch wont cause any problems."
+msgstr ""
+
+#: src/basic/index.txt:91
+msgid "After installing Mercurial, try running `hg version`:"
+msgstr ""
+
+#: src/basic/index.txt:105
+msgid ""
+"It is of course fine if you see a version number greater than 1.8.1.\n"
+"Mercurial 1.4 is also okay for our purposes, but we always recommend\n"
+"upgrading to the newest version available for your platform. You can\n"
+"verify your installation with:"
+msgstr ""
+
+#: src/basic/index.txt:125
+msgid ""
+"The username is normally missing immediately after installation. You\n"
+"set it by putting the name in a configuration file. On Unix-like\n"
+"systems this is ``$HOME/.hgrc`` and on Windows the file is called\n"
+"``%HOME%\\Mercurial.ini`` (see `hg help config` for all locations or\n"
+"use `hgtk userconfig` if you prefer). Create the file with this\n"
+"content::"
+msgstr ""
+
+#: src/basic/index.txt:132
+msgid ""
+"   [ui]\n"
+"   username = Firstname Lastname <example@example.net>"
+msgstr ""
+
+#: src/basic/index.txt:135
+msgid ""
+"but with your own name. We will use ``Alice <alice@example.net>``\n"
+"first and her terminals look like the two you saw above. Running `hg\n"
+"debuginstall` should no longer report any problems."
+msgstr ""
+
+#: src/basic/index.txt:146
+msgid ""
+"Basic Commands\n"
+"=============="
+msgstr ""
+
+#: src/basic/index.txt:149
+msgid ""
+"We will now make a swift tour through the basic commands. These are\n"
+"all similar to older systems such as Subversion or even CVS. If you\n"
+"are using TortoiseHg under Windows, then you might want to also refer\n"
+"to their `quick start guide`_."
+msgstr ""
+
+#: src/basic/index.txt:154
+msgid ""
+".. _quick start guide: http://tortoisehg.bitbucket.org/manual/1.0/quick.html"
+msgstr ".. _quick start guide: http://tortoisehg.bitbucket.org/manual/1.0/quick.html"
+
+#: src/basic/index.txt:156
+msgid ""
+"Creating a Repository\n"
+"---------------------"
+msgstr ""
+
+#: src/basic/index.txt:159
+msgid "Create a repository with the `hg init` command:"
+msgstr ""
+
+#: src/basic/index.txt:169
+msgid ""
+"The `hg init` command created a new directory which is the new\n"
+"repository. We could also have made the ``example`` directory\n"
+"ourselves and issued a blank `hg init` inside that directory to turn\n"
+"it into a repository."
+msgstr ""
+
+#: src/basic/index.txt:174
+msgid "Entering ``example`` we can look around:"
+msgstr ""
+
+#: src/basic/index.txt:185
+msgid ""
+"As you can see, the new repository is empty except for a ``.hg``\n"
+"directory in the repository root. Mercurial stores the history and\n"
+"some other administrative files inside this directory."
+msgstr ""
+
+#: src/basic/index.txt:189
+msgid ""
+"Creating a Changeset\n"
+"--------------------"
+msgstr ""
+
+#: src/basic/index.txt:192
+msgid ""
+"Let us create a file and ask Mercurial about the status of the\n"
+"repository:"
+msgstr ""
+
+#: src/basic/index.txt:202
+msgid ""
+"The reply tells us that ``hello.txt`` is unknown to Mercurial, i.e.,\n"
+"it is not yet tracked. This is just like, say, Subversion. We can add\n"
+"the file:"
+msgstr ""
+
+#: src/basic/index.txt:213
+msgid ""
+"which changes the status to \"A\" for \"added\". The file is not yet\n"
+"stored in the repository history --- we'll do this by making a commit:"
+msgstr ""
+
+#: src/basic/index.txt:221
+msgid ""
+"No output indicates success --- Mercurial wont interrupt you unless\n"
+"necessary."
+msgstr ""
+
+#: src/basic/index.txt:224
+msgid ""
+"Inspecting History\n"
+"------------------"
+msgstr ""
+
+#: src/basic/index.txt:227
+msgid "You can see inspect the newly created changeset with `hg log`:"
+msgstr ""
+
+#: src/basic/index.txt:239
+msgid ""
+"Success, you have made a commit with Mercurial! Let us modify the file\n"
+"and ask Mercurial to show us how the files in working copy differ from\n"
+"the last revision:"
+msgstr ""
+
+#: src/basic/index.txt:256
+msgid ""
+"We can change our mind and revert the file back to how it looked\n"
+"before:"
+msgstr ""
+
+#: src/basic/index.txt:266
+msgid "Let us make another change to our file:"
+msgstr ""
+
+#: src/basic/index.txt:275
+msgid ""
+"We can now ask Mercurial to annotate the file, that is, to show when\n"
+"each line was last modified:"
+msgstr ""
+
+#: src/basic/index.txt:286
+msgid ""
+"Quite right, Mercurial tells us that the first line is from revision\n"
+"0, and that the two final lines are from revision 1. TortoiseHg offers\n"
+"a very nice interactive annotate tool, see `hgtk annotate`."
+msgstr ""
+
+#: src/basic/index.txt:290
+msgid ""
+"Annotating files is an invaluable help when fixing bugs: after finding\n"
+"the bug, you can use `hg annotate` to find out when the offending line\n"
+"was introduced in your file. Then use `hg log` to retrieve the\n"
+"associated commit message, which can hopefully explain what the\n"
+"committer was trying to do when he changed the line:"
+msgstr ""
+
+#: src/basic/index.txt:306
+msgid ""
+"The two changesets in our repository are in sequence. This is best\n"
+"illustrated with the help of the standard `graphlog extension`__. To\n"
+"keep the core of Mercurial slim, a lot of functionality is delegated\n"
+"to extensions. Many of the best extensions are shipped with Mercurial\n"
+"and they are easy to enable. To enable graphlog, Alice simply adds::"
+msgstr ""
+
+#: src/basic/index.txt:312
+msgid ""
+"  [extensions]\n"
+"  graphlog ="
+msgstr ""
+"  [extensions]\n"
+"  graphlog ="
+
+#: src/basic/index.txt:315
+msgid ".. __: http://mercurial.selenic.com/wiki/GraphlogExtension"
+msgstr ".. __: http://mercurial.selenic.com/wiki/GraphlogExtension"
+
+#: src/basic/index.txt:317
+msgid ""
+"to her configuration file. She can then run `hg help graphlog` to\n"
+"learn more about the extension. This extension is particularly simple,\n"
+"it just gives Alice a new command:"
+msgstr ""
+
+#: src/basic/index.txt:339
+msgid ""
+"This shows how the changeset ``2e982bdc137f`` is a child of\n"
+"``d312da7770f4``. The same can be seen in `hgtk log`:"
+msgstr ""
+
+#: src/basic/index.txt:345
+msgid ""
+"The files in the working copy are always synchronized to a particular\n"
+"changeset. In `hgtk log`, this is shown with a slightly larger bullet\n"
+"in the changeset graph and with an underline in the Summary column. In\n"
+"the output of `hg glog`, the working directory parent revision is\n"
+"highlighted with a ``@``-sign."
+msgstr ""
+
+#: src/basic/index.txt:351
+msgid ""
+"Time Travel\n"
+"-----------"
+msgstr ""
+
+#: src/basic/index.txt:354
+msgid ""
+"You can change the working copy parent revision with the `hg update`\n"
+"command. This is useful to go back and examine old versions of your\n"
+"code, for instance if you need to test an old version of your software\n"
+"with a new operating system. Here Alice will just go back to revision\n"
+"0 to look at her old file. She first uses the `hg parents` command to\n"
+"ascertain where she is in the graph:"
+msgstr ""
+
+#: src/basic/index.txt:371
+msgid "and she then makes the jump:"
+msgstr ""
+
+#: src/basic/index.txt:384
+msgid "Her file is now back at the old version:"
+msgstr ""
+
+#: src/basic/index.txt:392
+msgid ""
+"but the newer version is not forgotten. Mercurial can easily retrieve\n"
+"it for her:"
+msgstr ""
+
+#: src/basic/index.txt:403
+msgid ""
+"The `hg cat` command is useful to quickly see old versions of files\n"
+"instead of using `hg update` to change the entire working directory to\n"
+"an old version. Going back to the tip revision is easy, just do `hg\n"
+"update` without an argument:"
+msgstr ""
+
+#: src/basic/index.txt:419 src/basic/index.txt:748
+msgid ""
+"Exercises\n"
+"---------"
+msgstr ""
+
+#: src/basic/index.txt:422
+msgid "1. Use `hg init` to create a repository called ``kick-start``."
+msgstr ""
+
+#: src/basic/index.txt:424
+msgid ""
+"2. Enter ``kick-start`` and create a couple of files. Schedule them\n"
+"   for addition with `hg add`. You can use `hg revert` to cancel a\n"
+"   pending addition if you change your mind."
+msgstr ""
+
+#: src/basic/index.txt:428
+msgid ""
+"3. Use `hg commit` to commit the files. An editor will be started if\n"
+"   you do not specify a commit message on the command line."
+msgstr ""
+
+#: src/basic/index.txt:431
+msgid "4. Make a couple of more commits."
+msgstr ""
+
+#: src/basic/index.txt:433
+msgid ""
+"5. Use `hg update` to update the working directory to an older\n"
+"   revision. Notice how the output of `hg parents` changes to match\n"
+"   and compare this with `hg tip`, which stays fixed then you use `hg\n"
+"   update`."
+msgstr ""
+
+#: src/basic/index.txt:438
+msgid ""
+"6. Try making a commit when the working parent is an old revision. You\n"
+"   will be told that you have created a new \"head\" --- a head is a\n"
+"   changeset without any children. Use `hg heads` to see the\n"
+"   repository heads and look at the graph in `hgtk log`."
+msgstr ""
+
+#: src/basic/index.txt:443
+msgid ""
+"   Notice how the newly created changeset has the changeset listed\n"
+"   previously in `hg parents` as its parent changeset. This is an\n"
+"   invariant in Mercurial: the working copy parent revision becomes\n"
+"   the parent revision of the next changeset."
+msgstr ""
+
+#: src/basic/index.txt:448
+msgid ""
+"7. Multiple heads represent multiple divergent lines of development.\n"
+"   You will normally merge these lines using `hg merge`. If your\n"
+"   changes do not overlap, then the merge will be easy. Otherwise you\n"
+"   will have to resolve the conflicts --- more about this later."
+msgstr ""
+
+#: src/basic/index.txt:453
+msgid ""
+"   Notice how `hg parents` print two changesets after you issued `hg\n"
+"   merge`. Again, this means that the next commit will have two\n"
+"   parents. You can see the parents in `hg glog` or `hgtk log` after\n"
+"   you commit."
+msgstr ""
+
+#: src/basic/index.txt:459
+msgid ""
+"Working with Others\n"
+"==================="
+msgstr ""
+
+#: src/basic/index.txt:462
+msgid ""
+"Right now Alice's repository is in her home directory. Her co-worker,\n"
+"Bob, also needs to work on the project. We will show his commands with\n"
+"a light blue background color."
+msgstr ""
+
+#: src/basic/index.txt:466
+msgid ""
+"Making a Clone\n"
+"--------------"
+msgstr ""
+
+#: src/basic/index.txt:469
+msgid ""
+"In these examples, we will let Alice and Bob share a local filesystem.\n"
+"This could very well be a company-wide network filesystem. Changes can\n"
+"also be shared over SSH and HTTP connections --- people even use emails\n"
+"or USB sticks to move around changesets. They then typically use a\n"
+"compressed binary format produced by the `hg bundle` command. This is\n"
+"not necessary here, instead Bob uses `hg clone` with a relative path\n"
+"to Alice's repository:"
+msgstr ""
+
+#: src/basic/index.txt:489
+msgid ""
+"Bob now has his own fully independent copy of Alice's repository. He\n"
+"can make such a clone as long as he has read access to Alice's files.\n"
+"Bob can make his own changesets in his clone, without affecting Alice.\n"
+"He makes a couple of changes:"
+msgstr ""
+
+#: src/basic/index.txt:509
+msgid "The repository now has four changesets:"
+msgstr ""
+
+#: src/basic/index.txt:514
+msgid ""
+"Comparing Clones\n"
+"----------------"
+msgstr ""
+
+#: src/basic/index.txt:517
+msgid ""
+"The clone knows where it originates from and Bob can ask if there are\n"
+"any changesets in Alice's clone that he does not already have:"
+msgstr ""
+
+#: src/basic/index.txt:528
+msgid "He can also ask Mercurial what changeset he has that Alice lacks:"
+msgstr ""
+
+#: src/basic/index.txt:547
+msgid ""
+"This hopefully makes sense: Bob created two new changesets in his own\n"
+"clone, so Alice does not have them yet."
+msgstr ""
+
+#: src/basic/index.txt:550
+msgid ""
+"Moving Changesets\n"
+"-----------------"
+msgstr ""
+
+#: src/basic/index.txt:553
+msgid ""
+"Bob does not have write access to the files in Alice's home directory,\n"
+"so he cannot write his changesets to her clone. But he lets her know\n"
+"that he has made a clone and asks her to retrieve the changesets. She\n"
+"does this with the `hg pull` command. Before using the command, she\n"
+"enters the path to Bob's clone in the ``.hg/hgrc`` file. This a\n"
+"repository-local configuration file. She enters::"
+msgstr ""
+
+#: src/basic/index.txt:560
+msgid ""
+"  [paths]\n"
+"  default = /home/bob/example"
+msgstr ""
+
+#: src/basic/index.txt:563
+msgid ""
+"to make Bob's clone the default target when doing `hg pull` and other\n"
+"commands that involve a remote repository. She can see what will be\n"
+"pulled with `hg incoming`:"
+msgstr ""
+
+#: src/basic/index.txt:586
+msgid ""
+"Notice how this is symmetric to when Bob executed `hg outgoing` in his\n"
+"clone. She decides to go ahead and pull Bob's changes:"
+msgstr ""
+
+#: src/basic/index.txt:602
+msgid ""
+"The final message is a hint to Alice to her know that her working copy\n"
+"parent revision has not changed:"
+msgstr ""
+
+#: src/basic/index.txt:608
+msgid ""
+"The parent revision is unchanged since Alice may have been working on\n"
+"a change of her own, and so she might not be interested in updating\n"
+"right away. In this case she does update:"
+msgstr ""
+
+#: src/basic/index.txt:619
+msgid ""
+"You will almost always want to run `hg update` after `hg pull` and for\n"
+"this reason, there is a shortcut: `hg pull -u` will automatically\n"
+"update after pulling in new changes."
+msgstr ""
+
+#: src/basic/index.txt:623
+msgid ""
+"Divergent Lines of Development\n"
+"------------------------------"
+msgstr ""
+
+#: src/basic/index.txt:626
+msgid "Alice reworks the ``hello.txt`` file a bit:"
+msgstr ""
+
+#: src/basic/index.txt:644
+msgid "At the same time, Bob is working. He creates a new file:"
+msgstr ""
+
+#: src/basic/index.txt:654
+msgid ""
+"Both Alice and Bob have now made a changeset that is a child of\n"
+"``51b2976b01e8``, but neither of them knows about this since they have\n"
+"not yet pulled or pushed the changes anywhere.  Alice decides to pull\n"
+"from Bob:"
+msgstr ""
+
+#: src/basic/index.txt:672
+msgid ""
+"What happened? A mentioned above, a \"head\" changeset is a changeset\n"
+"without any children. Since Alice and Bob have made *different*\n"
+"changes based on ``51b2976b01e8``, there is now two changesets in the\n"
+"repository without any children. These heads are divergent lines of\n"
+"development, as can be seen in `hgtk log`:"
+msgstr ""
+
+#: src/basic/index.txt:681
+msgid ""
+"The two lines of development should be reconciled, and the `hg merge`\n"
+"command is the way to do that:"
+msgstr ""
+
+#: src/basic/index.txt:691
+msgid ""
+"There were no conflicts since Alice and Bob edited different files.\n"
+"After `hg merge`, the working copy has *two* parents --- this is now you\n"
+"can tell that a merge is in progress if you have left your\n"
+"computer and forgotten about it. The merge is not yet committed since\n"
+"you might need to edit the files to make your code compile. Just\n"
+"because there were no overlapping edits (no conflicts), there might\n"
+"still be some semantic conflicts which Mercurial cannot detect. It is\n"
+"therefore a good idea to run the test suite after a merge. In our\n"
+"case, Alice goes ahead with the commit:"
+msgstr ""
+
+#: src/basic/index.txt:707
+msgid "The two heads are now bound together in the changeset graph:"
+msgstr ""
+
+#: src/basic/index.txt:712
+msgid ""
+"The merge changeset contains changes from both of its parent\n"
+"revisions. You should think of a merge changeset as your way of saying\n"
+"to the world: this is how you should combine changeset ``X`` with\n"
+"changeset ``Y``. When others pull the merge changeset from your\n"
+"repository, it will go into the right place in their changeset graph.\n"
+"They will therefore not have to do the same merge. We can see this if\n"
+"we let Bob pull from Alice:"
+msgstr ""
+
+#: src/basic/index.txt:736
+msgid ""
+"Notice how the changesets appear in a different order in Bob's\n"
+"repository compared to Alice's repository --- the \"Happy, happy!\"\n"
+"changeset has switched order with the \"Welcome file.\" changeset.\n"
+"Changesets always retain their ID, the longer hexadecimal number, but\n"
+"the revision number can change. The revision number simply depends on\n"
+"the order in which changesets was added to a repository, and when two\n"
+"people pull from each other, they will most likely end up with\n"
+"different revision numbers for the same changesets. You should\n"
+"therefore *always* refer to a changeset by its ID when talking to\n"
+"others. But you can still use the revision numbers with commands like\n"
+"`hg update` that work inside your local repository."
+msgstr ""
+
+#: src/basic/index.txt:751
+msgid "1. Create a repository and make a couple of commits inside it."
+msgstr ""
+
+#: src/basic/index.txt:753
+msgid ""
+"2. Make two clones of your repository. Notice how the ``.hg/hgrc``\n"
+"   file records the location of the original repository. The `hg\n"
+"   paths` command will show you the paths defined."
+msgstr ""
+
+#: src/basic/index.txt:757
+msgid "2. Add another path to ``.hg/hgrc``, such as::"
+msgstr ""
+
+#: src/basic/index.txt:759
+msgid "     bob = /home/bob/test"
+msgstr ""
+
+#: src/basic/index.txt:761
+msgid ""
+"   You will now be able to execute `hg pull bob`, `hg outgoing bob`,\n"
+"   etc. It is a good idea to add shortcuts for people you collaborate\n"
+"   with often."
+msgstr ""
+
+#: src/basic/index.txt:765
+msgid ""
+"3. Experiment with pulling and pushing changes. Note how the working\n"
+"   directory is not changed even though history is added to the\n"
+"   repository. The working copy parent revision is only changed with\n"
+"   `hg update`."
+msgstr ""
+
+#: src/basic/index.txt:770
+msgid ""
+"Mercurial supports disconnected collaboration. This works by\n"
+"exchanging changesets in what is called *bundles*. A bundle is a\n"
+"compressed, binary representation of a number of changesets."
+msgstr ""
+
+#: src/basic/index.txt:774
+msgid ""
+"1. Create a new changeset in one of your repositories. Use `hg bundle\n"
+"   --base X out.bundle` to create a bundle in ``out.bundle`` that\n"
+"   contains all changesets following ``X``. The idea is that you\n"
+"   record somewhere the last known shared changeset between you and\n"
+"   the target, and use that as the base."
+msgstr ""
+
+#: src/basic/index.txt:780
+msgid ""
+"2. Go to the target repository and use `hg unbundle` to import the\n"
+"   changesets from the bundle. In this example you will most likely\n"
+"   have both repositories on your own machine, but in reality the two\n"
+"   repositories could be on machines that are never online at the same\n"
+"   time. In that case, bundles offer a way for you to move changesets\n"
+"   over, say, email."
+msgstr ""
+
+#: src/basic/index.txt:787
+msgid "You can also publish your repository via HTTP:"
+msgstr ""
+
+#: src/basic/index.txt:789
+msgid ""
+"1. Execute `hg serve` in a repository. You can now access the\n"
+"   repository in a browser with ``http://localhost:8000``. Try to\n"
+"   start a server for both Alice's and Bob's repository."
+msgstr ""
+
+#: src/basic/index.txt:793
+msgid "2. Try to pull from a repository published with `hg serve`."
+msgstr ""
+
+#: src/basic/index.txt:795
+msgid ""
+"Note `hg serve` is intended for ad-hoc publishing. For permanent\n"
+"publishing you can for example use Apache with the ``hgweb.cgi``\n"
+"script supplied with Mercurial."
+msgstr ""
+
+#: src/basic/index.txt:800 src/hgsubversion/index.txt:330
+#: src/tasks/index.txt:943
+msgid ""
+"Summary\n"
+"======="
+msgstr ""
+
+#: src/basic/index.txt:803
+msgid ""
+"You have seen most of the basic commands in Mercurial and you have\n"
+"seen how the history graph works. The important commands are:"
+msgstr ""
+
+#: src/basic/index.txt:806
+msgid ""
+"* `hg init`: create a new repository.\n"
+"* `hg add`: schedule a file for addition.\n"
+"* `hg diff`: see changes that will be included in the next commit.\n"
+"* `hg commit`: save your changes in the current repository.\n"
+"* `hg log`: see all changes in your repository.\n"
+"* `hg pull`: get all changes from another repository into the current one.\n"
+"* `hg push`: send all changes from your repository to another one.\n"
+"* `hg merge`: join different lines of history."
+msgstr ""
+
+#: src/basic/index.txt:815
+msgid "And very importantly:"
+msgstr ""
+
+#: src/basic/index.txt:817
+msgid "* `hg help`"
+msgstr ""
+
+#: src/hgsubversion/index.txt:12
+msgid ""
+"===========================\n"
+"Interacting with Subversion\n"
+"==========================="
+msgstr ""
+
+#: src/hgsubversion/index.txt:16
+msgid ""
+"The `hgsubversion extension`__ turns Mercurial into a Subversion\n"
+"client. This gives you offline commits and all the other nice features\n"
+"of Mercurial while letting you push changesets back to Subversion."
+msgstr ""
+
+#: src/hgsubversion/index.txt:22
+msgid ""
+"Installation\n"
+"============"
+msgstr ""
+
+#: src/hgsubversion/index.txt:25
+msgid ".. __: http://bitbucket.org/durin42/hgsubversion/"
+msgstr ".. __: http://bitbucket.org/durin42/hgsubversion/"
+
+#: src/hgsubversion/index.txt:38
+msgid ""
+"The extension requires the Python Subversion bindings. The bindings\n"
+"are bundled with TortoiseHg on Windows and on Linux you want to search\n"
+"for a package called ``python-subversion`` or similar. You must\n"
+"install the extension yourself by running::"
+msgstr ""
+
+#: src/hgsubversion/index.txt:43
+msgid ""
+"   $ hg clone https://hgsubversion.googlecode.com/hg/#1.1.2 hgsubversion"
+msgstr "   $ hg clone https://hgsubversion.googlecode.com/hg/#1.1.2 hgsubversion"
+
+#: src/hgsubversion/index.txt:45
+msgid ""
+"You can leave out the version number if you want the very latest\n"
+"version, the version number shown above is the one used for this\n"
+"guide. Now put::"
+msgstr ""
+
+#: src/hgsubversion/index.txt:49
+msgid ""
+"   [extensions]\n"
+"   hgsubversion = path/to/hgsubversion"
+msgstr ""
+
+#: src/hgsubversion/index.txt:52
+msgid ""
+"into your configuration file to load the extension. If you have\n"
+"installed the extension using your package manager, then it has most\n"
+"likely been put in your ``PYTHONPATH`` and so you just need to add::"
+msgstr ""
+
+#: src/hgsubversion/index.txt:56
+msgid ""
+"   [extensions]\n"
+"   hgsubversion ="
+msgstr ""
+
+#: src/hgsubversion/index.txt:59
+msgid ""
+"Use `hg help hgsubversion` to double-check that the extension is\n"
+"enabled."
+msgstr ""
+
+#: src/hgsubversion/index.txt:62
+msgid ""
+"Cloning Subversion\n"
+"=================="
+msgstr ""
+
+#: src/hgsubversion/index.txt:65
+msgid ""
+"We have prepared a Subversion repository with a small Hello World\n"
+"program. There is a repository for each group, named ``hello1``,\n"
+"``hello2``, …, ``hello5``. Please clone the one corresponding to your\n"
+"group number:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:98
+msgid ""
+"She inspects the repository with `hgtk log` to see that the tags were\n"
+"defined properly:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:104
+msgid ""
+"The final Subversion revision sets the ``svn:ignore`` property to\n"
+"``hello`` in order to ignore the compiled binary. In Mercurial, ignore\n"
+"patterns are controlled in the top-level ``.hgignore`` file. This file\n"
+"can be generated with the command:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:114
+msgid ""
+"Normally, one would commit the ``.hgignore`` file in order to share it\n"
+"with everybody who uses the repository. However, since Subversion is\n"
+"still the master in this setup, you might not want to push the\n"
+"``.hgignore`` file back there. For that reason, the generated\n"
+"``.hgignore`` file ignores itself. You can regenerate it from time to\n"
+"time with `hg svn genignore --force`."
+msgstr ""
+
+#: src/hgsubversion/index.txt:121
+msgid ""
+"Pushing to Subversion\n"
+"====================="
+msgstr ""
+
+#: src/hgsubversion/index.txt:124
+msgid "Alice can now edit the files and commit them with Mercurial:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:142
+msgid ""
+"The change is not yet on the Subversion server --- like normal, `hg\n"
+"push` is needed. Pushing the changeset involves rewriting it. This is\n"
+"because the Subversion server is the master and when you commit to a\n"
+"Subversion server, it will determine the username and timestamp that\n"
+"goes into the revision. On the Mercurial side, the changeset is\n"
+"rewritten to reflect the updated meta data:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:169
+msgid "You can see the updated changeset like this:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:191
+msgid ""
+"Notice how the author and timestamp changed because the Subversion\n"
+"server updated the meta data. Because changesets are rewritten, you\n"
+"should not make further Mercurial clones of your original clone. If\n"
+"you do so, you will have to manually strip the old versions of\n"
+"changesets that are pushed to Subversion."
+msgstr ""
+
+#: src/hgsubversion/index.txt:197
+msgid ""
+"Pulling from Subversion\n"
+"======================="
+msgstr ""
+
+#: src/hgsubversion/index.txt:200
+msgid "Alice makes a couple of more local changes in her Mercurial clone:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:249
+msgid "Meanwhile, the Subversion repository has been changed:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:281
+msgid "The new revision causes a fork in the history:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:286
+msgid ""
+"When Alice push, her two changesets (``7d780c6154fb`` and\n"
+"``12445668eefc``) will automatically be rebased on top of the revision\n"
+"she just pulled from Subversion (``2099057558d2``):"
+msgstr ""
+
+#: src/hgsubversion/index.txt:323
+msgid ""
+"Again, this is necessary since Subversion is a strictly linear system.\n"
+"The new history looks like this:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:333
+msgid ""
+"The hgsubversion extension lets you use Mercurial as a Subversion\n"
+"client. This immediately gives you the following advantages compared\n"
+"to the normal Subversion client:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:337
+msgid ""
+"* Full history on client. This enables the fast bug-hunting techniques\n"
+"  offered by Mercurial, be it simply searching the history for the\n"
+"  introduction of a particular string with `hg grep` or `hg annotate`,\n"
+"  or be it the more advanced binary search done with `hg bisect`."
+msgstr ""
+
+#: src/hgsubversion/index.txt:342
+msgid ""
+"  People simply begin working differently with their tools when they\n"
+"  become sufficiently fast. Mercurial is designed to make local access\n"
+"  fast."
+msgstr ""
+
+#: src/hgsubversion/index.txt:346
+msgid ""
+"* Local (offline) commits. Version control is all about tracking the\n"
+"  development of the code. In particular, version control should let\n"
+"  people experiment with new ideas and features. To do this, people\n"
+"  need to commit often --- maybe every five minutes when they think they\n"
+"  have come a little closer to a working solution."
+msgstr ""
+
+#: src/hgsubversion/index.txt:352
+msgid ""
+"  Subversion forces people to publish these revisions immediately.\n"
+"  People will therefore tend to hold off on committing, especially to\n"
+"  the trunk, out of fear of breaking the build. If people work on a\n"
+"  branch, all these commits will pollute the history and make\n"
+"  reviewing hard."
+msgstr ""
+
+#: src/hgsubversion/index.txt:358
+msgid ""
+"  Mercurial lets people commit as often as they feel necessary. The\n"
+"  changes can later be refined into fewer, and more meaningful commits\n"
+"  that are easy to review and which avoids a lot of false starts.\n"
+"  These refined commits are then pushed to the Subversion server."
+msgstr ""
+
+#: src/hgsubversion/index.txt:363
+msgid ""
+"* Distributed development. You saw above how changesets are rebased\n"
+"  when pushed to Subversion. This makes it tedious to collaborate with\n"
+"  others if the changesets on which you are working are continuously\n"
+"  changed under your feet."
+msgstr ""
+
+#: src/hgsubversion/index.txt:368
+msgid ""
+"  However, it is possible to work in a distributed fashion on a new\n"
+"  feature. It merely requires that the collaborators wait with pushing\n"
+"  to Subversion until they are done. So you can make as many clones as\n"
+"  you want and push/pull between them as you like. When the feature is\n"
+"  done, you integrate it in Subversion and ask the rest of your team\n"
+"  to ditch their local clones and pull the rebased changesets from the\n"
+"  Subversion server."
+msgstr ""
+
+#: src/hgsubversion/index.txt:376
+msgid ""
+"The hgsubversion extension can also be used as a way to convert to\n"
+"Mercurial. Mercurial already ships with a convert extension, but\n"
+"hgsubversion is known to convert some repositories better and more\n"
+"accurately."
+msgstr ""
+
+#: src/hgsubversion/index.txt:381
+msgid ""
+"The main problem in converting from Subversion (or really, any legacy\n"
+"system) to Mercurial is the lack of rigor in the old systems.\n"
+"Subversion has no tags and no branches, it only has a (very) strong\n"
+"convention that says that a copy from ``trunk/`` to ``branches/foo``\n"
+"indicates the creation of a branch named \"foo\". But nothing prevents\n"
+"someone from copying half of ``trunk/`` to ``branches/foo``, or from\n"
+"making a commit that modifies files in both ``trunk/`` and\n"
+"``branches/foo`` simultaneously."
+msgstr ""
+
+#: src/hgsubversion/index.txt:390
+msgid ""
+"This kind of \"cruft\" cannot always be represented in a meaningful way\n"
+"in Mercurial, but hgsubversion still does a good job at interpreting\n"
+"the developers' intentions."
+msgstr ""
+
+#: src/index.txt:12
+msgid ""
+"====================\n"
+"Mercurial Kick Start\n"
+"===================="
+msgstr ""
+"====================\n"
+"Mercurial Kick Start\n"
+"===================="
+
+#: src/index.txt:19
+msgid ""
+"Welcome to the `aragost Trifork`_ Mercurial Kick Start. We have\n"
+"prepared several different sets of exercises for you:"
+msgstr ""
+
+#: src/index.txt:22
+msgid ""
+"`Basic Mercurial`_:\n"
+"  Install Mercurial and get started right away. We will show you the\n"
+"  basic commands and show you how to work with others as a team."
+msgstr ""
+
+#: src/index.txt:26
+msgid ""
+"`Task Based Development`_:\n"
+"  Building on the first set of exercises, we will now show how\n"
+"  Mercurial lets your organize your tasks using branches. A release\n"
+"  manager will then review and merge the tasks."
+msgstr ""
+
+#: src/index.txt:31
+msgid ""
+"`Remote Repositories`_:\n"
+"  A closer look at how you can interact with remote repositories in\n"
+"  Mercurial. You will see how HTTP and SSH URLs can be used and learn\n"
+"  how to best cache your credentials for each type of URL."
+msgstr ""
+
+#: src/index.txt:36
+msgid ""
+"`Interacting with Subversion`_:\n"
+"  Mercurial is can be used as a client for Subversion. This\n"
+"  immediately gives you all the benefits of Mercurial: improved\n"
+"  performance and offline commits."
+msgstr ""
+
+#: src/index.txt:41
+msgid ""
+"`Subrepositories`_:\n"
+"   Mercurial lets you link other repositories to your repositories,\n"
+"   which can be useful for e.g. libraries. Both Mercurial and \n"
+"   Subversion repositories are supported as  subrepositories."
+msgstr ""
+
+#: src/index.txt:46
+msgid ""
+"We welcome new contributions, please see the `about page`_ for more\n"
+"information."
+msgstr ""
+
+#: src/index.txt:49
+msgid ".. _about page: about/"
+msgstr ""
+".. __: `Basic Mercurial`_\n"
+".. __: `Task Based Development`_\n"
+".. __: `Remote Repositories`_\n"
+".. __: `Interacting with Subversion`_\n"
+".. __: `Subrepositories`_\n"
+"\n"
+".. __: about/"
+
+#: src/remote/index.txt:12
+msgid ""
+"===================\n"
+"Remote Repositories\n"
+"==================="
+msgstr ""
+
+#: src/remote/index.txt:16
+msgid ""
+"This guide will show you how Mercurial can be used to talk with remote\n"
+"repositories over HTTP and SSH."
+msgstr ""
+
+#: src/remote/index.txt:41
+msgid ""
+"In the `Basic Mercurial`_ guide, you saw how Alice and Bob could push\n"
+"and pull between each other on the same filesystem. This is a fine\n"
+"setup when Alice and Bob share a filesystem between them, but most\n"
+"users have direct access to each other's files like that. This is why\n"
+"Mercurial can access remote repositories over a network connection."
+msgstr ""
+
+#: src/remote/index.txt:47
+msgid "Mercurial speaks two network protocols:"
+msgstr ""
+
+#: src/remote/index.txt:49
+msgid "* HTTP: the protocol used by normal webservers."
+msgstr ""
+
+#: src/remote/index.txt:51
+msgid ""
+"  Mercurial comes with a small built-in webserver that you can start\n"
+"  with `hg serve` and which will let you browse the repository history\n"
+"  using your normal webbrowser. For more heavy-duty use, the\n"
+"  ``hgweb.cgi`` script is recommended."
+msgstr ""
+
+#: src/remote/index.txt:56
+msgid "* SSH: the secure shell protocol used on many Unix systems."
+msgstr ""
+
+#: src/remote/index.txt:58
+msgid ""
+"  If you already have an account on a server with Mercurial installed,\n"
+"  then using SSH is the easiest way to close a repository. It is\n"
+"  possible to setup an account with a restricted account so that users\n"
+"  can only execute Mercurial-related commands do not get a full login\n"
+"  shell."
+msgstr ""
+
+#: src/remote/index.txt:65
+msgid ""
+"Working with Repositories over HTTP\n"
+"==================================="
+msgstr ""
+
+#: src/remote/index.txt:68
+msgid ""
+"We start by taking a look at how you can interact with repositories\n"
+"over HTTP. This protocol is very popular since it integrates well most\n"
+"companies' existing infrastructure: when you have a functioning\n"
+"webserver that can be accessed on port 80, then you have all you need\n"
+"to serve Mercurial repositories too."
+msgstr ""
+
+#: src/remote/index.txt:74
+msgid ""
+"Cloning over HTTP\n"
+"-----------------"
+msgstr ""
+
+#: src/remote/index.txt:77
+msgid "We will start by letting Alice clone a small example repository:"
+msgstr ""
+
+#: src/remote/index.txt:92
+msgid ""
+"As you can see, this is not relly different from when Alice cloned a\n"
+"repository using a filesystem path: in both cases, Alice ends up with\n"
+"a complete copy of the repository and the ``default`` branch is\n"
+"checked out."
+msgstr ""
+
+#: src/remote/index.txt:97
+msgid ""
+"Under the covers, Mercurial is able to make the local clone much more\n"
+"efficient than a clone made over HTTP. This is not just due to the\n"
+"fact that reading data over the network is slower than reading it from\n"
+"a disk, but also because a local clone will re-use the space in the\n"
+"``.hg`` directory by using hardlinks between the files. The two clones\n"
+"will thus share the disk space used by the two ``.hg`` directories and\n"
+"it is only the working copies that take up new disk space. This is\n"
+"what makes it feasible to create as many local throw-away clones as\n"
+"you like."
+msgstr ""
+
+#: src/remote/index.txt:107
+msgid "Alice can now make her own commits in her clone:"
+msgstr ""
+
+#: src/remote/index.txt:116
+msgid ""
+"This is the essense of distributed revision control --- Alice can get\n"
+"her own independent copy of the repository and work on it locally. She\n"
+"can compare her clone with the remote server:"
+msgstr ""
+
+#: src/remote/index.txt:132
+msgid ""
+"She wont be able to push her changeset to the server since she does\n"
+"not have write access to this particular repository."
+msgstr ""
+
+#: src/remote/index.txt:136
+msgid ""
+"Serving a Repository over HTTP\n"
+"------------------------------"
+msgstr ""
+
+#: src/remote/index.txt:139
+msgid ""
+"As mentioned earlier, Mercurial has a built-in webserver. You can use\n"
+"this to quickly share a repository with another machine on your LAN,\n"
+"or even for browsing the history yourself."
+msgstr ""
+
+#: src/remote/index.txt:143
+msgid "We will let Alice serve her clone of the ``hello`` repository:"
+msgstr ""
+
+#: src/remote/index.txt:153
+msgid ""
+"The repository can now be browsed with a normal webbrowser at the\n"
+"address http://localhost:8000/. There you can see the project history\n"
+"and the changeset graph, you can examine individual changesets, you\n"
+"can see lists of tags and branches, you can annotate files, and you\n"
+"can retrieve any revision as a tarball or a zip-file. In other words,\n"
+"the built-in webserver is very convenient for humans, as well as for\n"
+"computers :-)"
+msgstr ""
+
+#: src/remote/index.txt:161
+msgid "Bob can make a clone of Alice's repository:"
+msgstr ""
+
+#: src/remote/index.txt:178
+msgid ""
+"If Bob makes a change and tries to push it back, he is met with the\n"
+"following error:"
+msgstr ""
+
+#: src/remote/index.txt:191
+msgid ""
+"What happens is that Mercurial's webserver wont let you push over\n"
+"plain HTTP by default, it requires you to use a HTTPS URL. Alice can\n"
+"disable this requirement by using ``--config web.push_ssl=No`` on the\n"
+"command line when she serves the repository. She first kills the old\n"
+"`hg serve` process and then starts a new:"
+msgstr ""
+
+#: src/remote/index.txt:205
+msgid ""
+"When Bob tries again he is met by a new error because repositories are\n"
+"read-only by default:"
+msgstr ""
+
+#: src/remote/index.txt:216
+msgid ""
+"Notice that the push was aborted without giving Bob any chance of\n"
+"entering a username or password. The reason for this is that the\n"
+"built-in webserver does *not* support authentication. That is, there\n"
+"is no user management built into it. This may sound odd, but the idea\n"
+"is that you would not run `hg serve` in a production environment.\n"
+"Instead you would run the ``hgweb.cgi`` script supplied with Mercurial\n"
+"and you would run this CGI script in a real webserver such as Apache.\n"
+"This webserver will have the necessary infrastructure to do proper\n"
+"user authentication. An advantage of this setup is that you can do the\n"
+"authentication using whatever method you prefer: if you have a setup\n"
+"where you authenticate users against an LDAP database, then you just\n"
+"reuse that for Mercurial."
+msgstr ""
+
+#: src/remote/index.txt:229
+msgid ""
+"For our example, we will let Alice disable the authentication check\n"
+"with yet another command line option:"
+msgstr ""
+
+#: src/remote/index.txt:240
+msgid "Bob can now push his changeset back to Alice:"
+msgstr ""
+
+#: src/remote/index.txt:253
+msgid ""
+"Here there were no authentication, but for most real-world\n"
+"repositories you will have to authenticate in order to push changesets\n"
+"back (and sometimes also in order to pull changesets). We will discuss\n"
+"`caching of HTTP(S) credentials`_ below."
+msgstr ""
+
+#: src/remote/index.txt:263 src/remote/index.txt:316
+msgid ""
+"Filesystem Permissions\n"
+"----------------------"
+msgstr ""
+
+#: src/remote/index.txt:266
+msgid ""
+"When you access a repository through the ``hgweb.cgi`` script, then\n"
+"the access is really done by the webserver. The webserver process will\n"
+"run as some user on the server and that user must have read access to\n"
+"the repository files in order to serve them."
+msgstr ""
+
+#: src/remote/index.txt:271
+msgid ""
+"When people push changes back over HTTP, it is also the webserver\n"
+"process that writes the new files in the ``.hg`` directory. The\n"
+"usernames embedded in the changesets play no role here."
+msgstr ""
+
+#: src/remote/index.txt:276
+msgid ""
+"Working with Repositories over SSH\n"
+"=================================="
+msgstr ""
+
+#: src/remote/index.txt:279
+msgid ""
+"The other network protocol supported by Mercurial is SSH. When using\n"
+"SSH URLs, Mercurial will login to the server and setup a SSH tunnel\n"
+"between two Mercurial processes. The two processes will then\n"
+"communicate with each other in order to push or pull changesets."
+msgstr ""
+
+#: src/remote/index.txt:284
+msgid ""
+"This implies that there need to be a SSH account on the server. Many\n"
+"system administrators will therefore prefer the HTTP based setup\n"
+"instead since that ties into their existing webserver setup."
+msgstr ""
+
+#: src/remote/index.txt:288
+msgid ""
+"However, if you do have an account on the server and if Mercurial is\n"
+"installed on the system, then the SSH protocol is very seamless for a\n"
+"user. The only thing to remember is that the syntax is a URL syntax\n"
+"and not a ``scp`` or ``rsync`` SSH path. So you write::"
+msgstr ""
+
+#: src/remote/index.txt:293
+msgid "    $ hg clone ssh://server/path/to/repository"
+msgstr ""
+
+#: src/remote/index.txt:295
+msgid "and not::"
+msgstr ""
+
+#: src/remote/index.txt:297
+msgid "    $ hg clone server:path/to/repository"
+msgstr ""
+
+#: src/remote/index.txt:299
+msgid ""
+"Note also that ``path/to/repository`` is *relative to your home\n"
+"directory* on the server. If you want to use an absolute path on the\n"
+"server, then use a URL like this::"
+msgstr ""
+
+#: src/remote/index.txt:303
+msgid "    $ hg clone ssh://server//absolute/path/to/repository"
+msgstr ""
+
+#: src/remote/index.txt:305
+msgid ""
+"The first slash is part of the URL syntax, the second slash is part of\n"
+"the path on the server, so that the above URL will find\n"
+"``/absolute/path/to/repository`` on the server."
+msgstr ""
+
+#: src/remote/index.txt:309
+msgid ""
+"Unlike with HTTP URLs, you can use a SSH URL as a target for `hg\n"
+"clone`. This lets you do::"
+msgstr ""
+
+#: src/remote/index.txt:312
+msgid "    $ hg clone . ssh://server/path/to/repository"
+msgstr ""
+
+#: src/remote/index.txt:314
+msgid "in order to clone the current repository to the server."
+msgstr ""
+
+#: src/remote/index.txt:319
+msgid ""
+"Because Mercurial makes a login on the server, it is the user on the\n"
+"server that must have read access to the repository files in order for\n"
+"you to make a clone or to pull changesets. Likewise, it is the user on\n"
+"the server that must have write access to the repository files in\n"
+"order for you to push changesets back."
+msgstr ""
+
+#: src/remote/index.txt:325
+msgid ""
+"If you see errors when pushing changes over SSH, then add `--debug` to\n"
+"your push command and see what Mercurial is doing. Try logging in with\n"
+"the same user over SSH and check that you can access the files."
+msgstr ""
+
+#: src/remote/index.txt:330
+msgid ""
+"Caching of HTTP(S) Credentials\n"
+"=============================="
+msgstr ""
+
+#: src/remote/index.txt:333
+msgid ""
+"When you talk to a webserver, it can prompt Mercurial for a username\n"
+"and password in order to authenticate you. You will then normally be\n"
+"asked to enter the information in the prompt::"
+msgstr ""
+
+#: src/remote/index.txt:337
+msgid ""
+"   $ hg clone https://bitbucket.org/aragost/private\n"
+"   http authorization required\n"
+"   realm: Bitbucket.org HTTP\n"
+"   user: aragost\n"
+"   password: <secret>\n"
+"   abort: http authorization required"
+msgstr ""
+
+#: src/remote/index.txt:344
+msgid ""
+"Since you will have to authenticate on every command that involves the\n"
+"remote repository (that is commands like `hg clone`, `hg pull`, `hg\n"
+"push`, `hg incoming`, and `hg outgoing`) you will quickly get tired of\n"
+"this. There are several ways to make Mercurial save the credentials.\n"
+"We will present them here in order of preference."
+msgstr ""
+
+#: src/remote/index.txt:350
+msgid ".. tip::"
+msgstr ""
+
+#: src/remote/index.txt:352
+msgid ""
+"   You may be wondering how you can make Mercurial cache your SSH\n"
+"   passphrase. The answer is that you cannot do this --- the SSH\n"
+"   authentication is external to Mercurial and you must use a standard\n"
+"   *SSH agent* to cache the passphrase."
+msgstr ""
+
+#: src/remote/index.txt:357
+msgid ""
+"   An SSH agent is a program that runs in the background and keeps a\n"
+"   decrypted version of your SSH private key in memory. Whenever you\n"
+"   need to make a SSH connection, the ``ssh`` program will ask the\n"
+"   agent if it has a suitable decrypted private key. If so, the\n"
+"   connection can be made without you entering any password, otherwise\n"
+"   ``ssh`` will prompt you for a password like normal."
+msgstr ""
+
+#: src/remote/index.txt:364
+msgid ""
+"   You add your key to the SSH agent with ``ssh-add`` on Linux and Mac\n"
+"   OS X and you use Pageant_ when using Putty on Windows."
+msgstr ""
+
+#: src/remote/index.txt:367
+msgid ""
+".. _pageant: http://the.earth.li/~sgtatham/putty/0.60/htmldoc/Chapter9.html"
+msgstr ""
+
+#: src/remote/index.txt:369
+msgid ""
+"Keyring Extension\n"
+"-----------------"
+msgstr ""
+
+#: src/remote/index.txt:379
+msgid ""
+"The `keyring extension`_ will hook into Mercurial and intercept\n"
+"password requests. The passwords you enter a then stored securely in\n"
+"an OS-specific password database and you wont have to enter them\n"
+"again. It stores passwords used for HTTP(S) authentication and SMTP\n"
+"authentication (as done by the `patchbomb extension`_ among others)."
+msgstr ""
+
+#: src/remote/index.txt:385
+msgid ""
+"This solution is the standard solution for Windows when you use\n"
+"TortoiseHg since they ship both the extension and the extra libraries\n"
+"needed to talk with the Windows password backend. On others systems,\n"
+"you will have to install the apropriate backend libraries yourself."
+msgstr ""
+
+#: src/remote/index.txt:390
+msgid ""
+".. _keyring extension: http://mercurial.selenic.com/wiki/KeyringExtension\n"
+".. _patchbomb extension: http://mercurial.selenic.com/wiki/PatchbombExtension"
+msgstr ""
+
+#: src/remote/index.txt:394
+msgid ""
+"Stored in User Configuration File\n"
+"---------------------------------"
+msgstr ""
+
+#: src/remote/index.txt:405
+msgid ""
+"You can save the credentials directly in your Mercurial configuration\n"
+"file. You do this with the `auth section`_::"
+msgstr ""
+
+#: src/remote/index.txt:408
+msgid ""
+"   [auth]\n"
+"   bb.prefix = https://bitbucket.org/\n"
+"   bb.username = alice\n"
+"   bb.password = <secret>"
+msgstr ""
+
+#: src/remote/index.txt:413
+msgid ""
+"The ``[auth]`` section contains a number of entries, and the entries\n"
+"are grouped by an arbitrary key chosen by you. Above, we used ``bb``\n"
+"as the key for Bitbucket, but we could have picked anything. If you\n"
+"have more sites you want to store the password for, then you need to\n"
+"use different keys for each host::"
+msgstr ""
+
+#: src/remote/index.txt:419
+msgid ""
+"   [auth]\n"
+"   site-a.prefix = https://hg.site-a.net/\n"
+"   site-a.username = userA\n"
+"   site-a.password = <secret-a>"
+msgstr ""
+
+#: src/remote/index.txt:424
+msgid ""
+"   site-b.prefix = https://site-b.org/repos/\n"
+"   site-b.username = userB\n"
+"   site-b.password = <secret-b>"
+msgstr ""
+
+#: src/remote/index.txt:428
+msgid ".. _auth section: http://www.selenic.com/mercurial/hgrc.5.html#auth"
+msgstr ""
+
+#: src/remote/index.txt:431
+msgid ""
+"Embedded in Push/Pull URL\n"
+"-------------------------"
+msgstr ""
+
+#: src/remote/index.txt:440
+msgid ""
+"This final way takes advantage of a built-in feature in the\n"
+"specification of URLs: one can embed a username and password directly\n"
+"into them. The URL syntax is::"
+msgstr ""
+
+#: src/remote/index.txt:444
+msgid "   scheme://username:password@domain:port/path"
+msgstr ""
+
+#: src/remote/index.txt:446
+msgid "so if you execute ::"
+msgstr ""
+
+#: src/remote/index.txt:448
+msgid "   hg clone https://alice:<secret>@bitbucket.org/aragost/private"
+msgstr ""
+
+#: src/remote/index.txt:450
+msgid ""
+"then Mercurial will automatically use ``alice`` as the username and\n"
+"``<secret>`` as the password when logging into Bitbucket. If the clone\n"
+"is succesful, then the full URL is stored as the default path in the\n"
+"``.hg/hgrc`` file like normal. Because the username and password is\n"
+"stored in the URL, future invocations of `hg pull` and `hg push` will\n"
+"do the authentication automatically without any prompts."
+msgstr ""
+
+#: src/remote/index.txt:458
+msgid ""
+"Configuring Shorthand URL Schemes\n"
+"================================="
+msgstr ""
+
+#: src/remote/index.txt:461
+msgid ""
+"When you work a lot with repositories on the same host, then it might\n"
+"become annoying to repeatedly type::"
+msgstr ""
+
+#: src/remote/index.txt:464
+msgid "   hg clone https://hg.my-long-servername.com/repos/"
+msgstr ""
+
+#: src/remote/index.txt:466
+msgid ""
+"Shortening HTTP URLs\n"
+"--------------------"
+msgstr ""
+
+#: src/remote/index.txt:469
+msgid ""
+"Mercurial has a standard extension that will help you shorten those\n"
+"URLs. You enable the `schemes extension`_ and can then add the\n"
+"following to your configuration file::"
+msgstr ""
+
+#: src/remote/index.txt:473
+msgid ""
+"   [schemes]\n"
+"   bb = https://bitbucket.org/"
+msgstr ""
+"   [schemes]\n"
+"   bb = https://bitbucket.org/"
+
+#: src/remote/index.txt:476
+msgid "This lets you write::"
+msgstr ""
+
+#: src/remote/index.txt:478
+msgid "   hg clone bb://aragost/private"
+msgstr ""
+
+#: src/remote/index.txt:480
+msgid "instead of the longer::"
+msgstr ""
+
+#: src/remote/index.txt:482
+msgid "   hg clone https://bitbucket.org/aragost/private"
+msgstr ""
+
+#: src/remote/index.txt:484
+msgid ""
+".. _schemes extension: http://mercurial.selenic.com/wiki/SchemesExtension"
+msgstr ""
+
+#: src/remote/index.txt:486
+msgid ""
+"See `hg help schemes` after enabling the extension for the full\n"
+"syntax."
+msgstr ""
+
+#: src/remote/index.txt:489
+msgid ""
+"Shortening SSH URLs\n"
+"-------------------"
+msgstr ""
+
+#: src/remote/index.txt:492
+msgid ""
+"You can use the schemes extension for SSH URLs too, but it is also\n"
+"interesting to note that OpenSSH_ has its own way of shortening URLs.\n"
+"Add these lines to your ``~/.ssh/config`` file (creating it if\n"
+"needed)::"
+msgstr ""
+
+#: src/remote/index.txt:497
+msgid ""
+"   Host bb\n"
+"   Compression yes\n"
+"   HostName bitbucket.org\n"
+"   User hg"
+msgstr ""
+"   Host bb\n"
+"   Compression yes\n"
+"   HostName bitbucket.org\n"
+"   User hg"
+
+#: src/remote/index.txt:502
+msgid "This will let you write::"
+msgstr ""
+
+#: src/remote/index.txt:504
+msgid "   hg clone ssh://bb/aragost/private"
+msgstr "   hg clone ssh://bb/aragost/private"
+
+#: src/remote/index.txt:506
+msgid "instead of::"
+msgstr ""
+
+#: src/remote/index.txt:508
+msgid "   hg clone ssh://hg@bitbucket.org/aragost/private"
+msgstr "   hg clone ssh://hg@bitbucket.org/aragost/private"
+
+#: src/remote/index.txt:510
+msgid ""
+"Notice how this configuration even set the username for you, something\n"
+"that is particularly easy to forget when using SSH with Bitbucket. We\n"
+"also used the oportunity to enable compression for the SSH tunnel,\n"
+"which will improve performance overall."
+msgstr ""
+
+#: src/remote/index.txt:516
+msgid ""
+"If you are using Putty_ on Windows (TortoiseHg does come with a\n"
+"bundled install of Putty) then you can do the same by configuring and\n"
+"saving a connection. If you save the configuration under the name\n"
+"``bb``, then you can begin using ``ssh://bb/`` style URLs with\n"
+"Mercurial."
+msgstr ""
+
+#: src/remote/index.txt:522
+msgid ""
+".. _OpenSSH: http://www.openssh.com/\n"
+".. _Putty: http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+msgstr ""
+
+#: src/remote/index.txt:526 src/subrepositories/index.txt:414
+#: src/tasks/index.txt:815
+msgid ""
+"Exercises\n"
+"========="
+msgstr ""
+
+#: src/remote/index.txt:529
+msgid "1. Go to https://bitbucket.org/ and create an account for yourself."
+msgstr ""
+
+#: src/remote/index.txt:531
+msgid ""
+"2. Create a private repository called ``test`` and clone it to your\n"
+"   local machine."
+msgstr ""
+
+#: src/remote/index.txt:534
+msgid ""
+"3. Add and commit a file to the repository and push it back to\n"
+"   Bitbucket."
+msgstr ""
+
+#: src/remote/index.txt:537
+msgid ""
+"4. Make a clone of https://bitbucket.org/aragost/hello/ on your local\n"
+"   machine."
+msgstr ""
+
+#: src/remote/index.txt:540
+msgid ""
+"5. Create a new repository on Bitbucket called ``hello`` and push the\n"
+"   hello clone from your machine up to Bitbucket."
+msgstr ""
+
+#: src/remote/index.txt:543
+msgid ""
+"   Notice how you can push changesets into an empty repository. This\n"
+"   is because you can expand a `hg clone` to `hg init` followed by `hg\n"
+"   pull` (except that you wont get hardlinks as described above)."
+msgstr ""
+
+#: src/remote/index.txt:547
+msgid ""
+"   What happens if you try to push from your ``hello`` clone to your\n"
+"   ``test`` clone on Bitbucket? How does Mercurial know if the\n"
+"   repositories are related?"
+msgstr ""
+
+#: src/subrepositories/index.txt:12
+msgid ""
+"===============\n"
+"Subrepositories\n"
+"==============="
+msgstr ""
+
+#: src/subrepositories/index.txt:18
+msgid ""
+"Introduction\n"
+"============"
+msgstr ""
+
+#: src/subrepositories/index.txt:21
+msgid ""
+"Mercurial has a features called subrepositories. This feature allows\n"
+"you to threat a collection of repositories as a group."
+msgstr ""
+
+#: src/subrepositories/index.txt:24
+msgid ""
+"Reusing code is an important concept of software architecture.\n"
+"Subrepositories support a way of reusing, by having shared libraries\n"
+"and modules as subrepositories for the projects using them."
+msgstr ""
+
+#: src/subrepositories/index.txt:28
+msgid "Subrepositories can be nested."
+msgstr ""
+
+#: src/subrepositories/index.txt:30
+msgid ""
+"The basic commands when using subrepositories are the same as ordinary\n"
+"repositories. However where meaningful commands take a `--subrepo`\n"
+"option to recurse down into the subrepositories."
+msgstr ""
+
+#: src/subrepositories/index.txt:34
+msgid ""
+"When executing a command within the working directory of a\n"
+"subrepository. Then the behavior will be exactly the same as if it\n"
+"wasn't a subrepository, so a subrepository doesn't \"know\" it is within\n"
+"another repository."
+msgstr ""
+
+#: src/subrepositories/index.txt:47
+msgid ""
+"Subrepositories\n"
+"==============="
+msgstr ""
+
+#: src/subrepositories/index.txt:50
+msgid ""
+"Subrepositories are just normal repositories, therefore we first\n"
+"create one repository and another one within, using the `hg init`\n"
+"command:"
+msgstr ""
+
+#: src/subrepositories/index.txt:63
+msgid ""
+"We have now created two repositories, one nested within the other.\n"
+"This doesn't make the inner repository to a subrepository. The\n"
+"subrepository does also have to be marked as such in the repository\n"
+"containing the subrepository."
+msgstr ""
+
+#: src/subrepositories/index.txt:68
+msgid ""
+"Marking a subrepository is done by creating and entry for it in the\n"
+"special ``.hgsub file.`` This is done by adding the following line:"
+msgstr ""
+
+#: src/subrepositories/index.txt:79
+msgid ""
+"   The way to interpret the .hgsub file is as a set of lines of the\n"
+"   form:"
+msgstr ""
+
+#: src/subrepositories/index.txt:82
+msgid "       ``where/to/put/the/subrepo = where/to/get/the/subrepo``"
+msgstr ""
+
+#: src/subrepositories/index.txt:84
+msgid ""
+"   The left-hand side is a path relative to the root of your clone and\n"
+"   it tells Mercurial where to put the subrepository in your clone."
+msgstr ""
+
+#: src/subrepositories/index.txt:87
+msgid ""
+"   The right-hand side is a either a path relative to the place you\n"
+"   clone from, or an absolute path. If it is a relative path then if\n"
+"   you do ``hg clone mainrepo my-main`` then Mercurial will create a\n"
+"   new repository at ``my-main/where/to/put/the/subrepo`` and will\n"
+"   fill it with changesets taken from\n"
+"   ``mainrepo/where/to/get/the/subrepo``. If it is an absolute path it\n"
+"   will naturally take the changesets from\n"
+"   ``where/to/get/the/subrepo``."
+msgstr ""
+
+#: src/subrepositories/index.txt:96
+msgid ""
+"   In the simple case where you have 'subrepo = subrepo', you end up\n"
+"   with Mercurial doing these commands"
+msgstr ""
+
+#: src/subrepositories/index.txt:106
+msgid ""
+"   and if you had used ``subrepo = ../subrepo``, then the commands\n"
+"   would be"
+msgstr ""
+
+#: src/subrepositories/index.txt:116
+msgid ""
+"   where the last URL is the normalization version of\n"
+"   ``http://server/repos/repo/../subrepo``"
+msgstr ""
+
+#: src/subrepositories/index.txt:120
+msgid ""
+"Remote Subrepositories\n"
+"======================"
+msgstr ""
+
+#: src/subrepositories/index.txt:123
+msgid ""
+"We do also want to link a remote subrepository to our project. This\n"
+"procedure is similar to before:"
+msgstr ""
+
+#: src/subrepositories/index.txt:142
+msgid ""
+"Note that we clone the repository to the place where it should be,\n"
+"because just adding the entry in the ``.hgsub`` file will not do\n"
+"anything unless there is a repository and the given location."
+msgstr ""
+
+#: src/subrepositories/index.txt:146
+msgid ""
+"Subversion Subrepositories\n"
+"=========================="
+msgstr ""
+
+#: src/subrepositories/index.txt:149
+msgid ""
+"A company might have some libraries in Subversion repositories and can\n"
+"for different reasons not convert them to Mercurial. No problem,\n"
+"Mercurial can have SVN repositories as subrepositories. The procedure\n"
+"is as above, except that ``[svn]`` should be prepended to the URL in\n"
+"the ``.hgsub`` file."
+msgstr ""
+
+#: src/subrepositories/index.txt:155
+msgid "Therefore adding a SVN subrepository will be like the following:"
+msgstr ""
+
+#: src/subrepositories/index.txt:172
+msgid ""
+"Then SVN commands should be used within the subrepository and\n"
+"mercurial commands in the super repository."
+msgstr ""
+
+#: src/subrepositories/index.txt:175
+msgid ""
+"Committing\n"
+"=========="
+msgstr ""
+
+#: src/subrepositories/index.txt:178
+msgid ""
+"The status can as always be seen with `hg status` but you have to add\n"
+"a `--subrepo` option to recurse through the subrepositories. We see\n"
+"that the files from the subrepositories doesn't act like such, before\n"
+"committing the ``.hgsub`` file."
+msgstr ""
+
+#: src/subrepositories/index.txt:198
+msgid "Our changes are not committed yet, so this we will do now."
+msgstr ""
+
+#: src/subrepositories/index.txt:210
+msgid ""
+"The default behavior of commit is to first recurse through\n"
+"subrepositories and commit in each. Then commit the outer repository.\n"
+"The reason for this is that subrepositories are also a part of the\n"
+"project being under version control, therefore a snapshot of the whole\n"
+"project makes most sense. The resulting state of subrepositories will\n"
+"be saved in a special file called ``.hgsubstate``. This file is not\n"
+"intended to be edited by the user, but tracks which version of the\n"
+"subrepository that is linked with the repository."
+msgstr ""
+
+#: src/subrepositories/index.txt:219
+msgid ""
+"Pushing and Pulling\n"
+"==================="
+msgstr ""
+
+#: src/subrepositories/index.txt:222
+msgid ""
+"Mercurial will always attempt to first push all subrepository of a\n"
+"repository before pushing the current repository, thereby ensuring\n"
+"that the repository being pushed to, cannot end up with referring to\n"
+"an inexistent version of a subrepository."
+msgstr ""
+
+#: src/subrepositories/index.txt:227
+msgid ""
+"Pulling is on the other hand not recursive, because Mercurial cannot\n"
+"know which subrepositories to pull before updating to a specific\n"
+"changeset has been done."
+msgstr ""
+
+#: src/subrepositories/index.txt:231
+msgid ""
+"Another Version\n"
+"==============="
+msgstr ""
+
+#: src/subrepositories/index.txt:234
+msgid ""
+"As mentioned you should not edit ``.hgsubstate``. But if you want to\n"
+"switch the subrepository to a different version, then go to the\n"
+"subrepository and update it to the wanted version. This change do also\n"
+"has to be recorded in the repository above. Therefore you also have to\n"
+"commit that, which will as described above update the state of the\n"
+"subrepository in the ``.hgsubstate`` file."
+msgstr ""
+
+#: src/subrepositories/index.txt:241
+msgid ""
+"First we create some changes and commits them in the subrepository,\n"
+"and the final commit is for updating and committing the\n"
+"``.hgsubstate`` file."
+msgstr ""
+
+#: src/subrepositories/index.txt:262
+msgid ""
+"Now the main repository is linked with the newest revision of the\n"
+"subrepository. We realize that we want to link the main repository\n"
+"with an earlier version of the subrepository. This is done by updating\n"
+"the subrepository to the wanted revision and the performing a commit\n"
+"from the main repository, Again to update and commit the\n"
+"``.hgsubstate`` file."
+msgstr ""
+
+#: src/subrepositories/index.txt:296
+msgid ""
+"Update On Demand\n"
+"================"
+msgstr ""
+
+#: src/subrepositories/index.txt:299
+msgid ""
+"Update do naturally also perform actions on the subrepositories, since\n"
+"updating to another revision of a repository might mean that we have\n"
+"to update the subrepository to another revision as well."
+msgstr ""
+
+#: src/subrepositories/index.txt:303
+msgid ""
+"As mentioned the ``.hgsubstate`` file tracks the revision of the\n"
+"subrepository to use. Therefore we do not know which version of the\n"
+"subrepository to update to before this is checked out. Therefore the\n"
+"repository is first updated and then the subrepositories are updated\n"
+"according to the updated version of the ``.hgsubstate`` file. This\n"
+"might also involve pulling from the subrepository path, if the\n"
+"revision in the ``.hgsubstate`` file has not yet been pulled."
+msgstr ""
+
+#: src/subrepositories/index.txt:312
+msgid ""
+"Converting Folder Into a Subrepository\n"
+"======================================"
+msgstr ""
+
+#: src/subrepositories/index.txt:315
+msgid ""
+"A project might contain a folder with some code, which at a later\n"
+"point is realized should be used across different projects. This code\n"
+"could of course just be copied to a repository, which the projects\n"
+"could include as subrepository. This would however mean that we would\n"
+"loose our precious history of these files."
+msgstr ""
+
+#: src/subrepositories/index.txt:321
+msgid ""
+"The way to do it, is by converting a folder into a repository, using\n"
+"the convert extension and then include this repository as a\n"
+"subrepository in the different projects."
+msgstr ""
+
+#: src/subrepositories/index.txt:325
+msgid ".. _convert extension: http://mercurial/wiki/..."
+msgstr ""
+
+#: src/subrepositories/index.txt:327
+msgid ""
+"This first part below, just creates our folder and makes and commits\n"
+"some changes to its contents."
+msgstr ""
+
+#: src/subrepositories/index.txt:346
+msgid ""
+"Now we want to make the folder into a subrepository. First we just\n"
+"makes the folder into an repository. This is done by converting the\n"
+"original repository from a mercurial repository to a mercurial\n"
+"repository and then using a filemap to specify we only want the\n"
+"certain folder."
+msgstr ""
+
+#: src/subrepositories/index.txt:352
+msgid ""
+"The filemap specifies to include the folder, furthermore there is a\n"
+"rename mapping, which ensures that the contents of the folder will be\n"
+"in the root directory of the repository we create. Then we perform the\n"
+"conversion, and see that we now have a repository containing only the\n"
+"changeset which edited in the file within the folder. This repository\n"
+"we can now include as a subrepository as previously described."
+msgstr ""
+
+#: src/subrepositories/index.txt:384
+msgid ""
+"Detaching a Subrepository\n"
+"============================="
+msgstr ""
+
+#: src/subrepositories/index.txt:387
+msgid ""
+"If a subrepository no longer needs to be associated with a project,\n"
+"then it is detached from the repository by just deleting the line for\n"
+"it in the ``.hgsub`` file. Then `hg status` will show the files from\n"
+"that subrepository as unknown files, and you can delete these files\n"
+"from your file system."
+msgstr ""
+
+#: src/subrepositories/index.txt:393
+msgid ""
+"Commands Crossing Repository Boundaries\n"
+"======================================="
+msgstr ""
+
+#: src/subrepositories/index.txt:396
+msgid ""
+"`hg commit` and `hg update` goes recursively through the\n"
+"subrepositories. If there is no change in a subrepository during a\n"
+"command, then there will of course not be committed to that\n"
+"subrepository."
+msgstr ""
+
+#: src/subrepositories/index.txt:401
+msgid ""
+"Other commands that can work on subrepositories needs a `--subrepos`\n"
+"option to recurse through the subrepositories."
+msg