Commits

Anonymous committed cf97d83

po-pt_BR: translation template

Comments (0)

Files changed (1)

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Martin Geisler <mg@aragost.com>
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: aragost Trifork Mercurial Kick Start\n"
+"Report-Msgid-Bugs-To: <mg@aragost.com>\n"
+"POT-Creation-Date: 2012-06-21 20:21-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+
+#: src/index.txt:12
+msgid ""
+"====================\n"
+"Mercurial Kick Start\n"
+"===================="
+msgstr ""
+
+#: 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 ""
+"`Bookmarks`__:\n"
+"  Feature or topic branches are handled using bookmarks in Mercurial.\n"
+"  Bookmarks gives you a light-weight way to track multiple lines of\n"
+"  development in your repository."
+msgstr ""
+
+#: src/index.txt:31
+msgid ""
+"`Task Based Development`__:\n"
+"  Building on the previous exercises, we will now show how Mercurial\n"
+"  lets your organize your tasks using named branches. A release\n"
+"  manager will then review and merge the tasks."
+msgstr ""
+
+#: src/index.txt:36
+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:41
+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:46
+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:51
+msgid ""
+".. __: basic/\n"
+".. __: bookmarks/\n"
+".. __: tasks/\n"
+".. __: remote/\n"
+".. __: hgsubversion/\n"
+".. __: subrepositories/"
+msgstr ""
+
+#: src/index.txt:58
+msgid ""
+"We welcome new contributions, please see the `about page`__ for more\n"
+"information."
+msgstr ""
+
+#: src/index.txt:61
+msgid ".. __: about/"
+msgstr ""
+
+#: src/about/index.txt:12
+msgid ""
+"=====\n"
+"About\n"
+"====="
+msgstr ""
+
+#: 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 ""
+
+#: src/about/index.txt:20
+msgid ""
+"The source for the guide is `hosted on Bitbucket`_. You can get a copy\n"
+"with::"
+msgstr ""
+
+#: src/about/index.txt:23
+msgid "  $ hg clone https://bitbucket.org/aragost/kick-start/"
+msgstr ""
+
+#: src/about/index.txt:25
+msgid ""
+"Run ``scons`` to build everything. This only works on Linux --- see\n"
+"the ``README`` file for information about what you need to install."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: src/about/index.txt:36
+msgid ""
+"Translations\n"
+"============"
+msgstr ""
+
+#: src/about/index.txt:39
+msgid "A big thanks goes to the translators:"
+msgstr ""
+
+#: src/about/index.txt:41
+msgid "* Czech: Tovim"
+msgstr ""
+
+#: src/basic/index.txt:12
+msgid ""
+"===============\n"
+"Basic Mercurial\n"
+"==============="
+msgstr ""
+
+#: 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 ""
+
+#: src/basic/index.txt:23
+msgid ""
+"There are also some exercises later that cover the same things that\n"
+"Alice and Bob did."
+msgstr ""
+
+#: src/basic/index.txt:28
+msgid ""
+"Installation & Configuration\n"
+"============================"
+msgstr ""
+
+#: src/basic/index.txt:31
+msgid ""
+"Mercurial is available for most platforms, including Windows, Mac OS\n"
+"X, and GNU/Linux:"
+msgstr ""
+
+#: 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 ""
+
+#: 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 `thg` program\n"
+"  available in a Command Prompt. You can use the `thk` program to\n"
+"  start the graphical TortoiseHg tools."
+msgstr ""
+
+#: src/basic/index.txt:45
+msgid "  .. tip::"
+msgstr ""
+
+#: 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 ""
+
+#: src/basic/index.txt:51
+msgid ""
+"       ls          -> dir\n"
+"       cat         -> type\n"
+"       echo \"abc\"  -> echo abc"
+msgstr ""
+
+#: src/basic/index.txt:55
+msgid ""
+"Linux:\n"
+"  Please install Mercurial_ using your package manager. If you cannot\n"
+"  find it there, then you can install from source: grab the `latest\n"
+"  stable release`__, unpack it somewhere and run ``make local``\n"
+"  inside. Now symlink the `hg` script to a directory in your ``PATH``\n"
+"  and you are done."
+msgstr ""
+
+#: src/basic/index.txt:62
+msgid ""
+"  To install TortoiseHg, you need the PyQt bindings. They are\n"
+"  available in most distributions. Then follow `these instructions`__.\n"
+"  That gives you the `thg` program."
+msgstr ""
+
+#: src/basic/index.txt:66
+msgid ""
+"  .. __: http://selenic.com/hg/archive/stable.tar.bz2\n"
+"  .. __: http://bitbucket.org/tortoisehg/thg/wiki/thg"
+msgstr ""
+
+#: src/basic/index.txt:69
+msgid ""
+"Mac OS X:\n"
+"  We recommend installing recommend MacHg_ to get a good, fast, and\n"
+"  native client for Mercurial. MacHg comes bundled with its own\n"
+"  Mercurial so you won't have to worry about that. If you already use\n"
+"  TortoiseHg on Windows, then you'll be happy to know that you can now\n"
+"  `install it on Mac OS X`__ too."
+msgstr ""
+
+#: src/basic/index.txt:76
+msgid "  .. __: https://bitbucket.org/tortoisehg/thg/wiki/developers/MacOSX"
+msgstr ""
+
+#: src/basic/index.txt:78
+msgid ""
+".. _Mercurial: http://mercurial.selenic.com/\n"
+".. _TortoiseHg: http://tortoisehg.org/\n"
+".. _MacHg: http://jasonfharris.com/machg/"
+msgstr ""
+
+#: src/basic/index.txt:82
+msgid ""
+"We will be using the command line in our examples but will sometime\n"
+"show the repository state in the TortoiseHg Workbench."
+msgstr ""
+
+#: src/basic/index.txt:85
+msgid "After installing Mercurial, try running `hg version`:"
+msgstr ""
+
+#: src/basic/index.txt:99
+msgid ""
+"It is of course fine if you see a version number greater than 2.2.\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:119
+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 `thg userconfig` if you prefer). Create the file with this\n"
+"content::"
+msgstr ""
+
+#: src/basic/index.txt:126
+msgid ""
+"   [ui]\n"
+"   username = Firstname Lastname <example@example.net>"
+msgstr ""
+
+#: src/basic/index.txt:129
+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:140
+msgid ""
+"Basic Commands\n"
+"=============="
+msgstr ""
+
+#: src/basic/index.txt:143
+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:148
+msgid ""
+".. _quick start guide: http://tortoisehg.bitbucket.org/manual/1.0/quick.html"
+msgstr ""
+
+#: src/basic/index.txt:150
+msgid ""
+"Creating a Repository\n"
+"---------------------"
+msgstr ""
+
+#: src/basic/index.txt:153
+msgid "Create a repository with the `hg init` command:"
+msgstr ""
+
+#: src/basic/index.txt:163
+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:168
+msgid "Entering ``example`` we can look around:"
+msgstr ""
+
+#: src/basic/index.txt:179
+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:183
+msgid ""
+"Creating a Changeset\n"
+"--------------------"
+msgstr ""
+
+#: src/basic/index.txt:186
+msgid ""
+"Let us create a file and ask Mercurial about the status of the\n"
+"repository:"
+msgstr ""
+
+#: src/basic/index.txt:196
+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:207
+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:215
+msgid ""
+"No output indicates success --- Mercurial wont interrupt you unless\n"
+"necessary."
+msgstr ""
+
+#: src/basic/index.txt:218
+msgid ""
+"Inspecting History\n"
+"------------------"
+msgstr ""
+
+#: src/basic/index.txt:221
+msgid "You can see the newly created changeset with `hg log`:"
+msgstr ""
+
+#: src/basic/index.txt:233
+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:250
+msgid ""
+"We can change our mind and revert the file back to how it looked\n"
+"before:"
+msgstr ""
+
+#: src/basic/index.txt:260
+msgid "Let us make another change to our file:"
+msgstr ""
+
+#: src/basic/index.txt:269
+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:280
+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 `thg annotate`."
+msgstr ""
+
+#: src/basic/index.txt:284
+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:300
+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:306
+msgid ""
+"  [extensions]\n"
+"  graphlog ="
+msgstr ""
+
+#: src/basic/index.txt:309
+msgid ".. __: http://mercurial.selenic.com/wiki/GraphlogExtension"
+msgstr ""
+
+#: src/basic/index.txt:311
+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:333
+msgid ""
+"This shows how the changeset ``2e982bdc137f`` is a child of\n"
+"``d312da7770f4``. The same can be seen in `thg log`:"
+msgstr ""
+
+#: src/basic/index.txt:339
+msgid ""
+"The files in the working copy are always synchronized to a particular\n"
+"changeset. In `thg log`, this is shown with a circled bullet in the\n"
+"changeset graph. In the output of `hg glog`, the working directory\n"
+"parent revision is highlighted with a ``@``-sign."
+msgstr ""
+
+#: src/basic/index.txt:344
+msgid ""
+"Time Travel\n"
+"-----------"
+msgstr ""
+
+#: src/basic/index.txt:347
+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:364
+msgid "and she then makes the jump:"
+msgstr ""
+
+#: src/basic/index.txt:377
+msgid "Her file is now back at the old version:"
+msgstr ""
+
+#: src/basic/index.txt:385
+msgid ""
+"but the newer version is not forgotten. Mercurial can easily retrieve\n"
+"it for her:"
+msgstr ""
+
+#: src/basic/index.txt:396
+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:412 src/basic/index.txt:741 src/bookmarks/index.txt:941
+msgid ""
+"Exercises\n"
+"---------"
+msgstr ""
+
+#: src/basic/index.txt:415
+msgid "1. Use `hg init` to create a repository called ``kick-start``."
+msgstr ""
+
+#: src/basic/index.txt:417
+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:421
+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:424
+msgid "4. Make a couple of more commits."
+msgstr ""
+
+#: src/basic/index.txt:426
+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:431
+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 `thg log`."
+msgstr ""
+
+#: src/basic/index.txt:436
+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:441
+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:446
+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 `thg log` after\n"
+"   you commit."
+msgstr ""
+
+#: src/basic/index.txt:452
+msgid ""
+"Working with Others\n"
+"==================="
+msgstr ""
+
+#: src/basic/index.txt:455
+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:459
+msgid ""
+"Making a Clone\n"
+"--------------"
+msgstr ""
+
+#: src/basic/index.txt:462
+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:482
+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:502
+msgid "The repository now has four changesets:"
+msgstr ""
+
+#: src/basic/index.txt:507
+msgid ""
+"Comparing Clones\n"
+"----------------"
+msgstr ""
+
+#: src/basic/index.txt:510
+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:521
+msgid "He can also ask Mercurial what changeset he has that Alice lacks:"
+msgstr ""
+
+#: src/basic/index.txt:540
+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:543
+msgid ""
+"Moving Changesets\n"
+"-----------------"
+msgstr ""
+
+#: src/basic/index.txt:546
+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:553
+msgid ""
+"  [paths]\n"
+"  default = /home/bob/example"
+msgstr ""
+
+#: src/basic/index.txt:556
+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:579
+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:595
+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:601
+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:612
+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:616
+msgid ""
+"Divergent Lines of Development\n"
+"------------------------------"
+msgstr ""
+
+#: src/basic/index.txt:619
+msgid "Alice reworks the ``hello.txt`` file a bit:"
+msgstr ""
+
+#: src/basic/index.txt:637
+msgid "At the same time, Bob is working. He creates a new file:"
+msgstr ""
+
+#: src/basic/index.txt:647
+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:665
+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 are now two changesets in the\n"
+"repository without any children. These heads are divergent lines of\n"
+"development, as can be seen in `thg log`:"
+msgstr ""
+
+#: src/basic/index.txt:674
+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:684
+msgid ""
+"There were no conflicts since Alice and Bob edited different files.\n"
+"After `hg merge`, the working copy has *two* parents --- this is how 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:700
+msgid "The two heads are now bound together in the changeset graph:"
+msgstr ""
+
+#: src/basic/index.txt:705
+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:729
+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:744
+msgid "1. Create a repository and make a couple of commits inside it."
+msgstr ""
+
+#: src/basic/index.txt:746
+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:750
+msgid "2. Add another path to ``.hg/hgrc``, such as::"
+msgstr ""
+
+#: src/basic/index.txt:752
+msgid "     bob = /home/bob/test"
+msgstr ""
+
+#: src/basic/index.txt:754
+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:758
+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:763
+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:767
+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:773
+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:780
+msgid "You can also publish your repository via HTTP:"
+msgstr ""
+
+#: src/basic/index.txt:782
+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:786
+msgid "2. Try to pull from a repository published with `hg serve`."
+msgstr ""
+
+#: src/basic/index.txt:788
+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:793 src/bookmarks/index.txt:907
+#: src/hgsubversion/index.txt:329 src/tasks/index.txt:988
+msgid ""
+"Summary\n"
+"======="
+msgstr ""
+
+#: src/basic/index.txt:796
+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:799
+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:808
+msgid "And very importantly:"
+msgstr ""
+
+#: src/basic/index.txt:810
+msgid "* `hg help`"
+msgstr ""
+
+#: src/bookmarks/index.txt:12
+msgid ""
+"===================\n"
+"Mercurial Bookmarks\n"
+"==================="
+msgstr ""
+
+#: src/bookmarks/index.txt:16
+msgid ""
+"There are two main ways to organize branches in Mercurial: `named\n"
+"branches`_ and bookmarks. Bookmarks are used for short-term feature or\n"
+"topic branches whereas named branches are used for long-term branches."
+msgstr ""
+
+#: src/bookmarks/index.txt:20
+msgid ""
+"Named branches work well in a setting where you want to track\n"
+"the context in which each changeset was made; the branch name is\n"
+"embedded in the changeset and you can refer to it years later. Because\n"
+"the branch name is embedded in the history, named branches are great\n"
+"when you need an audit trail and want to be able to see who did what\n"
+"and when."
+msgstr ""
+
+#: src/bookmarks/index.txt:27
+msgid ""
+"There are contexts where named branches work less well: if you don't\n"
+"need or want to track the branch name after the fact, then named\n"
+"branches aren't for you. Maybe you just want to experiment a bit\n"
+"without committing yourself to a given branch name, or perhaps you\n"
+"want the ability to change the branch name later."
+msgstr ""
+
+#: src/bookmarks/index.txt:33
+msgid "If that is your use case, then Mercurial's bookmarks will help."
+msgstr ""
+
+#: src/bookmarks/index.txt:35 src/bookmarks/index.txt:562
+#: src/bookmarks/index.txt:753 src/subrepositories/index.txt:79
+#: src/tasks/index.txt:434 src/tasks/index.txt:809
+msgid ".. note::"
+msgstr ""
+
+#: src/bookmarks/index.txt:37
+msgid ""
+"   You should use Mercurial 2.1 or later for the examples in this\n"
+"   section."
+msgstr ""
+
+#: src/bookmarks/index.txt:42 src/subrepositories/index.txt:18
+msgid ""
+"Introduction\n"
+"============"
+msgstr ""
+
+#: src/bookmarks/index.txt:45
+msgid ""
+"We will explore bookmarks in detail below, but put briefly, a Mercurial\n"
+"bookmark lets you associate a new name to a changeset. This is handy\n"
+"when you are working on several different things at the same time ---\n"
+"such as two different feature branches."
+msgstr ""
+
+#: src/bookmarks/index.txt:50
+msgid ""
+"Tags also add new names to existing changesets, but unlike tags,\n"
+"bookmarks are mutable and transient: you can move, rename, or delete\n"
+"them and they are not stored in history. This means that there is\n"
+"no audit trail for bookmarks."
+msgstr ""
+
+#: src/bookmarks/index.txt:55
+msgid ""
+"Bookmark Basics\n"
+"==============="
+msgstr ""
+
+#: src/bookmarks/index.txt:58
+msgid ""
+"Imagine that Alice, Bob, and Carla are writing a phrase book together.\n"
+"In the project, they will be working on phrases in different\n"
+"categories, and they will sometimes have to work on different\n"
+"categories at the same time. So they will naturally have several\n"
+"different ongoing branches of development at the same time. Bookmarks\n"
+"let them keep track of these branches in a lightweight fashion."
+msgstr ""
+
+#: src/bookmarks/index.txt:65
+msgid ""
+"Carla is the boss, so she starts off by creating a repository that\n"
+"will be used for the project:"
+msgstr ""
+
+#: src/bookmarks/index.txt:82
+msgid ""
+"Alice and Bob each have their own clone and push/pull to/from Carla's\n"
+"repository, which acts as a central repository. Typically, the central\n"
+"repository will be hosted on some company server and the clones will\n"
+"be on the developers' own machines. But for simplicity, we will place\n"
+"all three repositories on the same filesystem."
+msgstr ""
+
+#: src/bookmarks/index.txt:88
+msgid ""
+"Alice and Bob can now make a clone of the repository Carla just made.\n"
+"For Alice it looks like this:"
+msgstr ""
+
+#: src/bookmarks/index.txt:114
+msgid ""
+"They will be working on phrases in different categories and will start\n"
+"by collecting just the English phrases. Carla asks Alice to add\n"
+"phrases used for greetings:"
+msgstr ""
+
+#: src/bookmarks/index.txt:127
+msgid ""
+"Adding a Bookmark\n"
+"-----------------"
+msgstr ""
+
+#: src/bookmarks/index.txt:130
+msgid ""
+"Carla now suddenly asks Alice to begin looking at phrases for\n"
+"traveling. Alice is already working on the greetings, and she would\n"
+"like to separate the two tasks --- mixing up changes related to\n"
+"greetings with changes about traveling will make them harder to review\n"
+"later. Alice will therefore `hg update` back to revision 0 and start a\n"
+"new feature branch there. But in order to remember where she was, she\n"
+"will make a *bookmark* first. At the moment her repository looks like\n"
+"this:"
+msgstr ""
+
+#: src/bookmarks/index.txt:142
+msgid ""
+"Her greetings--related change is only identified by being on the\n"
+"``default`` branch and by being the ``tip`` changeset. Both of these\n"
+"identifiers will move around when she begins working on a new branch,\n"
+"so she needs something more stable --- a bookmark. She makes the\n"
+"bookmark:"
+msgstr ""
+
+#: src/bookmarks/index.txt:154
+msgid "The changeset now has a bookmark associated with it:"
+msgstr ""
+
+#: src/bookmarks/index.txt:159
+msgid "She can see the bookmark using `hg bookmarks`:"
+msgstr ""
+
+#: src/bookmarks/index.txt:167
+msgid ""
+"The asterisk (``*``) indicates that the bookmark is *active*,\n"
+"which means that it will move along if she makes a new commit. Because\n"
+"the active bookmark moves along when you commit, it will always point\n"
+"to the head of the branch you're working on."
+msgstr ""
+
+#: src/bookmarks/index.txt:172
+msgid ""
+"Alice wants to create a new branch for the traveling phrases. The\n"
+"branch should start at revision 0, so she updates to this revision\n"
+"first. This makes the ``greetings`` bookmark inactive since she has\n"
+"moved away from this branch of development:"
+msgstr ""
+
+#: src/bookmarks/index.txt:186
+msgid "The bookmark is left in place:"
+msgstr ""
+
+#: src/bookmarks/index.txt:191
+msgid ""
+"This means that Alice can always run `hg update greetings` to get back\n"
+"to it again. For now, she'll be clever and create a new bookmark\n"
+"called ``traveling`` for the new branch Carla has asked her to work\n"
+"on. The new bookmark is automatically made active:"
+msgstr ""
+
+#: src/bookmarks/index.txt:205
+msgid "The active bookmark can also be seen in TortoiseHg:"
+msgstr ""
+
+#: src/bookmarks/index.txt:210
+msgid ""
+"Now, when Alice creates a new commit, the ``traveling`` bookmark will,\n"
+"well..., travel with the commit:"
+msgstr ""
+
+#: src/bookmarks/index.txt:225
+msgid ""
+"Updating to a Bookmark\n"
+"----------------------"
+msgstr ""
+
+#: src/bookmarks/index.txt:228
+msgid ""
+"Now that Alice has bookmarks on revision 1 and 2, she can use the\n"
+"bookmark names in all commands that expect a revision number. That is,\n"
+"she can now use ``1`` (the local revision number), ``0b89bcda3dcf``\n"
+"(the global changeset ID), and ``greetings`` (the bookmark)\n"
+"interchangeably:"
+msgstr ""
+
+#: src/bookmarks/index.txt:256
+msgid ""
+"Just like tags and branch names, bookmarks work with all commands ---\n"
+"`hg diff`, `hg merge`, etc. Updating looks like this:"
+msgstr ""
+
+#: src/bookmarks/index.txt:273
+msgid ""
+"Notice how the bookmark she updates to becomes the currently active\n"
+"bookmark. A new commit will advance the currently active bookmark, so\n"
+"`hg update traveling` is enough to prepare Alice's working copy for\n"
+"working on the traveling branch."
+msgstr ""
+
+#: src/bookmarks/index.txt:278
+msgid ""
+"Renaming and Deleting a Bookmark\n"
+"--------------------------------"
+msgstr ""
+
+#: src/bookmarks/index.txt:281
+msgid ""
+"The distinguishing feature of bookmarks compared to `named branches`_\n"
+"is that they exist *outside* of the history. Here, \"history\" means the\n"
+"immutable changesets that cannot be changed without changing their\n"
+"changeset IDs. Bookmarks are not stored in the changesets and they are\n"
+"not part of the computation of changeset IDs. They can therefore be\n"
+"deleted and renamed at will."
+msgstr ""
+
+#: src/bookmarks/index.txt:288
+msgid "Imagine that Alice adds a new bookmark:"
+msgstr ""
+
+#: src/bookmarks/index.txt:299
+msgid "She can now rename the bookmark:"
+msgstr ""
+
+#: src/bookmarks/index.txt:310
+msgid "She can also delete it:"
+msgstr ""
+
+#: src/bookmarks/index.txt:320
+msgid ""
+"There is now no trace of the deleted bookmark; nobody can see that it\n"
+"ever existed. This makes bookmarks good for tracking small feature\n"
+"branches that don't need to be recorded in long-term history in the\n"
+"same way that named branches are recorded."
+msgstr ""
+
+#: src/bookmarks/index.txt:325
+msgid ""
+"After deleting the ``new-name`` bookmark, there are no active\n"
+"bookmarks. We will continue working on the ``traveling`` branch, so we\n"
+"make that bookmark active again:"
+msgstr ""
+
+#: src/bookmarks/index.txt:335
+msgid ""
+"Pushing a Feature Branch\n"
+"------------------------"
+msgstr ""
+
+#: src/bookmarks/index.txt:338
+msgid ""
+"While Alice has been working, Carla has been busy too. She updated the\n"
+"``README`` with the authors:"
+msgstr ""
+
+#: src/bookmarks/index.txt:347
+msgid ""
+"This means that Alice's ``traveling`` feature branch will become a\n"
+"second head when she pushes. Mercurial will thus abort the push by\n"
+"default:"
+msgstr ""
+
+#: src/bookmarks/index.txt:360
+msgid ""
+"To investigate the situation, Alice will pull and look at the\n"
+"repository in TortoiseHg:"
+msgstr ""
+
+#: src/bookmarks/index.txt:379
+msgid ""
+"There are no less than three heads! Pushing the ``traveling`` head\n"
+"will indeed create two heads in the remote repository and Mercurial\n"
+"will guard against that since multiple unnamed heads can be confusing:\n"
+"users who clone the repository won't know which head they should use as\n"
+"a basis for their own work. When there is only one head, there is no\n"
+"question --- you just clone and begin working."
+msgstr ""
+
+#: src/bookmarks/index.txt:386
+msgid ""
+"Above, Mercurial suggests to merge the heads or use `-f` to force the\n"
+"push. Forcing things is normally a sign that you're not using the tool\n"
+"as designed, but this is one of the few situations where you *do* want\n"
+"to add the `-f` flag. The reason is that Alice's work on the\n"
+"``traveling`` branch isn't finished yet, and so she doesn't want to\n"
+"mix the changes on the branch with the changes on the main line. If\n"
+"there had been an important \"bugfix\" on the main line, then she could\n"
+"have merged it into her branch, but here she doesn't bother."
+msgstr ""
+
+#: src/bookmarks/index.txt:395
+msgid ""
+"So Alice will forcibly push the feature branch to the remote\n"
+"repository:"
+msgstr ""
+
+#: src/bookmarks/index.txt:409
+msgid ""
+"Here it's very important that Alice restricts the push to only push\n"
+"the branch she wants! She has two feature branches that don't exist in\n"
+"Carla's repository, and the `-f` flag tells Mercurial to blindly push\n"
+"all outgoing changesets. Some care is needed to publish just\n"
+"one out of many private feature branches. Here, the ``+1 heads``\n"
+"printed tells Alice that she did it right --- she pushed a single new\n"
+"branch to the repository."
+msgstr ""
+
+#: src/bookmarks/index.txt:417
+msgid ""
+"How do things look from Carla's perspective? She now has two\n"
+"anonymous heads in her repository:"
+msgstr ""
+
+#: src/bookmarks/index.txt:436
+msgid ""
+"We call them *anonymous* since there are no names attached to them ---\n"
+"they are on the same named branch and have no bookmarks:"
+msgstr ""
+
+#: src/bookmarks/index.txt:445
+msgid ""
+"Since Alice intends to continue working on the branch, it would have\n"
+"been convenient if her bookmark had been pushed too. Originally\n"
+"(before Mercurial 1.6), bookmarks were strictly local, but it is now\n"
+"possible to push and pull bookmarks."
+msgstr ""
+
+#: src/bookmarks/index.txt:451
+msgid ""
+"Sharing Bookmarks\n"
+"================="
+msgstr ""
+
+#: src/bookmarks/index.txt:454
+msgid ""
+"Bookmarks can be pushed and pulled between repositories. This works\n"
+"over any of the protocols used by Mercurial: SSH, HTTP, and local\n"
+"filesystem access. The ability to push a bookmark is governed by the\n"
+"same rules that govern normal push access. If you can push a\n"
+"changeset to a repository, then you can also push a bookmark to it."
+msgstr ""
+
+#: src/bookmarks/index.txt:460
+msgid ""
+"Incoming and Outgoing Bookmarks\n"
+"-------------------------------"
+msgstr ""
+
+#: src/bookmarks/index.txt:463
+msgid ""
+"Alice can easily fix her earlier mistake. First, she uses `hg\n"
+"outgoing -B` to see if there are any bookmarks in the local\n"
+"repository that aren't present in the repository on the server\n"
+"(similarly, `hg incoming -B` will tell you about any bookmarks\n"
+"present on the server that do not exist in the local repository):"
+msgstr ""
+
+#: src/bookmarks/index.txt:478
+msgid ""
+"She has two bookmarks locally that don't exist on the server. To push\n"
+"a bookmark she simply needs to use `-B` instead of `-r` when pushing:"
+msgstr ""
+
+#: src/bookmarks/index.txt:490
+msgid ""
+"This will make Mercurial push the changeset pointed to by\n"
+"``traveling`` *and* export the bookmark to the server. Since she has\n"
+"already pushed the changesets, only the bookmark is pushed here.\n"
+"Carla's repository now looks much more tidy than before:"
+msgstr ""
+
+#: src/bookmarks/index.txt:503
+msgid ""
+"Alice will publish her ``greetings`` branch in the same way, and do it\n"
+"right this time:"
+msgstr ""
+
+#: src/bookmarks/index.txt:518
+msgid ""
+"Working with a Published Bookmark\n"
+"---------------------------------"
+msgstr ""
+
+#: src/bookmarks/index.txt:521
+msgid ""
+"Now that Alice has published her ``traveling`` bookmark, she can keep\n"
+"working and periodically push back to Carla. This will automatically\n"
+"advance the bookmark on the server --- no more `-B` flags needed:"
+msgstr ""
+
+#: src/bookmarks/index.txt:539
+msgid ""
+"Notice the ``updating bookmark traveling`` message at the bottom. This\n"
+"is what tells Alice that the bookmark is synchronized in the two\n"
+"repositories."
+msgstr ""
+
+#: src/bookmarks/index.txt:543
+msgid ""
+"Alice and Bob can now work together on the feature branch. First, Bob\n"
+"will pull the branch from Carla. Bob needs to explicitly import the\n"
+"bookmark with `-B` the first time he pulls a feature branch:"
+msgstr ""
+
+#: src/bookmarks/index.txt:564
+msgid ""
+"   This behavior will change in Mercurial 2.3. Starting with that\n"
+"   version, Mercurial will automatically import remote bookmarks\n"
+"   on changesets you pull. That means that Bob can just run\n"
+"   `hg pull` to get all incoming changesets and bookmarks from\n"
+"   Carla."
+msgstr ""
+
+#: src/bookmarks/index.txt:570
+msgid "Bob will now check out the branch, make a change, and push it back:"
+msgstr ""
+
+#: src/bookmarks/index.txt:590
+msgid ""
+"Notice how the ``traveling`` bookmark was updated automatically on the\n"
+"server. In general, Mercurial will take care to synchronize a bookmark\n"
+"on push and pull as soon as it exists both locally and remotely. There\n"
+"is an additional constraint: `hg push` will only update the remote\n"
+"bookmark if it is an ancestor of the local bookmark. If the\n"
+"bookmarks have diverged, then someone else has worked on the branch\n"
+"and the two heads should be merged before pushing. We'll look at this\n"
+"situation next."
+msgstr ""
+
+#: src/bookmarks/index.txt:600
+msgid ""
+"Divergent Bookmarks\n"
+"==================="
+msgstr ""
+
+#: src/bookmarks/index.txt:603
+msgid ""
+"Bob has just pushed a changeset on the ``traveling`` branch, but Alice\n"
+"has not pulled it yet. Before pulling it she makes her own commit on\n"
+"the branch:"
+msgstr ""
+
+#: src/bookmarks/index.txt:614
+msgid ""
+"As usual in Mercurial, she will notice the new commit from Bob when\n"
+"she tries to push back to the server:"
+msgstr ""
+
+#: src/bookmarks/index.txt:626
+msgid ""
+"Here she wants to pull and merge --- she's not about to publish a new\n"
+"feature branch, so it would be wrong to use the `-f` flag."
+msgstr ""
+
+#: src/bookmarks/index.txt:629
+msgid ""
+"Automatic Bookmark Renaming\n"
+"---------------------------"
+msgstr ""
+
+#: src/bookmarks/index.txt:632
+msgid "When Alice pulls, she will get the changeset from Bob:"
+msgstr ""
+
+#: src/bookmarks/index.txt:648
+msgid ""
+"In addition to the normal `hg pull` output, Mercurial printed a\n"
+"message about storing a divergent bookmark as ``traveling@default``.\n"
+"In TortoiseHg the situation looks like this:"
+msgstr ""
+
+#: src/bookmarks/index.txt:655
+msgid ""
+"What happened is that Mercurial detected that ``traveling`` on the\n"
+"server had diverged from ``traveling`` locally. As explained above,\n"
+"divergence means that the bookmarks are siblings --- neither is the\n"
+"ancestor of the other. The remote bookmark was renamed to\n"
+"``traveling@default``. The ``@default`` comes from the default path.\n"
+"If Alice had ::"
+msgstr ""
+
+#: src/bookmarks/index.txt:662
+msgid ""
+"   [paths]\n"
+"   carla = /home/carla/phrases"
+msgstr ""
+
+#: src/bookmarks/index.txt:665
+msgid ""
+"in her ``.hg/hgrc`` file, then the bookmark would have been renamed to\n"
+"``traveling@carla``."
+msgstr ""
+
+#: src/bookmarks/index.txt:668
+msgid ""
+"Merging Divergent Bookmarks\n"
+"---------------------------"
+msgstr ""
+
+#: src/bookmarks/index.txt:671
+msgid ""
+"Like normal, Alice will now merge with the other head. Normally, she\n"
+"can just run `hg merge` and Mercurial will automatically select the\n"
+"other head on the branch as the obvious merge candidate. This doesn't\n"
+"work with bookmarks:"
+msgstr ""
+
+#: src/bookmarks/index.txt:683
+msgid "She has to merge with the divergent bookmark manually:"
+msgstr ""
+
+#: src/bookmarks/index.txt:695
+msgid ""
+"There is a conflict since both Alice and Bob added a new line after\n"
+"the first line. Alice resolves the conflict by incorporating both\n"
+"of their changes in the file:"
+msgstr ""
+
+#: src/bookmarks/index.txt:713
+msgid "She checks the diff and since it looks okay, she commits the merge:"
+msgstr ""
+
+#: src/bookmarks/index.txt:730
+msgid "After the merge, the divergent bookmark is still around:"
+msgstr ""
+
+#: src/bookmarks/index.txt:740
+msgid "Alice no longer needs the bookmark, so she deletes it:"
+msgstr ""
+
+#: src/bookmarks/index.txt:748
+msgid "The repository now looks like this:"
+msgstr ""
+
+#: src/bookmarks/index.txt:755
+msgid ""
+"   Mercurial 2.3 will improve this: `hg merge` will now automatically\n"
+"   select a divergent bookmark as the merge candidate. After the merge\n"
+"   is committed, the divergent bookmark is removed automatically."
+msgstr ""
+
+#: src/bookmarks/index.txt:759
+msgid ""
+"When she pushes back to Carla, the ``traveling`` bookmark will move\n"
+"forward. Before the push, it was pointing at ``888ae5a9e614``, and\n"
+"since ``0e1a5b84f635`` is a descendant, the bookmark can move forward\n"
+"on the server:"
+msgstr ""
+
+#: src/bookmarks/index.txt:776
+msgid ""
+"Merging a Feature Branch\n"
+"========================"
+msgstr ""
+
+#: src/bookmarks/index.txt:779
+msgid ""
+"Alice and Bob have now collected three phrases about traveling, and\n"
+"they decide that the ``traveling`` branch can be merged back into the\n"
+"main line."
+msgstr ""
+
+#: src/bookmarks/index.txt:783
+msgid ""
+"Merging\n"
+"-------"
+msgstr ""
+
+#: src/bookmarks/index.txt:786
+msgid ""
+"Alice will do the merge. She starts by pulling from Carla to make sure\n"
+"she has the latest changes, and then she updates to the unnamed head\n"
+"where Carla was editing the ``README.txt`` file:"
+msgstr ""
+
+#: src/bookmarks/index.txt:801
+msgid ""
+"In the update command, Alice used a `revision set`_ to select the\n"
+"changeset that is a head with no bookmark. She can see in\n"
+"TortoiseHg that she ended up at the correct changeset:"
+msgstr ""
+
+#: src/bookmarks/index.txt:808
+msgid "She now simply merges with the ``traveling`` branch:"
+msgstr ""
+
+#: src/bookmarks/index.txt:820
+msgid "The result is as you would expect:"
+msgstr ""
+
+#: src/bookmarks/index.txt:825
+msgid ""
+"Deleting the Bookmark\n"
+"---------------------"
+msgstr ""
+
+#: src/bookmarks/index.txt:828
+msgid ""
+"The branch has been merged and the bookmark is no longer needed. Alice\n"
+"can therefore delete it:"
+msgstr ""
+
+#: src/bookmarks/index.txt:836
+msgid "She can also push the merge changeset back:"
+msgstr ""
+
+#: src/bookmarks/index.txt:849
+msgid ""
+"Even though she deleted the bookmark locally and pushed the merge\n"
+"changeset, the bookmark still exists on the server:"
+msgstr ""
+
+#: src/bookmarks/index.txt:860
+msgid "To delete it on the server, Alice runs"
+msgstr ""
+
+#: src/bookmarks/index.txt:871
+msgid ""
+"Specifying a bookmark that doesn't exist locally but does exist\n"
+"on the server will delete the bookmark from the server. This is\n"
+"similar to when she published the bookmark in the first place: `hg\n"
+"push -B NAME` will make ``NAME`` point to the same thing on the server\n"
+"as it points to locally --- if ``NAME`` doesn't exist locally, it will\n"
+"also not exist on the server."
+msgstr ""
+
+#: src/bookmarks/index.txt:878
+msgid ""
+"Alice could also have pushed the merge and deleted the bookmark in a\n"
+"single operation. We can illustrate this by merging the ``greetings``\n"
+"branch too:"
+msgstr ""
+
+#: src/bookmarks/index.txt:900
+msgid ""
+"Here, `-B greetings` is what makes Mercurial delete the remote\n"
+"bookmark, and `-r .` is what makes it push the newly created merge\n"
+"changeset: the ``.`` (dot) revision is a shorthand for the parent\n"
+"revision of the working copy. Without the `-r .` flag, `hg push` would\n"
+"only have pushed up to the ``greetings`` changeset --- and thus\n"
+"excluded the merge changeset."
+msgstr ""
+
+#: src/bookmarks/index.txt:910
+msgid ""
+"Bookmarks give you a lightweight way to track multiple lines of\n"
+"development (heads) in your repository. The main features of bookmarks\n"
+"are:"
+msgstr ""
+
+#: src/bookmarks/index.txt:914
+msgid ""
+"* Mutability: Bookmarks live outside of the changeset history and can\n"
+"  be added, renamed, and deleted without leaving a trace. This makes\n"
+"  bookmarks good for tracking feature or topic branches."
+msgstr ""
+
+#: src/bookmarks/index.txt:918
+msgid ""
+"* Shareability: Bookmarks can be pushed and pulled between repositories.\n"
+"  When a bookmark has been published, Mercurial will keep it in sync\n"
+"  going forward. Since bookmarks are not automatically published, you\n"
+"  can keep them private until you decide to share them."
+msgstr ""
+
+#: src/bookmarks/index.txt:923
+msgid "The main commands you use to work with bookmarks are:"
+msgstr ""
+
+#: src/bookmarks/index.txt:925
+msgid "* `hg bookmarks`: List all bookmarks."
+msgstr ""
+
+#: src/bookmarks/index.txt:927
+msgid "* `hg bookmark NAME`: Create a new bookmark called ``NAME``."
+msgstr ""
+
+#: src/bookmarks/index.txt:929
+msgid "* `hg update NAME`: Update to ``NAME`` and make the bookmark active."
+msgstr ""
+
+#: src/bookmarks/index.txt:931
+msgid ""
+"* `hg incoming -B`: See bookmarks that exist in the remote repository\n"
+"  but do no exist in the local repository."
+msgstr ""
+
+#: src/bookmarks/index.txt:934
+msgid ""
+"* `hg push -B NAME`: Publish a feature branch ``NAME`` and publish the\n"
+"  bookmark. If ``NAME`` doesn't exist locally, delete the ``NAME``\n"
+"  bookmark in the remote repository."
+msgstr ""
+
+#: src/bookmarks/index.txt:938
+msgid ""
+"* `hg pull -B NAME`: Pull a feature branch ``NAME`` along with the\n"
+"  bookmark."
+msgstr ""
+
+#: src/bookmarks/index.txt:944
+msgid ""
+"1. Have one person in the group create a repository --- the others\n"
+"   clone this."
+msgstr ""
+
+#: src/bookmarks/index.txt:947
+msgid "2. Create a bookmark named after yourself and make some commits."
+msgstr ""
+
+#: src/bookmarks/index.txt:949
+msgid ""
+"3. Publish your bookmark to the central repository and pull the others'\n"
+"   branches into your own repository."
+msgstr ""
+
+#: src/bookmarks/index.txt:952
+msgid ""
+"4. See the `revision set`_ documentation and try a query like `hg\n"
+"   log -r \"ancestors(NAME) - ancestors(.)\"` to see changesets on the\n"
+"   branch ``NAME`` that have not yet been merged into your current\n"
+"   revision. Revision sets also work in TortoiseHg."
+msgstr ""
+
+#: src/bookmarks/index.txt:957
+msgid ""
+"5. Update to one of the other branches and make a commit. Push this\n"
+"   back to the server and experiment with managing divergent\n"
+"   bookmarks."
+msgstr ""
+
+#: src/bookmarks/index.txt:961
+msgid ""
+"6. Enable the `rebase extension`_ and try rebasing a feature branch on\n"
+"   top of the main line of development. The bookmarks should follow\n"
+"   along automatically."
+msgstr ""
+
+#: src/bookmarks/index.txt:966
+msgid ""
+"History\n"
+"-------"
+msgstr ""
+
+#: src/bookmarks/index.txt:969
+msgid ""
+"The first versions of Mercurial had neither named branches nor\n"
+"bookmarks. Named branches were introduced in Mercurial 0.9.2 (December\n"
+"2006) and bookmarks were introduced two years later. Over the years,\n"
+"bookmarks have gained features and become more stable. Noticeable\n"
+"events up to Mercurial 2.2 include:"
+msgstr ""
+
+#: src/bookmarks/index.txt:975
+msgid ""
+"Mercurial 1.1 (December 2008)\n"
+"  Bookmarks are introduced as a standard extension."
+msgstr ""
+
+#: src/bookmarks/index.txt:978
+msgid ""
+"Mercurial 1.6 (June 2010)\n"
+"  Pushable bookmarks. Previously, bookmarks were local-only labels for\n"
+"  commits. With this version, bookmarks can be shared by publishing\n"
+"  them to a remote server from which others can pull them."
+msgstr ""
+
+#: src/bookmarks/index.txt:983
+msgid ""
+"Mercurial 1.8 (March 2011)\n"
+"  The bookmarks feature \"graduated\" and became part of core Mercurial."
+msgstr ""
+
+#: src/bookmarks/index.txt:986
+msgid ""
+"Mercurial 2.1 (February 2012)\n"
+"  Divergent bookmarks are renamed when pulled into the local\n"
+"  repository. This lets you distinguish between ``foo`` (your\n"
+"  bookmark) and ``foo@alice`` (Alice's bookmark)."
+msgstr ""
+
+#: src/bookmarks/index.txt:991
+msgid ""
+"Because the bookmarks feature has had a long history, there are quite a\n"
+"few guides out there that now contain outdated information. You can\n"
+"compare the publication date of a guide with the table above to see which\n"
+"features the guide cannot possibly know about."
+msgstr ""
+
+#: src/bookmarks/index.txt:996
+msgid ""
+".. _named branches: ../tasks/\n"
+".. _revision set: http://www.selenic.com/mercurial/hg.1.html#revsets\n"
+".. _rebase extension: http://mercurial.selenic.com/wiki/RebaseExtension"
+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 ""
+
+#: src/hgsubversion/index.txt:36
+msgid ""
+"The extension requires the Python Subversion bindings. The bindings\n"
+"are bundled with TortoiseHg on Windows. On Linux you want to search\n"
+"for a package called ``python-subversion`` in your package manager."
+msgstr ""
+
+#: src/hgsubversion/index.txt:40
+msgid "Install the extension itself by running::"
+msgstr ""
+
+#: src/hgsubversion/index.txt:42
+msgid "   $ hg clone https://hgsubversion.googlecode.com/hg/ hgsubversion"
+msgstr ""
+
+#: src/hgsubversion/index.txt:44
+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:48
+msgid ""
+"   [extensions]\n"
+"   hgsubversion = path/to/hgsubversion"
+msgstr ""
+
+#: src/hgsubversion/index.txt:51
+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:55
+msgid ""
+"   [extensions]\n"
+"   hgsubversion ="
+msgstr ""
+
+#: src/hgsubversion/index.txt:58
+msgid ""
+"Use `hg help hgsubversion` to double-check that the extension is\n"
+"enabled."
+msgstr ""
+
+#: src/hgsubversion/index.txt:61
+msgid ""
+"Cloning Subversion\n"
+"=================="
+msgstr ""
+
+#: src/hgsubversion/index.txt:64
+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:97
+msgid ""
+"She inspects the repository with `thg log` to see that the tags were\n"
+"defined properly:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:103
+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:113
+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:120
+msgid ""
+"Pushing to Subversion\n"
+"====================="
+msgstr ""
+
+#: src/hgsubversion/index.txt:123
+msgid "Alice can now edit the files and commit them with Mercurial:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:141
+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:168
+msgid "You can see the updated changeset like this:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:190
+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:196
+msgid ""
+"Pulling from Subversion\n"
+"======================="
+msgstr ""
+
+#: src/hgsubversion/index.txt:199
+msgid "Alice makes a couple of more local changes in her Mercurial clone:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:248
+msgid "Meanwhile, the Subversion repository has been changed:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:280
+msgid "The new revision causes a fork in the history:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:285
+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:322
+msgid ""
+"Again, this is necessary since Subversion is a strictly linear system.\n"
+"The new history looks like this:"
+msgstr ""
+
+#: src/hgsubversion/index.txt:332
+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:336
+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:341
+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:345
+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:351
+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:357
+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:362
+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:367
+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:375
+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:380
+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:389
+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/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 don't have direct access to each other's files like that. This\n"
+"is why Mercurial can access remote repositories over a network\n"
+"connection."
+msgstr ""
+
+#: src/remote/index.txt:48
+msgid "Mercurial speaks two network protocols:"
+msgstr ""
+
+#: src/remote/index.txt:50
+msgid "* HTTP: the protocol used by normal webservers."
+msgstr ""
+
+#: src/remote/index.txt:52
+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:57
+msgid "* SSH: the secure shell protocol used on many Unix systems."
+msgstr ""
+
+#: src/remote/index.txt:59
+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:66
+msgid ""
+"Working with Repositories over HTTP\n"
+"==================================="
+msgstr ""
+
+#: src/remote/index.txt:69
+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:75
+msgid ""
+"Cloning over HTTP\n"
+"-----------------"
+msgstr ""
+
+#: src/remote/index.txt:78
+msgid "We will start by letting Alice clone a small example repository:"
+msgstr ""
+
+#: src/remote/index.txt:93
+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:98
+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:108
+msgid "Alice can now make her own commits in her clone:"
+msgstr ""
+
+#: src/remote/index.txt:117
+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:133
+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:137
+msgid ""
+"Serving a Repository over HTTP\n"
+"------------------------------"
+msgstr ""
+
+#: src/remote/index.txt:140
+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:144
+msgid "We will let Alice serve her clone of the ``hello`` repository:"
+msgstr ""
+
+#: src/remote/index.txt:155
+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:163
+msgid "Bob can make a clone of Alice's repository:"
+msgstr ""
+
+#: src/remote/index.txt:180
+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:195
+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:210
+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:221
+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:234
+msgid ""
+"For our example, we will let Alice disable the authentication check\n"
+"with yet another command line option:"
+msgstr ""
+
+#: src/remote/index.txt:246
+msgid "Bob can now push his changeset back to Alice:"
+msgstr ""
+
+#: src/remote/index.txt:259
+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:269 src/remote/index.txt:322
+msgid ""
+"Filesystem Permissions\n"
+"----------------------"
+msgstr ""
+
+#: src/remote/index.txt:272
+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:277
+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:282
+msgid ""
+"Working with Repositories over SSH\n"
+"=================================="
+msgstr ""
+
+#: src/remote/index.txt:285
+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:290
+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:294
+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:299
+msgid "    $ hg clone ssh://server/path/to/repository"
+msgstr ""
+
+#: src/remote/index.txt:301
+msgid "and not::"
+msgstr ""
+
+#: src/remote/index.txt:303
+msgid "    $ hg clone server:path/to/repository"
+msgstr ""
+
+#: src/remote/index.txt:305
+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:309
+msgid "    $ hg clone ssh://server//absolute/path/to/repository"
+msgstr ""
+
+#: src/remote/index.txt:311
+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:315
+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:318
+msgid "    $ hg clone . ssh://server/path/to/repository"
+msgstr ""
+
+#: src/remote/index.txt:320
+msgid "in order to clone the current repository to the server."
+msgstr ""
+
+#: src/remote/index.txt:325
+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:331
+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:336
+msgid ""
+"Caching of HTTP(S) Credentials\n"
+"=============================="
+msgstr ""
+
+#: src/remote/index.txt:339
+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:343
+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:350
+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:356
+msgid ".. tip::"
+msgstr ""
+
+#: src/remote/index.txt:358
+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:363
+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 ""
+