merge with mpm

hgext/color.py

@@ -162,22 +162,24 b' def colorqseries(orig, ui, repo, *dummy,'
 _patch_effects = { 'applied': ['blue', 'bold', 'underline'],
                     'missing': ['red', 'bold'],
                     'unapplied': ['black', 'bold'], }
-def colorwrap(orig, s):
+def colorwrap(orig, *args):
     '''wrap ui.write for colored diff output'''
-    lines = s.split('\n')
-    for i, line in enumerate(lines):
-        stripline = line
-        if line and line[0] in '+-':
-            # highlight trailing whitespace, but only in changed lines
-            stripline = line.rstrip()
-        for prefix, style in _diff_prefixes:
-            if stripline.startswith(prefix):
-                lines[i] = render_effects(stripline, _diff_effects[style])
-                break
-        if line != stripline:
-            lines[i] += render_effects(
-                line[len(stripline):], _diff_effects['trailingwhitespace'])
-    orig('\n'.join(lines))
+    def _colorize(s):
+        lines = s.split('\n')
+        for i, line in enumerate(lines):
+            stripline = line
+            if line and line[0] in '+-':
+                # highlight trailing whitespace, but only in changed lines
+                stripline = line.rstrip()
+            for prefix, style in _diff_prefixes:
+                if stripline.startswith(prefix):
+                    lines[i] = render_effects(stripline, _diff_effects[style])
+                    break
+            if line != stripline:
+                lines[i] += render_effects(
+                    line[len(stripline):], _diff_effects['trailingwhitespace'])
+        return '\n'.join(lines)
+    orig(*[_colorize(s) for s in args])
 
 def colorshowpatch(orig, self, node):
     '''wrap cmdutil.changeset_printer.showpatch with colored output'''
@@ -234,6 +236,13 b' def uisetup(ui):'
         # The mq extension is not enabled
         pass
 
+    try:
+        rec = extensions.find('record')
+        _setupcmd(ui, 'record', rec.cmdtable, colordiff, _diff_effects)
+    except KeyError:
+        # The record extension is not enabled
+        pass
+
 def _setupcmd(ui, cmd, table, func, effectsmap):
     '''patch in command to command table and load effect map'''
     def nocolor(orig, *args, **opts):

i18n/da.po

@@ -36,8 +36,12 b' msgstr "TILVALG"'
 msgid "COMMANDS"
 msgstr "KOMMANDOER"
 
-msgid "    options:\n"
-msgstr "    tilvalg:\n"
+msgid ""
+"    options:\n"
+"\n"
+msgstr ""
+"    tilvalg:\n"
+"\n"
 
 #, python-format
 msgid ""
@@ -64,7 +68,7 b' msgid ""'
 "Nor is it safe if remote users share an account, because then there\n"
 "is no way to distinguish them.\n"
 "\n"
-"To use this hook, configure the acl extension in your hgrc like this:\n"
+"To use this hook, configure the acl extension in your hgrc like this::\n"
 "\n"
 "  [extensions]\n"
 "  hgext.acl =\n"
@@ -77,10 +81,10 b' msgid ""'
 "  # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
 "  sources = serve\n"
 "\n"
-"The allow and deny sections take a subtree pattern as key (with a\n"
-"glob syntax by default), and a comma separated list of users as\n"
-"the corresponding value. The deny list is checked before the allow\n"
-"list is.\n"
+"The allow and deny sections take a subtree pattern as key (with a glob\n"
+"syntax by default), and a comma separated list of users as the\n"
+"corresponding value. The deny list is checked before the allow list\n"
+"is. ::\n"
 "\n"
 "  [acl.allow]\n"
 "  # If acl.allow is not present, all users are allowed by default.\n"
@@ -133,16 +137,16 b' msgid ""'
 "\n"
 "Bookmarks are local movable markers to changesets. Every bookmark\n"
 "points to a changeset identified by its hash. If you commit a\n"
-"changeset that is based on a changeset that has a bookmark on it,\n"
-"the bookmark shifts to the new changeset.\n"
-"\n"
-"It is possible to use bookmark names in every revision lookup\n"
-"(e.g. hg merge, hg update).\n"
+"changeset that is based on a changeset that has a bookmark on it, the\n"
+"bookmark shifts to the new changeset.\n"
+"\n"
+"It is possible to use bookmark names in every revision lookup (e.g. hg\n"
+"merge, hg update).\n"
 "\n"
 "By default, when several bookmarks point to the same changeset, they\n"
 "will all move forward together. It is possible to obtain a more\n"
 "git-like experience by adding the following configuration option to\n"
-"your .hgrc:\n"
+"your .hgrc::\n"
 "\n"
 "  [bookmarks]\n"
 "  track.current = True\n"
@@ -217,65 +221,86 b' msgid ""'
 "be run by Mercurial as the user pushing the change; you will need to\n"
 "ensure the Bugzilla install file permissions are set appropriately.\n"
 "\n"
-"Configuring the extension:\n"
-"\n"
-"    [bugzilla]\n"
-"\n"
-"    host       Hostname of the MySQL server holding the Bugzilla\n"
-"               database.\n"
-"    db         Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
-"    user       Username to use to access MySQL server. Default 'bugs'.\n"
-"    password   Password to use to access MySQL server.\n"
-"    timeout    Database connection timeout (seconds). Default 5.\n"
-"    version    Bugzilla version. Specify '3.0' for Bugzilla versions\n"
-"               3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
-"               and '2.16' for versions prior to 2.18.\n"
-"    bzuser     Fallback Bugzilla user name to record comments with, if\n"
-"               changeset committer cannot be found as a Bugzilla user.\n"
-"    bzdir      Bugzilla install directory. Used by default notify.\n"
-"               Default '/var/www/html/bugzilla'.\n"
-"    notify     The command to run to get Bugzilla to send bug change\n"
-"               notification emails. Substitutes from a map with 3\n"
-"               keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
-"               bugzilla email). Default depends on version; from 2.18\n"
-"               it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-"               %(id)s %(user)s\".\n"
-"    regexp     Regular expression to match bug IDs in changeset commit\n"
-"               message. Must contain one \"()\" group. The default\n"
-"               expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
-"               number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
-"               variations thereof. Matching is case insensitive.\n"
-"    style      The style file to use when formatting comments.\n"
-"    template   Template to use when formatting comments. Overrides\n"
-"               style if specified. In addition to the usual Mercurial\n"
-"               keywords, the extension specifies:\n"
-"                   {bug}       The Bugzilla bug ID.\n"
-"                   {root}      The full pathname of the Mercurial\n"
-"                               repository.\n"
-"                   {webroot}   Stripped pathname of the Mercurial\n"
-"                               repository.\n"
-"                   {hgweb}     Base URL for browsing Mercurial\n"
-"                               repositories.\n"
-"               Default 'changeset {node|short} in repo {root} refers '\n"
-"                       'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
-"    strip      The number of slashes to strip from the front of {root}\n"
-"               to produce {webroot}. Default 0.\n"
-"    usermap    Path of file containing Mercurial committer ID to\n"
-"               Bugzilla user ID mappings. If specified, the file\n"
-"               should contain one mapping per line,\n"
-"               \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
-"               section.\n"
-"\n"
-"    [usermap]\n"
-"    Any entries in this section specify mappings of Mercurial\n"
-"    committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-"    \"committer\"=\"Bugzilla user\"\n"
-"\n"
-"    [web]\n"
-"    baseurl    Base URL for browsing Mercurial repositories. Reference\n"
-"               from templates as {hgweb}.\n"
-"\n"
-"Activating the extension:\n"
+"The extension is configured through three different configuration\n"
+"sections. These keys are recognized in the [bugzilla] section:\n"
+"\n"
+"host\n"
+"  Hostname of the MySQL server holding the Bugzilla database.\n"
+"\n"
+"db\n"
+"  Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
+"\n"
+"user\n"
+"  Username to use to access MySQL server. Default 'bugs'.\n"
+"\n"
+"password\n"
+"  Password to use to access MySQL server.\n"
+"\n"
+"timeout\n"
+"  Database connection timeout (seconds). Default 5.\n"
+"\n"
+"version\n"
+"  Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
+"  '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
+"  to 2.18.\n"
+"\n"
+"bzuser\n"
+"  Fallback Bugzilla user name to record comments with, if changeset\n"
+"  committer cannot be found as a Bugzilla user.\n"
+"\n"
+"bzdir\n"
+"   Bugzilla install directory. Used by default notify. Default\n"
+"   '/var/www/html/bugzilla'.\n"
+"\n"
+"notify\n"
+"  The command to run to get Bugzilla to send bug change notification\n"
+"  emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
+"  and 'user' (committer bugzilla email). Default depends on version;\n"
+"  from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
+"  %(id)s %(user)s\".\n"
+"\n"
+"regexp\n"
+"  Regular expression to match bug IDs in changeset commit message.\n"
+"  Must contain one \"()\" group. The default expression matches 'Bug\n"
+"  1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
+"  1234 and 5678' and variations thereof. Matching is case insensitive.\n"
+"\n"
+"style\n"
+"  The style file to use when formatting comments.\n"
+"\n"
+"template\n"
+"  Template to use when formatting comments. Overrides style if\n"
+"  specified. In addition to the usual Mercurial keywords, the\n"
+"  extension specifies::\n"
+"\n"
+"    {bug}       The Bugzilla bug ID.\n"
+"    {root}      The full pathname of the Mercurial repository.\n"
+"    {webroot}   Stripped pathname of the Mercurial repository.\n"
+"    {hgweb}     Base URL for browsing Mercurial repositories.\n"
+"\n"
+"  Default 'changeset {node|short} in repo {root} refers '\n"
+"          'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
+"\n"
+"strip\n"
+"  The number of slashes to strip from the front of {root} to produce\n"
+"  {webroot}. Default 0.\n"
+"\n"
+"usermap\n"
+"  Path of file containing Mercurial committer ID to Bugzilla user ID\n"
+"  mappings. If specified, the file should contain one mapping per\n"
+"  line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
+"\n"
+"The [usermap] section is used to specify mappings of Mercurial\n"
+"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
+"\"committer\"=\"Bugzilla user\"\n"
+"\n"
+"Finally, the [web] section supports one entry:\n"
+"\n"
+"baseurl\n"
+"  Base URL for browsing Mercurial repositories. Reference from\n"
+"  templates as {hgweb}.\n"
+"\n"
+"Activating the extension::\n"
 "\n"
 "    [extensions]\n"
 "    hgext.bugzilla =\n"
@@ -288,7 +313,7 b' msgid ""'
 "\n"
 "This example configuration is for a collection of Mercurial\n"
 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2.\n"
+"installation in /opt/bugzilla-3.2. ::\n"
 "\n"
 "    [bugzilla]\n"
 "    host=localhost\n"
@@ -296,8 +321,9 b' msgid ""'
 "    version=3.0\n"
 "    bzuser=[e-mail]\n"
 "    bzdir=/opt/bugzilla-3.2\n"
-"    template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
-"rev/{node|short}\\n\\n{desc}\\n\n"
+"    template=Changeset {node|short} in {root|basename}.\n"
+"             {hgweb}/{webroot}/rev/{node|short}\\n\n"
+"             {desc}\\n\n"
 "    strip=5\n"
 "\n"
 "    [web]\n"
@@ -306,7 +332,7 b' msgid ""'
 "    [usermap]\n"
 "    [e-mail]=[e-mail]\n"
 "\n"
-"Commits add a comment to the Bugzilla bug record of the form:\n"
+"Commits add a comment to the Bugzilla bug record of the form::\n"
 "\n"
 "    Changeset 3b16791d6642 in repository-name.\n"
 "    http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
@@ -437,7 +463,7 b' msgid ""'
 "    alternatively the number of matching revisions if the\n"
 "    --changesets option is specified.\n"
 "\n"
-"    Examples:\n"
+"    Examples::\n"
 "\n"
 "      # display count of changed lines for every committer\n"
 "      hg churn -t '{author|email}'\n"
@@ -452,12 +478,12 b' msgid ""'
 "      hg churn -f '%Y' -s\n"
 "\n"
 "    It is possible to map alternate email addresses to a main address\n"
-"    by providing a file using the following format:\n"
-"\n"
-"    <alias email> <actual email>\n"
-"\n"
-"    Such a file may be specified with the --aliases option, otherwise a\n"
-"    .hgchurn file will be looked for in the working directory root.\n"
+"    by providing a file using the following format::\n"
+"\n"
+"      <alias email> <actual email>\n"
+"\n"
+"    Such a file may be specified with the --aliases option, otherwise\n"
+"    a .hgchurn file will be looked for in the working directory root.\n"
 "    "
 msgstr ""
 "histogram over ændringer i depotet\n"
@@ -472,7 +498,7 b' msgstr ""'
 "    alternativt på antallet af matchende revisioner, hvis --changesets\n"
 "    tilvalget er specificeret.\n"
 "\n"
-"    Eksempler:\n"
+"    Eksempler::\n"
 "\n"
 "      # viser antaller af ændrede linier for hver bruger\n"
 "      hg churn -t '{author|email}'\n"
@@ -487,9 +513,9 b' msgstr ""'
 "      hg churn -f '%Y' -s\n"
 "\n"
 "    Det er muligt at afbilde alternative e-mail-adresser til\n"
-"    hoved-adresser ved at bruge en fil med følgende format:\n"
-"\n"
-"    <alias email> <faktisk email>\n"
+"    hoved-adresser ved at bruge en fil med følgende format::\n"
+"\n"
+"      <alias email> <faktisk email>\n"
 "\n"
 "    En sådan fil kan angivet med --aliases tilvalget. Som standard\n"
 "    bruges .hgchurn i arbejdskatalogets rod, hvis denne findes.\n"
@@ -540,33 +566,33 b' msgid ""'
 "function (aka ANSI escape codes). This module also provides the\n"
 "render_text function, which can be used to add effects to any text.\n"
 "\n"
-"Default effects may be overridden from the .hgrc file:\n"
-"\n"
-"[color]\n"
-"status.modified = blue bold underline red_background\n"
-"status.added = green bold\n"
-"status.removed = red bold blue_background\n"
-"status.deleted = cyan bold underline\n"
-"status.unknown = magenta bold underline\n"
-"status.ignored = black bold\n"
-"\n"
-"# 'none' turns off all effects\n"
-"status.clean = none\n"
-"status.copied = none\n"
-"\n"
-"qseries.applied = blue bold underline\n"
-"qseries.unapplied = black bold\n"
-"qseries.missing = red bold\n"
-"\n"
-"diff.diffline = bold\n"
-"diff.extended = cyan bold\n"
-"diff.file_a = red bold\n"
-"diff.file_b = green bold\n"
-"diff.hunk = magenta\n"
-"diff.deleted = red\n"
-"diff.inserted = green\n"
-"diff.changed = white\n"
-"diff.trailingwhitespace = bold red_background\n"
+"Default effects may be overridden from the .hgrc file::\n"
+"\n"
+"  [color]\n"
+"  status.modified = blue bold underline red_background\n"
+"  status.added = green bold\n"
+"  status.removed = red bold blue_background\n"
+"  status.deleted = cyan bold underline\n"
+"  status.unknown = magenta bold underline\n"
+"  status.ignored = black bold\n"
+"\n"
+"  # 'none' turns off all effects\n"
+"  status.clean = none\n"
+"  status.copied = none\n"
+"\n"
+"  qseries.applied = blue bold underline\n"
+"  qseries.unapplied = black bold\n"
+"  qseries.missing = red bold\n"
+"\n"
+"  diff.diffline = bold\n"
+"  diff.extended = cyan bold\n"
+"  diff.file_a = red bold\n"
+"  diff.file_b = green bold\n"
+"  diff.hunk = magenta\n"
+"  diff.deleted = red\n"
+"  diff.inserted = green\n"
+"  diff.changed = white\n"
+"  diff.trailingwhitespace = bold red_background\n"
 msgstr ""
 
 msgid "when to colorize (always, auto, or never)"
@@ -586,6 +612,7 b' msgid ""'
 "convert a foreign SCM repository to a Mercurial one.\n"
 "\n"
 "    Accepted source formats [identifiers]:\n"
+"\n"
 "    - Mercurial [hg]\n"
 "    - CVS [cvs]\n"
 "    - Darcs [darcs]\n"
@@ -597,6 +624,7 b' msgid ""'
 "    - Perforce [p4]\n"
 "\n"
 "    Accepted destination formats [identifiers]:\n"
+"\n"
 "    - Mercurial [hg]\n"
 "    - Subversion [svn] (history on branches is not preserved)\n"
 "\n"
@@ -608,23 +636,28 b' msgid ""'
 "    basename of the source with '-hg' appended. If the destination\n"
 "    repository doesn't exist, it will be created.\n"
 "\n"
-"    By default, all sources except Mercurial will use\n"
-"    --branchsort. Mercurial uses --sourcesort to preserve original\n"
-"    revision numbers order. Sort modes have the following effects:\n"
-"      --branchsort: convert from parent to child revision when\n"
-"        possible, which means branches are usually converted one after\n"
-"        the other. It generates more compact repositories.\n"
-"      --datesort: sort revisions by date. Converted repositories have\n"
-"        good-looking changelogs but are often an order of magnitude\n"
-"        larger than the same ones generated by --branchsort.\n"
-"      --sourcesort: try to preserve source revisions order, only\n"
-"        supported by Mercurial sources.\n"
+"    By default, all sources except Mercurial will use --branchsort.\n"
+"    Mercurial uses --sourcesort to preserve original revision numbers\n"
+"    order. Sort modes have the following effects:\n"
+"\n"
+"    --branchsort  convert from parent to child revision when possible,\n"
+"                  which means branches are usually converted one after\n"
+"                  the other. It generates more compact repositories.\n"
+"\n"
+"    --datesort    sort revisions by date. Converted repositories have\n"
+"                  good-looking changelogs but are often an order of\n"
+"                  magnitude larger than the same ones generated by\n"
+"                  --branchsort.\n"
+"\n"
+"    --sourcesort  try to preserve source revisions order, only\n"
+"                  supported by Mercurial sources.\n"
 "\n"
 "    If <REVMAP> isn't given, it will be put in a default location\n"
 "    (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
 "    that maps each source commit ID to the destination ID for that\n"
-"    revision, like so:\n"
-"    <source ID> <destination ID>\n"
+"    revision, like so::\n"
+"\n"
+"      <source ID> <destination ID>\n"
 "\n"
 "    If the file doesn't exist, it's automatically created. It's\n"
 "    updated on each commit copied, so convert-repo can be interrupted\n"
@@ -638,7 +671,7 b' msgid ""'
 "\n"
 "    The filemap is a file that allows filtering and remapping of files\n"
 "    and directories. Comment lines start with '#'. Each line can\n"
-"    contain one of the following directives:\n"
+"    contain one of the following directives::\n"
 "\n"
 "      include path/to/file\n"
 "\n"
@@ -648,11 +681,11 b' msgid ""'
 "\n"
 "    The 'include' directive causes a file, or all files under a\n"
 "    directory, to be included in the destination repository, and the\n"
-"    exclusion of all other files and directories not explicitly included.\n"
-"    The 'exclude' directive causes files or directories to be omitted.\n"
-"    The 'rename' directive renames a file or directory. To rename from\n"
-"    a subdirectory into the root of the repository, use '.' as the\n"
-"    path to rename to.\n"
+"    exclusion of all other files and directories not explicitly\n"
+"    included. The 'exclude' directive causes files or directories to\n"
+"    be omitted. The 'rename' directive renames a file or directory. To\n"
+"    rename from a subdirectory into the root of the repository, use\n"
+"    '.' as the path to rename to.\n"
 "\n"
 "    The splicemap is a file that allows insertion of synthetic\n"
 "    history, letting you specify the parents of a revision. This is\n"
@@ -677,7 +710,7 b' msgid ""'
 "    in one repository from \"default\" to a named branch.\n"
 "\n"
 "    Mercurial Source\n"
-"    -----------------\n"
+"    ----------------\n"
 "\n"
 "    --config convert.hg.ignoreerrors=False    (boolean)\n"
 "        ignore integrity errors when reading. Use it to fix Mercurial\n"
@@ -705,36 +738,38 b' msgid ""'
 "    Because CVS does not have changesets, it is necessary to collect\n"
 "    individual commits to CVS and merge them into changesets. CVS\n"
 "    source uses its internal changeset merging code by default but can\n"
-"    be configured to call the external 'cvsps' program by setting:\n"
-"        --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"    be configured to call the external 'cvsps' program by setting::\n"
+"\n"
+"      --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"\n"
 "    This option is deprecated and will be removed in Mercurial 1.4.\n"
 "\n"
 "    The options shown are the defaults.\n"
 "\n"
-"    Internal cvsps is selected by setting\n"
-"        --config convert.cvsps=builtin\n"
+"    Internal cvsps is selected by setting ::\n"
+"\n"
+"      --config convert.cvsps=builtin\n"
+"\n"
 "    and has a few more configurable options:\n"
-"        --config convert.cvsps.cache=True     (boolean)\n"
-"            Set to False to disable remote log caching, for testing and\n"
-"            debugging purposes.\n"
-"        --config convert.cvsps.fuzz=60        (integer)\n"
-"            Specify the maximum time (in seconds) that is allowed\n"
-"            between commits with identical user and log message in a\n"
-"            single changeset. When very large files were checked in as\n"
-"            part of a changeset then the default may not be long\n"
-"            enough.\n"
-"        --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
-"            Specify a regular expression to which commit log messages\n"
-"            are matched. If a match occurs, then the conversion\n"
-"            process will insert a dummy revision merging the branch on\n"
-"            which this log message occurs to the branch indicated in\n"
-"            the regex.\n"
-"        --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
-"            Specify a regular expression to which commit log messages\n"
-"            are matched. If a match occurs, then the conversion\n"
-"            process will add the most recent revision on the branch\n"
-"            indicated in the regex as the second parent of the\n"
-"            changeset.\n"
+"\n"
+"    --config convert.cvsps.cache=True         (boolean)\n"
+"        Set to False to disable remote log caching, for testing and\n"
+"        debugging purposes.\n"
+"    --config convert.cvsps.fuzz=60            (integer)\n"
+"        Specify the maximum time (in seconds) that is allowed between\n"
+"        commits with identical user and log message in a single\n"
+"        changeset. When very large files were checked in as part of a\n"
+"        changeset then the default may not be long enough.\n"
+"    --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
+"        Specify a regular expression to which commit log messages are\n"
+"        matched. If a match occurs, then the conversion process will\n"
+"        insert a dummy revision merging the branch on which this log\n"
+"        message occurs to the branch indicated in the regex.\n"
+"    --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
+"        Specify a regular expression to which commit log messages are\n"
+"        matched. If a match occurs, then the conversion process will\n"
+"        add the most recent revision on the branch indicated in the\n"
+"        regex as the second parent of the changeset.\n"
 "\n"
 "    The hgext/convert/cvsps wrapper script allows the builtin\n"
 "    changeset merging code to be run without doing a conversion. Its\n"
@@ -784,7 +819,6 b' msgid ""'
 "    --config convert.p4.startrev=0            (perforce changelist number)\n"
 "        specify initial Perforce revision.\n"
 "\n"
-"\n"
 "    Mercurial Destination\n"
 "    ---------------------\n"
 "\n"
@@ -1335,14 +1369,14 b' msgstr ""'
 msgid ""
 "command to allow external programs to compare revisions\n"
 "\n"
-"The `extdiff' Mercurial extension allows you to use external programs\n"
-"to compare revisions, or revision with working directory. The external diff\n"
-"programs are called with a configurable set of options and two\n"
+"The extdiff Mercurial extension allows you to use external programs\n"
+"to compare revisions, or revision with working directory. The external\n"
+"diff programs are called with a configurable set of options and two\n"
 "non-option arguments: paths to directories containing snapshots of\n"
 "files to compare.\n"
 "\n"
-"The `extdiff' extension also allows to configure new diff commands, so\n"
-"you do not need to type \"hg extdiff -p kdiff3\" always.\n"
+"The extdiff extension also allows to configure new diff commands, so\n"
+"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
 "\n"
 "  [extdiff]\n"
 "  # add new command that runs GNU diff(1) in 'context diff' mode\n"
@@ -1358,14 +1392,13 b' msgid ""'
 "  meld =\n"
 "\n"
 "  # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
-"  # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
-"  # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
-"in\n"
+"  # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
+"  # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
 "  # your .vimrc\n"
 "  vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
 "\n"
 "You can use -I/-X and list of file or directory names like normal \"hg\n"
-"diff\" command. The `extdiff' extension makes snapshots of only needed\n"
+"diff\" command. The extdiff extension makes snapshots of only needed\n"
 "files, so running the external diff program will actually be pretty\n"
 "fast (at least faster than having to compare the entire tree).\n"
 msgstr ""
@@ -1424,6 +1457,21 b' msgid "hg extdiff [OPT]... [FILE]..."'
 msgstr "hg extdiff [TILVALG]... [FIL]..."
 
 #, python-format
+msgid ""
+"use %(path)s to diff repository (or selected files)\n"
+"\n"
+"    Show differences between revisions for the specified files, using the\n"
+"    %(path)s program.\n"
+"\n"
+"    When two revision arguments are given, then changes are shown between\n"
+"    those revisions. If only one revision is specified then that revision "
+"is\n"
+"    compared to the working directory, and, when no revisions are "
+"specified,\n"
+"    the working directory files are compared to its parent."
+msgstr ""
+
+#, python-format
 msgid "hg %s [OPTION]... [FILE]..."
 msgstr "hg %s [TILVALG]... [FIL]..."
 
@@ -1652,38 +1700,38 b' msgstr "hg glog [TILVALG]... [FIL]"'
 msgid ""
 "hooks for integrating with the CIA.vc notification service\n"
 "\n"
-"This is meant to be run as a changegroup or incoming hook.\n"
-"To configure it, set the following options in your hgrc:\n"
-"\n"
-"[cia]\n"
-"# your registered CIA user name\n"
-"user = foo\n"
-"# the name of the project in CIA\n"
-"project = foo\n"
-"# the module (subproject) (optional)\n"
-"#module = foo\n"
-"# Append a diffstat to the log message (optional)\n"
-"#diffstat = False\n"
-"# Template to use for log messages (optional)\n"
-"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
-"# Style to use (optional)\n"
-"#style = foo\n"
-"# The URL of the CIA notification service (optional)\n"
-"# You can use mailto: URLs to send by email, eg\n"
-"# mailto:[e-mail]\n"
-"# Make sure to set email.from if you do this.\n"
-"#url = http://cia.vc/\n"
-"# print message instead of sending it (optional)\n"
-"#test = False\n"
-"\n"
-"[hooks]\n"
-"# one of these:\n"
-"changegroup.cia = python:hgcia.hook\n"
-"#incoming.cia = python:hgcia.hook\n"
-"\n"
-"[web]\n"
-"# If you want hyperlinks (optional)\n"
-"baseurl = http://server/path/to/repo\n"
+"This is meant to be run as a changegroup or incoming hook. To\n"
+"configure it, set the following options in your hgrc::\n"
+"\n"
+"  [cia]\n"
+"  # your registered CIA user name\n"
+"  user = foo\n"
+"  # the name of the project in CIA\n"
+"  project = foo\n"
+"  # the module (subproject) (optional)\n"
+"  #module = foo\n"
+"  # Append a diffstat to the log message (optional)\n"
+"  #diffstat = False\n"
+"  # Template to use for log messages (optional)\n"
+"  #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+"  # Style to use (optional)\n"
+"  #style = foo\n"
+"  # The URL of the CIA notification service (optional)\n"
+"  # You can use mailto: URLs to send by email, eg\n"
+"  # mailto:[e-mail]\n"
+"  # Make sure to set email.from if you do this.\n"
+"  #url = http://cia.vc/\n"
+"  # print message instead of sending it (optional)\n"
+"  #test = False\n"
+"\n"
+"  [hooks]\n"
+"  # one of these:\n"
+"  changegroup.cia = python:hgcia.hook\n"
+"  #incoming.cia = python:hgcia.hook\n"
+"\n"
+"  [web]\n"
+"  # If you want hyperlinks (optional)\n"
+"  baseurl = http://server/path/to/repo\n"
 msgstr ""
 
 #, python-format
@@ -1714,19 +1762,19 b' msgid ""'
 "\n"
 "The hg view command will launch the hgk Tcl script. For this command\n"
 "to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file:\n"
+"the path to hgk in your .hgrc file::\n"
 "\n"
 "  [hgk]\n"
 "  path=/location/of/hgk\n"
 "\n"
 "hgk can make use of the extdiff extension to visualize revisions.\n"
-"Assuming you had already configured extdiff vdiff command, just add:\n"
+"Assuming you had already configured extdiff vdiff command, just add::\n"
 "\n"
 "  [hgk]\n"
 "  vdiff=vdiff\n"
 "\n"
 "Revisions context menu will now display additional entries to fire\n"
-"vdiff on hovered and selected revisions."
+"vdiff on hovered and selected revisions.\n"
 msgstr ""
 
 msgid "diff trees from two commits"
@@ -1816,10 +1864,10 b' msgid ""'
 "It depends on the Pygments syntax highlighting library:\n"
 "http://pygments.org/\n"
 "\n"
-"There is a single configuration option:\n"
-"\n"
-"[web]\n"
-"pygments_style = <style>\n"
+"There is a single configuration option::\n"
+"\n"
+"  [web]\n"
+"  pygments_style = <style>\n"
 "\n"
 "The default is 'colorful'.\n"
 msgstr ""
@@ -1828,10 +1876,10 b' msgstr ""'
 "Det afhænger af Pygments biblioteket til syntaksfarvelægning:\n"
 "http://pygments.org/\n"
 "\n"
-"Der er en enkelt konfigurationsmulighed:\n"
-"\n"
-"[web]\n"
-"pygments_style = <stil>\n"
+"Der er en enkelt konfigurationsmulighed::\n"
+"\n"
+"  [web]\n"
+"  pygments_style = <stil>\n"
 "\n"
 "Standardstilen er 'colorful'.\n"
 "\n"
@@ -1946,10 +1994,6 b' msgid "watching directories under %r\\n"'
 msgstr "overvåger kataloger under %r\n"
 
 #, python-format
-msgid "status: %r dir(%d) -> %s\n"
-msgstr ""
-
-#, python-format
 msgid "status: %r %s -> %s\n"
 msgstr ""
 
@@ -2018,12 +2062,12 b' msgstr "afsluttede ops\xc3\xa6tning\\n"'
 msgid ""
 "expand expressions into changelog and summaries\n"
 "\n"
-"This extension allows the use of a special syntax in summaries,\n"
-"which will be automatically expanded into links or any other\n"
-"arbitrary expression, much like InterWiki does.\n"
-"\n"
-"A few example patterns (link to bug tracking, etc.) that may\n"
-"be used in your hgrc:\n"
+"This extension allows the use of a special syntax in summaries, which\n"
+"will be automatically expanded into links or any other arbitrary\n"
+"expression, much like InterWiki does.\n"
+"\n"
+"A few example patterns (link to bug tracking, etc.) that may be used\n"
+"in your hgrc::\n"
 "\n"
 "  [interhg]\n"
 "  issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
@@ -2053,20 +2097,22 b' msgid ""'
 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
 "hgrc files.\n"
 "\n"
-"Example:\n"
+"Example::\n"
 "\n"
 "    [keyword]\n"
 "    # expand keywords in every python file except those matching \"x*\"\n"
 "    **.py =\n"
 "    x*    = ignore\n"
 "\n"
-"Note: the more specific you are in your filename patterns\n"
-"      the less you lose speed in huge repositories.\n"
+"NOTE: the more specific you are in your filename patterns the less you\n"
+"lose speed in huge repositories.\n"
 "\n"
 "For [keywordmaps] template mapping and expansion demonstration and\n"
-"control run \"hg kwdemo\".\n"
-"\n"
-"An additional date template filter {date|utcdate} is provided.\n"
+"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
+"available templates and filters.\n"
+"\n"
+"An additional date template filter {date|utcdate} is provided. It\n"
+"returns a date like \"2006/09/18 15:13:13\".\n"
 "\n"
 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
 "replaced with customized keywords and templates. Again, run \"hg\n"
@@ -2085,8 +2131,8 b' msgid ""'
 "have been checked in.\n"
 "\n"
 "Expansions spanning more than one line and incremental expansions,\n"
-"like CVS' $Log$, are not supported. A keyword template map\n"
-"\"Log = {desc}\" expands to the first line of the changeset description.\n"
+"like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
+"{desc}\" expands to the first line of the changeset description.\n"
 msgstr ""
 
 #, python-format
@@ -2109,10 +2155,12 b' msgid ""'
 "    Show current, custom, or default keyword template maps and their\n"
 "    expansions.\n"
 "\n"
-"    Extend current configuration by specifying maps as arguments and\n"
-"    optionally by reading from an additional hgrc file.\n"
-"\n"
-"    Override current keyword template maps with \"default\" option.\n"
+"    Extend the current configuration by specifying maps as arguments\n"
+"    and using -f/--rcfile to source an external hgrc file.\n"
+"\n"
+"    Use -d/--default to disable current configuration.\n"
+"\n"
+"    See \"hg help templates\" for information on templates and filters.\n"
 "    "
 msgstr ""
 
@@ -2120,27 +2168,50 b' msgstr ""'
 msgid "creating temporary repository at %s\n"
 msgstr "opretter midlertidigt depot ved %s\n"
 
-#, python-format
-msgid ""
-"\n"
-"\tconfig using %s keyword template maps\n"
-msgstr ""
-
-#, python-format
-msgid ""
-"\n"
-"%s keywords written to %s:\n"
-msgstr ""
-"\n"
-"%s nøgleord skrevet til %s:\n"
+msgid ""
+"\n"
+"\tconfiguration using custom keyword template maps\n"
+msgstr ""
+"\n"
+"\tkonfiguration med tilpaset nøgleordskabelon\n"
+
+msgid "\textending current template maps\n"
+msgstr ""
+
+msgid "\toverriding default template maps\n"
+msgstr "\toverskriver standard skabelon\n"
+
+msgid ""
+"\n"
+"\tconfiguration using default keyword template maps\n"
+msgstr ""
+"\n"
+"\tkonfiguration med standard nøgleordskabelon\n"
+
+msgid "\tdisabling current template maps\n"
+msgstr "deaktiverer nuævrende skabelon\n"
+
+msgid ""
+"\n"
+"\tconfiguration using current keyword template maps\n"
+msgstr ""
+"\n"
+"\tkonfiguration med nuværende nøgleordskabelon\n"
+
+#, python-format
+msgid ""
+"\n"
+"keywords written to %s:\n"
+msgstr ""
+"\n"
+"nøgleord skrevet til %s:\n"
 
 msgid "unhooked all commit hooks\n"
 msgstr ""
 
-#, python-format
-msgid ""
-"\n"
-"\t%s keywords expanded%s\n"
+msgid ""
+"\n"
+"\tkeywords expanded\n"
 msgstr ""
 
 #, python-format
@@ -2167,8 +2238,8 b' msgid ""'
 "    [keyword] configuration patterns.\n"
 "\n"
 "    Useful to prevent inadvertent keyword expansion and to speed up\n"
-"    execution by including only files that are actual candidates\n"
-"    for expansion.\n"
+"    execution by including only files that are actual candidates for\n"
+"    expansion.\n"
 "\n"
 "    See \"hg help keyword\" on how to construct patterns both for\n"
 "    inclusion and exclusion of files.\n"
@@ -2176,11 +2247,12 b' msgid ""'
 "    Use -u/--untracked to list untracked files as well.\n"
 "\n"
 "    With -a/--all and -v/--verbose the codes used to show the status\n"
-"    of files are:\n"
-"    K = keyword expansion candidate\n"
-"    k = keyword expansion candidate (untracked)\n"
-"    I = ignored\n"
-"    i = ignored (untracked)\n"
+"    of files are::\n"
+"\n"
+"      K = keyword expansion candidate\n"
+"      k = keyword expansion candidate (untracked)\n"
+"      I = ignored\n"
+"      i = ignored (untracked)\n"
 "    "
 msgstr ""
 
@@ -2231,19 +2303,18 b' msgid ""'
 "Known patches are represented as patch files in the .hg/patches\n"
 "directory. Applied patches are both patch files and changesets.\n"
 "\n"
-"Common tasks (use \"hg help command\" for more details):\n"
-"\n"
-"prepare repository to work with patches   qinit\n"
-"create new patch                          qnew\n"
-"import existing patch                     qimport\n"
-"\n"
-"print patch series                        qseries\n"
-"print applied patches                     qapplied\n"
-"print name of top applied patch           qtop\n"
-"\n"
-"add known patch to applied stack          qpush\n"
-"remove patch from applied stack           qpop\n"
-"refresh contents of top applied patch     qrefresh\n"
+"Common tasks (use \"hg help command\" for more details)::\n"
+"\n"
+"  prepare repository to work with patches   qinit\n"
+"  create new patch                          qnew\n"
+"  import existing patch                     qimport\n"
+"\n"
+"  print patch series                        qseries\n"
+"  print applied patches                     qapplied\n"
+"\n"
+"  add known patch to applied stack          qpush\n"
+"  remove patch from applied stack           qpop\n"
+"  refresh contents of top applied patch     qrefresh\n"
 msgstr ""
 "håndter en stak af rettelser\n"
 "\n"
@@ -2256,19 +2327,18 b' msgstr ""'
 "biblioteket. Anvendte rettelser er både rettelse-filer og Mercurial\n"
 "ændringer.\n"
 "\n"
-"Almindelige opgaver (brug \"hg help kommado\" for flere detaljer):\n"
-"\n"
-"forbered repository til at arbejde med rettelser   qinit\n"
-"opret ny rettelse                                  qnew\n"
-"importer eksisterende rettelse                     qimport\n"
-"\n"
-"list rettelse-serien                               qseries\n"
-"list anvendte rettelser                            qapplied\n"
-"list navnet på den øverste rettelse                qtop\n"
-"\n"
-"anvend og put rettelse på stakken                  qpush\n"
-"fjern rettelse fra stakken                         qpop\n"
-"genopfrisk indholdet af den øverste rettelse       qrefresh\n"
+"Almindelige opgaver (brug \"hg help kommado\" for flere detaljer)::\n"
+"\n"
+"  forbered repository til at arbejde med rettelser   qinit\n"
+"  opret ny rettelse                                  qnew\n"
+"  importer eksisterende rettelse                     qimport\n"
+"\n"
+"  list rettelse-serien                               qseries\n"
+"  list anvendte rettelser                            qapplied\n"
+"\n"
+"  anvend og put rettelse på stakken                  qpush\n"
+"  fjern rettelse fra stakken                         qpop\n"
+"  genopfrisk indholdet af den øverste rettelse       qrefresh\n"
 
 #, python-format
 msgid "%s appears more than once in %s"
@@ -2502,6 +2572,10 b' msgstr ""'
 msgid "deletions found between repo revs"
 msgstr ""
 
+#, python-format
+msgid "popping %s\n"
+msgstr "fjerner %s\n"
+
 msgid "patch queue now empty\n"
 msgstr "køen af rettelser er nu tom\n"
 
@@ -2618,9 +2692,15 b' msgstr ""'
 msgid "print the patches already applied"
 msgstr "udskriver rettelserne som allerede er anvendt"
 
+msgid "only one patch applied\n"
+msgstr "kun én rettelse er anvendt\n"
+
 msgid "print the patches not yet applied"
 msgstr "udskriver rettelserne som ikke er anvendt endnu"
 
+msgid "all patches applied\n"
+msgstr "alle rettelser er anvendt\n"
+
 msgid ""
 "import a patch\n"
 "\n"
@@ -2737,15 +2817,9 b' msgstr "udskriver navnet p\xc3\xa5 den nuv\xc3\xa6rende rettelse"'
 msgid "print the name of the next patch"
 msgstr "udskriver navnet på den næste rettelse"
 
-msgid "all patches applied\n"
-msgstr "alle rettelser er anvendt\n"
-
 msgid "print the name of the previous patch"
 msgstr "udskriver navnet på den forgående rettelse"
 
-msgid "only one patch applied\n"
-msgstr "kun én rettelse er anvendt\n"
-
 msgid ""
 "create a new patch\n"
 "\n"
@@ -3094,8 +3168,11 b' msgstr "kan ikke importere henover en an'
 msgid "print first line of patch header"
 msgstr ""
 
-msgid "hg qapplied [-s] [PATCH]"
-msgstr "hg qapplied [-s] [RETTELSE]"
+msgid "show only the last patch"
+msgstr "vis kun den sidste rettelse"
+
+msgid "hg qapplied [-1] [-s] [PATCH]"
+msgstr "hg qapplied [-1] [-s] [RETTELSE]"
 
 msgid "use pull protocol to copy metadata"
 msgstr "brug træk-protokol til at kopiere metadata"
@@ -3238,17 +3315,17 b' msgstr "hg qpush [-f] [-l] [-a] [-m] [-n'
 msgid "refresh only files already in the patch and specified files"
 msgstr ""
 
-msgid "add/update \"From: <current user>\" in patch"
-msgstr "tilføj/opdater \"From: <aktuel bruger>\" i rettelsen"
-
-msgid "add/update \"From: <given user>\" in patch"
-msgstr "tilføj/opdater \"From: <given bruger>\" i rettelsen"
-
-msgid "update \"Date: <current date>\" in patch (if present)"
-msgstr "opdater \"Date: <aktuel dato>\" i rettelsen (hvis tilstede)"
-
-msgid "update \"Date: <given date>\" in patch (if present)"
-msgstr "opdater \"Date: <given dato>\" i rettelsen (hvis tilstede)"
+msgid "add/update author field in patch with current user"
+msgstr ""
+
+msgid "add/update author field in patch with given user"
+msgstr ""
+
+msgid "add/update date field in patch with current date"
+msgstr "tilføj/opdater datofeltet i rettelsen med den aktuelle dato"
+
+msgid "add/update date field in patch with given date"
+msgstr "tilføj/opdater datofeltet i rettelsen med den angivne dato"
 
 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
 msgstr "hg qrefresh [-I] [-X] [-e] [-m TEKST] [-l FIL] [-s] [FIL]..."
@@ -3316,8 +3393,11 b' msgstr "hg strip [-f] [-b] [-n] REV"'
 msgid "hg qtop [-s]"
 msgstr "hg qtop [-s]"
 
-msgid "hg qunapplied [-s] [PATCH]"
-msgstr "hg qunapplied [-s] [RETTELSE]"
+msgid "show only the first patch"
+msgstr "vis kun den første rettelse"
+
+msgid "hg qunapplied [-1] [-s] [PATCH]"
+msgstr "hg qunapplied [-1] [-s] [RETTELSE]"
 
 msgid "finish all applied changesets"
 msgstr "afslut alle anvendte ændringer"
@@ -3328,65 +3408,66 b' msgstr "hg qfinish [-a] [REV]..."'
 msgid ""
 "hooks for sending email notifications at commit/push time\n"
 "\n"
-"Subscriptions can be managed through hgrc. Default mode is to print\n"
-"messages to stdout, for testing and configuring.\n"
-"\n"
-"To use, configure notify extension and enable in hgrc like this:\n"
-"\n"
-"   [extensions]\n"
-"   hgext.notify =\n"
-"\n"
-"   [hooks]\n"
-"   # one email for each incoming changeset\n"
-"   incoming.notify = python:hgext.notify.hook\n"
-"   # batch emails when many changesets incoming at one time\n"
-"   changegroup.notify = python:hgext.notify.hook\n"
-"\n"
-"   [notify]\n"
-"   # config items go in here\n"
-"\n"
-" config items:\n"
-"\n"
-" REQUIRED:\n"
-"   config = /path/to/file # file containing subscriptions\n"
-"\n"
-" OPTIONAL:\n"
-"   test = True            # print messages to stdout for testing\n"
-"   strip = 3              # number of slashes to strip for url paths\n"
-"   domain = example.com   # domain to use if committer missing domain\n"
-"   style = ...            # style file to use when formatting email\n"
-"   template = ...         # template to use when formatting email\n"
-"   incoming = ...         # template to use when run as incoming hook\n"
-"   changegroup = ...      # template when run as changegroup hook\n"
-"   maxdiff = 300          # max lines of diffs to include (0=none, -1=all)\n"
-"   maxsubject = 67        # truncate subject line longer than this\n"
-"   diffstat = True        # add a diffstat before the diff content\n"
-"   sources = serve        # notify if source of incoming changes in this "
+"Subscriptions can be managed through a hgrc file. Default mode is to\n"
+"print messages to stdout, for testing and configuring.\n"
+"\n"
+"To use, configure the notify extension and enable it in hgrc like\n"
+"this::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.notify =\n"
+"\n"
+"  [hooks]\n"
+"  # one email for each incoming changeset\n"
+"  incoming.notify = python:hgext.notify.hook\n"
+"  # batch emails when many changesets incoming at one time\n"
+"  changegroup.notify = python:hgext.notify.hook\n"
+"\n"
+"  [notify]\n"
+"  # config items go here\n"
+"\n"
+"Required configuration items::\n"
+"\n"
+"  config = /path/to/file # file containing subscriptions\n"
+"\n"
+"Optional configuration items::\n"
+"\n"
+"  test = True            # print messages to stdout for testing\n"
+"  strip = 3              # number of slashes to strip for url paths\n"
+"  domain = example.com   # domain to use if committer missing domain\n"
+"  style = ...            # style file to use when formatting email\n"
+"  template = ...         # template to use when formatting email\n"
+"  incoming = ...         # template to use when run as incoming hook\n"
+"  changegroup = ...      # template when run as changegroup hook\n"
+"  maxdiff = 300          # max lines of diffs to include (0=none, -1=all)\n"
+"  maxsubject = 67        # truncate subject line longer than this\n"
+"  diffstat = True        # add a diffstat before the diff content\n"
+"  sources = serve        # notify if source of incoming changes in this "
 "list\n"
-"                          # (serve == ssh or http, push, pull, bundle)\n"
-"   [email]\n"
-"   from = [e-mail]   # email address to send as if none given\n"
-"   [web]\n"
-"   baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
-"\n"
-" notify config file has same format as regular hgrc. it has two\n"
-" sections so you can express subscriptions in whatever way is handier\n"
-" for you.\n"
-"\n"
-"   [usersubs]\n"
-"   # key is subscriber email, value is \",\"-separated list of glob "
-"patterns\n"
-"   user@host = pattern\n"
-"\n"
-"   [reposubs]\n"
-"   # key is glob pattern, value is \",\"-separated list of subscriber "
-"emails\n"
-"   pattern = user@host\n"
-"\n"
-" glob patterns are matched against path to repository root.\n"
-"\n"
-" if you like, you can put notify config file in repository that users\n"
-" can push changes to, they can manage their own subscriptions."
+"                         # (serve == ssh or http, push, pull, bundle)\n"
+"  [email]\n"
+"  from = [e-mail]   # email address to send as if none given\n"
+"  [web]\n"
+"  baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
+"\n"
+"The notify config file has same format as a regular hgrc file. It has\n"
+"two sections so you can express subscriptions in whatever way is\n"
+"handier for you.\n"
+"\n"
+"::\n"
+"\n"
+"  [usersubs]\n"
+"  # key is subscriber email, value is \",\"-separated list of glob patterns\n"
+"  user@host = pattern\n"
+"\n"
+"  [reposubs]\n"
+"  # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
+"  pattern = user@host\n"
+"\n"
+"Glob patterns are matched against path to repository root.\n"
+"\n"
+"If you like, you can put notify config file in repository that users\n"
+"can push changes to, they can manage their own subscriptions.\n"
 msgstr ""
 
 #, python-format
@@ -3422,7 +3503,7 b' msgstr "notify: \xc3\xa6ndringer har kilde \\"%s\\" - springer over\\n"'
 msgid ""
 "browse command output with an external pager\n"
 "\n"
-"To set the pager that should be used, set the application variable:\n"
+"To set the pager that should be used, set the application variable::\n"
 "\n"
 "  [pager]\n"
 "  pager = LESS='FSRX' less\n"
@@ -3431,19 +3512,19 b' msgid ""'
 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
 "\n"
 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
-"setting:\n"
+"setting::\n"
 "\n"
 "  [pager]\n"
 "  quiet = True\n"
 "\n"
 "You can disable the pager for certain commands by adding them to the\n"
-"pager.ignore list:\n"
+"pager.ignore list::\n"
 "\n"
 "  [pager]\n"
 "  ignore = version, help, update\n"
 "\n"
 "You can also enable the pager only for certain commands using\n"
-"pager.attend:\n"
+"pager.attend::\n"
 "\n"
 "  [pager]\n"
 "  attend = log\n"
@@ -3460,15 +3541,15 b' msgid ""'
 "This extension allows you to use git-style suffixes to refer to the\n"
 "ancestors of a specific revision.\n"
 "\n"
-"For example, if you can refer to a revision as \"foo\", then:\n"
-"\n"
-"- foo^N = Nth parent of foo\n"
+"For example, if you can refer to a revision as \"foo\", then::\n"
+"\n"
+"  foo^N = Nth parent of foo\n"
 "  foo^0 = foo\n"
 "  foo^1 = first parent of foo\n"
 "  foo^2 = second parent of foo\n"
 "  foo^  = foo^1\n"
 "\n"
-"- foo~N = Nth first grandparent of foo\n"
+"  foo~N = Nth first grandparent of foo\n"
 "  foo~0 = foo\n"
 "  foo~1 = foo^1 = foo^ = first parent of foo\n"
 "  foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
@@ -3484,11 +3565,9 b' msgid ""'
 "first line of the changeset description as the subject text. The\n"
 "message contains two or three body parts:\n"
 "\n"
-"  The changeset description.\n"
-"\n"
-"  [Optional] The result of running diffstat on the patch.\n"
-"\n"
-"  The patch itself, as generated by \"hg export\".\n"
+"- The changeset description.\n"
+"- [Optional] The result of running diffstat on the patch.\n"
+"- The patch itself, as generated by \"hg export\".\n"
 "\n"
 "Each message refers to the first in the series using the In-Reply-To\n"
 "and References headers, so they will show up as a sequence in threaded\n"
@@ -3499,7 +3578,7 b' msgid ""'
 "you are sending the right changes.\n"
 "\n"
 "To configure other defaults, add a section like this to your hgrc\n"
-"file:\n"
+"file::\n"
 "\n"
 "  [email]\n"
 "  from = My Name <my@email>\n"
@@ -3522,13 +3601,13 b' msgid ""'
 "patchbomb message in a pager or sending the messages directly, it will\n"
 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
 "can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt:\n"
+"files, e.g. with mutt::\n"
 "\n"
 "  % mutt -R -f mbox\n"
 "\n"
-"When you are previewing the patchbomb messages, you can use `formail'\n"
+"When you are previewing the patchbomb messages, you can use ``formail``\n"
 "(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out:\n"
+"package), to send each message out::\n"
 "\n"
 "  % formail -s sendmail -bm -t < mbox\n"
 "\n"
@@ -3538,7 +3617,7 b' msgid ""'
 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
 "that the patchbomb extension can automatically send patchbombs\n"
 "directly from the commandline. See the [email] and [smtp] sections in\n"
-"hgrc(5) for details."
+"hgrc(5) for details.\n"
 msgstr ""
 
 msgid "Please enter a valid value.\n"
@@ -3578,23 +3657,24 b' msgid ""'
 "    single email containing a binary Mercurial bundle as an attachment\n"
 "    will be sent.\n"
 "\n"
-"    Examples:\n"
-"\n"
-"    hg email -r 3000          # send patch 3000 only\n"
-"    hg email -r 3000 -r 3001  # send patches 3000 and 3001\n"
-"    hg email -r 3000:3005     # send patches 3000 through 3005\n"
-"    hg email 3000             # send patch 3000 (deprecated)\n"
-"\n"
-"    hg email -o               # send all patches not in default\n"
-"    hg email -o DEST          # send all patches not in DEST\n"
-"    hg email -o -r 3000       # send all ancestors of 3000 not in default\n"
-"    hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST\n"
-"\n"
-"    hg email -b               # send bundle of all patches not in default\n"
-"    hg email -b DEST          # send bundle of all patches not in DEST\n"
-"    hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
+"    Examples::\n"
+"\n"
+"      hg email -r 3000          # send patch 3000 only\n"
+"      hg email -r 3000 -r 3001  # send patches 3000 and 3001\n"
+"      hg email -r 3000:3005     # send patches 3000 through 3005\n"
+"      hg email 3000             # send patch 3000 (deprecated)\n"
+"\n"
+"      hg email -o               # send all patches not in default\n"
+"      hg email -o DEST          # send all patches not in DEST\n"
+"      hg email -o -r 3000       # send all ancestors of 3000 not in default\n"
+"      hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST\n"
+"\n"
+"      hg email -b               # send bundle of all patches not in default\n"
+"      hg email -b DEST          # send bundle of all patches not in DEST\n"
+"      hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
 "default\n"
-"    hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST\n"
+"      hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in "
+"DEST\n"
 "\n"
 "    Before using this command, you will need to enable email in your\n"
 "    hgrc. See the [email] section in hgrc(5) for details.\n"
@@ -3673,6 +3753,9 b' msgstr ""'
 msgid "message identifier to reply to"
 msgstr ""
 
+msgid "flags to add in subject prefixes"
+msgstr ""
+
 msgid "email addresses of recipients"
 msgstr ""
 
@@ -3713,13 +3796,16 b' msgid ""'
 "    and uncommitted changes in an otherwise-clean source tree.\n"
 "\n"
 "    This means that purge will delete:\n"
-"     - Unknown files: files marked with \"?\" by \"hg status\"\n"
-"     - Empty directories: in fact Mercurial ignores directories unless\n"
-"       they contain files under source control management\n"
+"\n"
+"    - Unknown files: files marked with \"?\" by \"hg status\"\n"
+"    - Empty directories: in fact Mercurial ignores directories unless\n"
+"      they contain files under source control management\n"
+"\n"
 "    But it will leave untouched:\n"
-"     - Modified and unmodified tracked files\n"
-"     - Ignored files (unless --all is specified)\n"
-"     - New files added to the repository (with \"hg add\")\n"
+"\n"
+"    - Modified and unmodified tracked files\n"
+"    - Ignored files (unless --all is specified)\n"
+"    - New files added to the repository (with \"hg add\")\n"
 "\n"
 "    If directories are given on the command line, only files in these\n"
 "    directories are considered.\n"
@@ -3769,7 +3855,7 b' msgid ""'
 "repository.\n"
 "\n"
 "For more information:\n"
-"http://mercurial.selenic.com/wiki/RebaseProject\n"
+"http://mercurial.selenic.com/wiki/RebaseExtension\n"
 msgstr ""
 
 msgid "first revision, do not change ancestor\n"
@@ -3980,30 +4066,9 b' msgstr ""'
 msgid "&?"
 msgstr ""
 
-msgid "y"
-msgstr ""
-
-msgid "?"
-msgstr ""
-
 msgid "y - record this change"
 msgstr ""
 
-msgid "s"
-msgstr ""
-
-msgid "f"
-msgstr ""
-
-msgid "d"
-msgstr ""
-
-msgid "a"
-msgstr ""
-
-msgid "q"
-msgstr ""
-
 msgid "user quit"
 msgstr "user quit"
 
@@ -4014,6 +4079,9 b' msgstr "unders\xc3\xb8g \xc3\xa6ndringer i %s?"'
 msgid " and "
 msgstr " og "
 
+msgid "y"
+msgstr ""
+
 #, python-format
 msgid "record this change to %r?"
 msgstr "optag denne ændring i %r?"
@@ -4033,19 +4101,19 b' msgid ""'
 "    You will be prompted for whether to record changes to each\n"
 "    modified file, and for files with multiple changes, for each\n"
 "    change to use. For each query, the following responses are\n"
-"    possible:\n"
-"\n"
-"    y - record this change\n"
-"    n - skip this change\n"
-"\n"
-"    s - skip remaining changes to this file\n"
-"    f - record remaining changes to this file\n"
-"\n"
-"    d - done, skip remaining changes and files\n"
-"    a - record all changes to all remaining files\n"
-"    q - quit, recording no changes\n"
-"\n"
-"    ? - display help"
+"    possible::\n"
+"\n"
+"      y - record this change\n"
+"      n - skip this change\n"
+"\n"
+"      s - skip remaining changes to this file\n"
+"      f - record remaining changes to this file\n"
+"\n"
+"      d - done, skip remaining changes and files\n"
+"      a - record all changes to all remaining files\n"
+"      q - quit, recording no changes\n"
+"\n"
+"      ? - display help"
 msgstr ""
 
 msgid "'mq' extension not loaded"
@@ -4161,9 +4229,9 b' msgid ""'
 "\n"
 "    Selected changesets will be applied on top of the current working\n"
 "    directory with the log of the original changeset. If --log is\n"
-"    specified, log messages will have a comment appended of the form:\n"
-"\n"
-"    (transplanted from CHANGESETHASH)\n"
+"    specified, log messages will have a comment appended of the form::\n"
+"\n"
+"      (transplanted from CHANGESETHASH)\n"
 "\n"
 "    You can rewrite the changelog message with the --filter option.\n"
 "    Its argument will be invoked with the current changelog message as\n"
@@ -4254,19 +4322,22 b' msgid ""'
 "operation.\n"
 "\n"
 "This extension is useful for:\n"
-" * Japanese Windows users using shift_jis encoding.\n"
-" * Chinese Windows users using big5 encoding.\n"
-" * All users who use a repository with one of problematic encodings on\n"
-"   case-insensitive file system.\n"
+"\n"
+"- Japanese Windows users using shift_jis encoding.\n"
+"- Chinese Windows users using big5 encoding.\n"
+"- All users who use a repository with one of problematic encodings on\n"
+"  case-insensitive file system.\n"
 "\n"
 "This extension is not needed for:\n"
-" * Any user who use only ASCII chars in path.\n"
-" * Any user who do not use any of problematic encodings.\n"
+"\n"
+"- Any user who use only ASCII chars in path.\n"
+"- Any user who do not use any of problematic encodings.\n"
 "\n"
 "Note that there are some limitations on using this extension:\n"
-" * You should use single encoding in one repository.\n"
-" * You should set same encoding for the repository by locale or\n"
-"   HGENCODING.\n"
+"\n"
+"- You should use single encoding in one repository.\n"
+"- You should set same encoding for the repository by locale or\n"
+"  HGENCODING.\n"
 "\n"
 "Path encoding conversion are done between Unicode and\n"
 "encoding.encoding which is decided by Mercurial from current locale\n"
@@ -4287,31 +4358,31 b' msgstr ""'
 msgid ""
 "perform automatic newline conversion\n"
 "\n"
-"To perform automatic newline conversion, use:\n"
-"\n"
-"[extensions]\n"
-"hgext.win32text =\n"
-"[encode]\n"
-"** = cleverencode:\n"
-"# or ** = macencode:\n"
-"\n"
-"[decode]\n"
-"** = cleverdecode:\n"
-"# or ** = macdecode:\n"
+"To perform automatic newline conversion, use::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.win32text =\n"
+"  [encode]\n"
+"  ** = cleverencode:\n"
+"  # or ** = macencode:\n"
+"\n"
+"  [decode]\n"
+"  ** = cleverdecode:\n"
+"  # or ** = macdecode:\n"
 "\n"
 "If not doing conversion, to make sure you do not commit CRLF/CR by "
-"accident:\n"
-"\n"
-"[hooks]\n"
-"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
+"accident::\n"
+"\n"
+"  [hooks]\n"
+"  pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
+"  # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
 "\n"
 "To do the same check on a server to prevent CRLF/CR from being\n"
-"pushed or pulled:\n"
-"\n"
-"[hooks]\n"
-"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
+"pushed or pulled::\n"
+"\n"
+"  [hooks]\n"
+"  pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
+"  # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
 msgstr ""
 
 #, python-format
@@ -4357,15 +4428,15 b' msgid ""'
 "without knowing their actual IP address.\n"
 "\n"
 "To allow other people to discover your repository using run \"hg serve\"\n"
-"in your repository.\n"
-"\n"
-" $ cd test\n"
-" $ hg serve\n"
-"\n"
-"You can discover zeroconf enabled repositories by running \"hg paths\".\n"
-"\n"
-" $ hg paths\n"
-" zc-test = http://example.com:8000/test\n"
+"in your repository::\n"
+"\n"
+"  $ cd test\n"
+"  $ hg serve\n"
+"\n"
+"You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
+"\n"
+"  $ hg paths\n"
+"  zc-test = http://example.com:8000/test\n"
 msgstr ""
 
 msgid "archive prefix contains illegal components"
@@ -4660,11 +4731,11 b' msgid ""'
 "    commit.\n"
 "\n"
 "    Use the -s/--similarity option to detect renamed files. With a\n"
-"    parameter > 0, this compares every removed file with every added\n"
-"    file and records those similar enough as renames. This option\n"
-"    takes a percentage between 0 (disabled) and 100 (files must be\n"
-"    identical) as its parameter. Detecting renamed files this way can\n"
-"    be expensive.\n"
+"    parameter greater than 0, this compares every removed file with\n"
+"    every added file and records those similar enough as renames. This\n"
+"    option takes a percentage between 0 (disabled) and 100 (files must\n"
+"    be identical) as its parameter. Detecting renamed files this way\n"
+"    can be expensive.\n"
 "    "
 msgstr ""
 "tilføj alle nye filer, fjern alle manglende filer\n"
@@ -4735,14 +4806,14 b' msgid ""'
 "    directory; use -r/--rev to specify a different revision.\n"
 "\n"
 "    To specify the type of archive to create, use -t/--type. Valid\n"
-"    types are:\n"
-"\n"
-"    \"files\" (default): a directory full of files\n"
-"    \"tar\": tar archive, uncompressed\n"
-"    \"tbz2\": tar archive, compressed using bzip2\n"
-"    \"tgz\": tar archive, compressed using gzip\n"
-"    \"uzip\": zip archive, uncompressed\n"
-"    \"zip\": zip archive, compressed using deflate\n"
+"    types are::\n"
+"\n"
+"      \"files\" (default): a directory full of files\n"
+"      \"tar\": tar archive, uncompressed\n"
+"      \"tbz2\": tar archive, compressed using bzip2\n"
+"      \"tgz\": tar archive, compressed using gzip\n"
+"      \"uzip\": zip archive, uncompressed\n"
+"      \"zip\": zip archive, compressed using deflate\n"
 "\n"
 "    The exact name of the destination archive or directory is given\n"
 "    using a format string; see 'hg help export' for details.\n"
@@ -4904,8 +4975,8 b' msgid "Changeset %d:%s: %s\\n"'
 msgstr "Ændring %d:%s: %s\n"
 
 #, python-format
-msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
-msgstr "Tester ændring %s:%s (%s ændringer tilbage, ~%s test)\n"
+msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
+msgstr "Tester ændring %d:%s (%d ændringer tilbage, ~%d test)\n"
 
 msgid ""
 "set or show the current branch name\n"
@@ -5023,11 +5094,11 b' msgid ""'
 "\n"
 "    Output may be to a file, in which case the name of the file is\n"
 "    given using a format string. The formatting rules are the same as\n"
-"    for the export command, with the following additions:\n"
-"\n"
-"    %s   basename of file being printed\n"
-"    %d   dirname of file being printed, or '.' if in repository root\n"
-"    %p   root-relative path name of file being printed\n"
+"    for the export command, with the following additions::\n"
+"\n"
+"      %s   basename of file being printed\n"
+"      %d   dirname of file being printed, or '.' if in repository root\n"
+"      %p   root-relative path name of file being printed\n"
 "    "
 msgstr ""
 "udskriv den aktuelle eller en given revision af filer\n"
@@ -5039,12 +5110,12 b' msgstr ""'
 "\n"
 "    Output kan gemmes i en fil hvis navn angives med et formatstreng.\n"
 "    Reglerne for formatteringen er de samme som for export-kommandoen\n"
-"    med følgende tilføjelser:\n"
-"\n"
-"    %s   grundnavn for filen som udskrives\n"
-"    %d   katalognavn for filen som blvier udskrevet\n"
-"         eller '.' hvis filen er i katalogets rod\n"
-"    %p   rod-relativ sti for filen som bliver udkrevet\n"
+"    med følgende tilføjelser::\n"
+"\n"
+"      %s   grundnavn for filen som udskrives\n"
+"      %d   katalognavn for filen som blvier udskrevet\n"
+"           eller '.' hvis filen er i katalogets rod\n"
+"      %p   rod-relativ sti for filen som bliver udkrevet\n"
 "    "
 
 msgid ""
@@ -5082,7 +5153,7 b' msgid ""'
 "    avoid hardlinking.\n"
 "\n"
 "    In some cases, you can clone repositories and checked out files\n"
-"    using full hardlinks with\n"
+"    using full hardlinks with ::\n"
 "\n"
 "      $ cp -al REPO REPOCLONE\n"
 "\n"
@@ -5092,7 +5163,6 b' msgid ""'
 "    breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
 "    this is not compatible with certain extensions that place their\n"
 "    metadata under the .hg directory, such as mq.\n"
-"\n"
 "    "
 msgstr ""
 "lav en kopi af et eksisterende depot\n"
@@ -5129,7 +5199,7 b' msgstr ""'
 "    men rapporterer ingen fejl. I disse tilfælde skal --pull bruges\n"
 "    for at undgå hårde lænker.\n"
 "\n"
-"    I nogle tilfælde kan man klone depoter og udhentede filer med\n"
+"    I nogle tilfælde kan man klone depoter og udhentede filer med ::\n"
 "\n"
 "      $ cp -al DEPOT DEPOTKLON\n"
 "\n"
@@ -5140,7 +5210,6 b' msgstr ""'
 "    Linux Kernel værktøjer gør det). Dette er desuden ikke kompatibelt\n"
 "    med visse udvidelser som placerer deres metadata under .hg mappen,\n"
 "    såsom mq.\n"
-"\n"
 "    "
 
 msgid ""
@@ -5442,16 +5511,16 b' msgid ""'
 "    first parent only.\n"
 "\n"
 "    Output may be to a file, in which case the name of the file is\n"
-"    given using a format string. The formatting rules are as follows:\n"
-"\n"
-"    %%   literal \"%\" character\n"
-"    %H   changeset hash (40 bytes of hexadecimal)\n"
-"    %N   number of patches being generated\n"
-"    %R   changeset revision number\n"
-"    %b   basename of the exporting repository\n"
-"    %h   short-form changeset hash (12 bytes of hexadecimal)\n"
-"    %n   zero-padded sequence number, starting at 1\n"
-"    %r   zero-padded changeset revision number\n"
+"    given using a format string. The formatting rules are as follows::\n"
+"\n"
+"      %%   literal \"%\" character\n"
+"      %H   changeset hash (40 bytes of hexadecimal)\n"
+"      %N   number of patches being generated\n"
+"      %R   changeset revision number\n"
+"      %b   basename of the exporting repository\n"
+"      %h   short-form changeset hash (12 bytes of hexadecimal)\n"
+"      %n   zero-padded sequence number, starting at 1\n"
+"      %r   zero-padded changeset revision number\n"
 "\n"
 "    Without the -a/--text option, export will avoid generating diffs\n"
 "    of files it detects as binary. With -a, export will generate a\n"
@@ -5477,16 +5546,16 b' msgstr ""'
 "    sammenføjningsændringen med dennes første forælder.\n"
 "\n"
 "    Uddata kan gemmes i en fil, og filnavnet er givet ved en\n"
-"    format-streng. Formatteringsreglerne er som følger:\n"
-"\n"
-"    %%   litteral % tegn\n"
-"    %H   ændringshash (40 byte heksadecimal)\n"
-"    %N   antallet af rettelser som bliver genereret\n"
-"    %R   revisionnummer for ændringen\n"
-"    %b   grundnavn for det eksporterede depot\n"
-"    %h   kortform ændringshash (12 byte heksadecimal)\n"
-"    %n   nul-fyldt sekvensnummer, startende ved 1\n"
-"    %r   nul-fyldt revisionsnummer for ændringen\n"
+"    format-streng. Formatteringsreglerne er som følger::\n"
+"\n"
+"      %%   litteral % tegn\n"
+"      %H   ændringshash (40 byte heksadecimal)\n"
+"      %N   antallet af rettelser som bliver genereret\n"
+"      %R   revisionnummer for ændringen\n"
+"      %b   grundnavn for det eksporterede depot\n"
+"      %h   kortform ændringshash (12 byte heksadecimal)\n"
+"      %n   nul-fyldt sekvensnummer, startende ved 1\n"
+"      %r   nul-fyldt revisionsnummer for ændringen\n"
 "\n"
 "    Uden -a/--text tilvalget vil annotate undgå at behandle filer som\n"
 "    den detekterer som binære. Med -a vil annotate generere en\n"
@@ -5664,8 +5733,12 b' msgid "no help text available"'
 msgstr "ingen hjælpetekst tilgængelig"
 
 #, python-format
-msgid "%s extension - %s\n"
-msgstr "%s udvidelse - %s\n"
+msgid ""
+"%s extension - %s\n"
+"\n"
+msgstr ""
+"%s udvidelse - %s\n"
+"\n"
 
 msgid "Mercurial Distributed SCM\n"
 msgstr "Mercurial Distribueret SCM\n"
@@ -6109,15 +6182,15 b' msgid ""'
 "\n"
 "    The following table details the behavior of remove for different\n"
 "    file states (columns) and option combinations (rows). The file\n"
-"    states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
-"    (as reported by hg status). The actions are Warn, Remove (from\n"
-"    branch) and Delete (from disk).\n"
-"\n"
-"           A  C  M  !\n"
-"    none   W  RD W  R\n"
-"    -f     R  RD RD R\n"
-"    -A     W  W  W  R\n"
-"    -Af    R  R  R  R\n"
+"    states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
+"    reported by hg status). The actions are Warn, Remove (from branch)\n"
+"    and Delete (from disk)::\n"
+"\n"
+"             A  C  M  !\n"
+"      none   W  RD W  R\n"
+"      -f     R  RD RD R\n"
+"      -A     W  W  W  R\n"
+"      -Af    R  R  R  R\n"
 "\n"
 "    This command schedules the files to be removed at the next commit.\n"
 "    To undo a remove before that, see hg revert.\n"
@@ -6137,13 +6210,13 b' msgstr ""'
 "    filtilstande (søjler) og kombinationer af tilvalg (rækker). Mulige\n"
 "    filtilstande er tilføjet [A], ren [C], ændret [M] og manglende [!]\n"
 "    (som rapporteret af hg status). Handlingerne er Warn, Remove (fra\n"
-"    gren) og Delete (fra disk).\n"
-"\n"
-"           A  C  M  !\n"
-"    none   W  RD W  R\n"
-"    -f     R  RD RD R\n"
-"    -A     W  W  W  R\n"
-"    -Af    R  R  R  R\n"
+"    gren) og Delete (fra disk)::\n"
+"\n"
+"             A  C  M  !\n"
+"      none   W  RD W  R\n"
+"      -f     R  RD RD R\n"
+"      -A     W  W  W  R\n"
+"      -Af    R  R  R  R\n"
 "\n"
 "    Denne kommando planlægger filerne til at blive fjernet ved næste\n"
 "    deponering. For at omgøre en fjernelse før det, se hg revert.\n"
@@ -6197,9 +6270,10 b' msgid ""'
 "    indicating whether or not files are resolved. All files must be\n"
 "    marked as resolved before a commit is permitted.\n"
 "\n"
-"    The codes used to show the status of files are:\n"
-"    U = unresolved\n"
-"    R = resolved\n"
+"    The codes used to show the status of files are::\n"
+"\n"
+"      U = unresolved\n"
+"      R = resolved\n"
 "    "
 msgstr ""
 
@@ -6293,7 +6367,7 b' msgid ""'
 "    Transactions are used to encapsulate the effects of all commands\n"
 "    that create new changesets or propagate existing changesets into a\n"
 "    repository. For example, the following commands are transactional,\n"
-"    and their effects can be rolled back:\n"
+"    and their effects can be rolled back::\n"
 "\n"
 "      commit\n"
 "      import\n"
@@ -6362,15 +6436,16 b' msgid ""'
 "    If two revisions are given, the differences between them are\n"
 "    shown.\n"
 "\n"
-"    The codes used to show the status of files are:\n"
-"    M = modified\n"
-"    A = added\n"
-"    R = removed\n"
-"    C = clean\n"
-"    ! = missing (deleted by non-hg command, but still tracked)\n"
-"    ? = not tracked\n"
-"    I = ignored\n"
-"      = origin of the previous file listed as A (added)\n"
+"    The codes used to show the status of files are::\n"
+"\n"
+"      M = modified\n"
+"      A = added\n"
+"      R = removed\n"
+"      C = clean\n"
+"      ! = missing (deleted by non-hg command, but still tracked)\n"
+"      ? = not tracked\n"
+"      I = ignored\n"
+"        = origin of the previous file listed as A (added)\n"
 "    "
 msgstr ""
 "vis ændrede filer i arbejdskataloget\n"
@@ -6395,15 +6470,16 b' msgstr ""'
 "    Hvis der angivet en revision bruges denne som en basisrevision.\n"
 "    Hvis der angives to revisioner, da vises forskellene mellem dem.\n"
 "\n"
-"    Koderne som bruges til at vise status for filerne er:\n"
-"    M = ændret\n"
-"    A = tilføjet\n"
-"    R = fjernet\n"
-"    C = ren\n"
-"    ! = mangler (slettet af en ikke-hg kommando, men følges stadig)\n"
-"    ? = følges ikke\n"
-"    I = ignoreret\n"
-"      = den foregående fil markeret som A (tilføjet) stammer herfra\n"
+"    Koderne som bruges til at vise status for filerne er::\n"
+"\n"
+"      M = ændret\n"
+"      A = tilføjet\n"
+"      R = fjernet\n"
+"      C = ren\n"
+"      ! = mangler (slettet af en ikke-hg kommando, men følges stadig)\n"
+"      ? = følges ikke\n"
+"      I = ignoreret\n"
+"        = den foregående fil markeret som A (tilføjet) stammer herfra\n"
 "    "
 
 msgid ""
@@ -7518,9 +7594,6 b' msgstr ""'
 msgid "&Other"
 msgstr ""
 
-msgid "l"
-msgstr "l"
-
 #, python-format
 msgid "merging %s and %s to %s\n"
 msgstr "føjer %s og %s sammen til %s\n"
@@ -7548,9 +7621,6 b' msgstr ""'
 msgid "&Yes"
 msgstr ""
 
-msgid "n"
-msgstr ""
-
 #, python-format
 msgid "merging %s failed!\n"
 msgstr "sammenføjning af %s fejlede!\n"
@@ -7571,27 +7641,27 b' msgid ""'
 "    implement hooks.\n"
 "\n"
 "    Extensions are not loaded by default for a variety of reasons:\n"
-"    they can increase startup overhead; they may be meant for\n"
-"    advanced usage only; they may provide potentially dangerous\n"
-"    abilities (such as letting you destroy or modify history); they\n"
-"    might not be ready for prime time; or they may alter some\n"
-"    usual behaviors of stock Mercurial. It is thus up to the user to\n"
-"    activate extensions as needed.\n"
-"\n"
-"    To enable the \"foo\" extension, either shipped with Mercurial\n"
-"    or in the Python search path, create an entry for it in your\n"
-"    hgrc, like this:\n"
+"    they can increase startup overhead; they may be meant for advanced\n"
+"    usage only; they may provide potentially dangerous abilities (such\n"
+"    as letting you destroy or modify history); they might not be ready\n"
+"    for prime time; or they may alter some usual behaviors of stock\n"
+"    Mercurial. It is thus up to the user to activate extensions as\n"
+"    needed.\n"
+"\n"
+"    To enable the \"foo\" extension, either shipped with Mercurial or in\n"
+"    the Python search path, create an entry for it in your hgrc, like\n"
+"    this::\n"
 "\n"
 "      [extensions]\n"
 "      foo =\n"
 "\n"
-"    You may also specify the full path to an extension:\n"
+"    You may also specify the full path to an extension::\n"
 "\n"
 "      [extensions]\n"
 "      myfeature = ~/.hgext/myfeature.py\n"
 "\n"
 "    To explicitly disable an extension enabled in an hgrc of broader\n"
-"    scope, prepend its path with !:\n"
+"    scope, prepend its path with !::\n"
 "\n"
 "      [extensions]\n"
 "      # disabling extension bar residing in /path/to/extension/bar.py\n"
@@ -7610,78 +7680,80 b' msgstr "Datoformater"'
 msgid ""
 "\n"
 "    Some commands allow the user to specify a date, e.g.:\n"
-"    * backout, commit, import, tag: Specify the commit date.\n"
-"    * log, revert, update: Select revision(s) by date.\n"
-"\n"
-"    Many date formats are valid. Here are some examples:\n"
-"\n"
-"    \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-"    \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-"    \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-"    \"Dec 6\" (midnight)\n"
-"    \"13:18\" (today assumed)\n"
-"    \"3:39\" (3:39AM assumed)\n"
-"    \"3:39pm\" (15:39)\n"
-"    \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-"    \"2006-12-6 13:18\"\n"
-"    \"2006-12-6\"\n"
-"    \"12-6\"\n"
-"    \"12/6\"\n"
-"    \"12/6/6\" (Dec 6 2006)\n"
-"\n"
-"    Lastly, there is Mercurial's internal format:\n"
-"\n"
-"    \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
+"\n"
+"    - backout, commit, import, tag: Specify the commit date.\n"
+"    - log, revert, update: Select revision(s) by date.\n"
+"\n"
+"    Many date formats are valid. Here are some examples::\n"
+"\n"
+"      \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
+"      \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
+"      \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
+"      \"Dec 6\" (midnight)\n"
+"      \"13:18\" (today assumed)\n"
+"      \"3:39\" (3:39AM assumed)\n"
+"      \"3:39pm\" (15:39)\n"
+"      \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+"      \"2006-12-6 13:18\"\n"
+"      \"2006-12-6\"\n"
+"      \"12-6\"\n"
+"      \"12/6\"\n"
+"      \"12/6/6\" (Dec 6 2006)\n"
+"\n"
+"    Lastly, there is Mercurial's internal format::\n"
+"\n"
+"      \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
 "\n"
 "    This is the internal representation format for dates. unixtime is\n"
 "    the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
 "    offset is the offset of the local timezone, in seconds west of UTC\n"
 "    (negative if the timezone is east of UTC).\n"
 "\n"
-"    The log command also accepts date ranges:\n"
-"\n"
-"    \"<{datetime}\" - at or before a given date/time\n"
-"    \">{datetime}\" - on or after a given date/time\n"
-"    \"{datetime} to {datetime}\" - a date range, inclusive\n"
-"    \"-{days}\" - within a given number of days of today\n"
+"    The log command also accepts date ranges::\n"
+"\n"
+"      \"<{datetime}\" - at or before a given date/time\n"
+"      \">{datetime}\" - on or after a given date/time\n"
+"      \"{datetime} to {datetime}\" - a date range, inclusive\n"
+"      \"-{days}\" - within a given number of days of today\n"
 "    "
 msgstr ""
 "\n"
 "    Nogle kommandoer tillader brugeren at specificere en dato, f.eks.:\n"
-"    * backout, commit, import, tag: specificer commit-datoen.\n"
-"    * log, revert, update: vælg revisioner efter dato.\n"
-"\n"
-"    Der er mange gyldige datoformater. Her er nogle eksempler:\n"
-"\n"
-"    \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n"
-"    \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n"
-"    \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n"
-"    \"Dec 6\" (midnat)\n"
-"    \"13:18\" (antager dags dato)\n"
-"    \"3:39\"\n"
-"    \"3:39pm\" (15:39)\n"
-"    \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-"    \"2006-12-6 13:18\"\n"
-"    \"2006-12-6\"\n"
-"    \"12-6\"\n"
-"    \"12/6\"\n"
-"    \"12/6/6\" (6. dec. 2006)\n"
-"\n"
-"    Endelig er der Mercurials interne format:\n"
-"\n"
-"    \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n"
+"\n"
+"    - backout, commit, import, tag: specificer commit-datoen.\n"
+"    - log, revert, update: vælg revisioner efter dato.\n"
+"\n"
+"    Der er mange gyldige datoformater. Her er nogle eksempler::\n"
+"\n"
+"      \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n"
+"      \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n"
+"      \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n"
+"      \"Dec 6\" (midnat)\n"
+"      \"13:18\" (antager dags dato)\n"
+"      \"3:39\"\n"
+"      \"3:39pm\" (15:39)\n"
+"      \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+"      \"2006-12-6 13:18\"\n"
+"      \"2006-12-6\"\n"
+"      \"12-6\"\n"
+"      \"12/6\"\n"
+"      \"12/6/6\" (6. dec. 2006)\n"
+"\n"
+"    Endelig er der Mercurials interne format::\n"
+"\n"
+"      \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n"
 "\n"
 "    Dette er den interne repræsentation af datoer. unixtime er\n"
 "    antallet af sekunder siden begyndelsen af epoken (1970-01-01 00:00\n"
 "    UTC). offset er den lokale tidszone, angivet i antal sekunder vest\n"
 "    for UTC (negativ hvis tidszonen er øst for UTC).\n"
 "\n"
-"    Kommandoen log accepterer også datointervaller:\n"
-"\n"
-"    \"<{date}\" - på eller før den angivne dato/tidspunkt\n"
-"    \">{date}\" - på eller efter den angivne dato/tidspunkt\n"
-"    \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n"
-"    \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n"
+"    Kommandoen log accepterer også datointervaller::\n"
+"\n"
+"      \"<{date}\" - på eller før den angivne dato/tidspunkt\n"
+"      \">{date}\" - på eller efter den angivne dato/tidspunkt\n"
+"      \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n"
+"      \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n"
 "    "
 
 msgid "File Name Patterns"
@@ -7702,34 +7774,34 b' msgid ""'
 "    the current repository root.\n"
 "\n"
 "    To use an extended glob, start a name with \"glob:\". Globs are\n"
-"    rooted at the current directory; a glob such as \"*.c\" will only\n"
-"    match files in the current directory ending with \".c\".\n"
-"\n"
-"    The supported glob syntax extensions are \"**\" to match any string\n"
-"    across path separators and \"{a,b}\" to mean \"a or b\".\n"
+"    rooted at the current directory; a glob such as \"``*.c``\" will\n"
+"    only match files in the current directory ending with \".c\".\n"
+"\n"
+"    The supported glob syntax extensions are \"``**``\" to match any\n"
+"    string across path separators and \"{a,b}\" to mean \"a or b\".\n"
 "\n"
 "    To use a Perl/Python regular expression, start a name with \"re:\".\n"
 "    Regexp pattern matching is anchored at the root of the repository.\n"
 "\n"
-"    Plain examples:\n"
-"\n"
-"    path:foo/bar   a name bar in a directory named foo in the root of\n"
-"                   the repository\n"
-"    path:path:name a file or directory named \"path:name\"\n"
-"\n"
-"    Glob examples:\n"
-"\n"
-"    glob:*.c       any name ending in \".c\" in the current directory\n"
-"    *.c            any name ending in \".c\" in the current directory\n"
-"    **.c           any name ending in \".c\" in any subdirectory of the\n"
-"                   current directory including itself.\n"
-"    foo/*.c        any name ending in \".c\" in the directory foo\n"
-"    foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
-"                   including itself.\n"
-"\n"
-"    Regexp examples:\n"
-"\n"
-"    re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
+"    Plain examples::\n"
+"\n"
+"      path:foo/bar   a name bar in a directory named foo in the root\n"
+"                     of the repository\n"
+"      path:path:name a file or directory named \"path:name\"\n"
+"\n"
+"    Glob examples::\n"
+"\n"
+"      glob:*.c       any name ending in \".c\" in the current directory\n"
+"      *.c            any name ending in \".c\" in the current directory\n"
+"      **.c           any name ending in \".c\" in any subdirectory of the\n"
+"                     current directory including itself.\n"
+"      foo/*.c        any name ending in \".c\" in the directory foo\n"
+"      foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
+"                     including itself.\n"
+"\n"
+"    Regexp examples::\n"
+"\n"
+"      re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
 "\n"
 "    "
 msgstr ""
@@ -7739,25 +7811,25 b' msgstr "Milj\xc3\xb8variable"'
 
 msgid ""
 "\n"
-"HG::\n"
+"HG\n"
 "    Path to the 'hg' executable, automatically passed when running\n"
 "    hooks, extensions or external tools. If unset or empty, this is\n"
 "    the hg executable's name if it's frozen, or an executable named\n"
 "    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
 "    Windows) is searched.\n"
 "\n"
-"HGEDITOR::\n"
+"HGEDITOR\n"
 "    This is the name of the editor to run when committing. See EDITOR.\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
-"HGENCODING::\n"
+"HGENCODING\n"
 "    This overrides the default locale setting detected by Mercurial.\n"
 "    This setting is used to convert data including usernames,\n"
 "    changeset descriptions, tag names, and branches. This setting can\n"
 "    be overridden with the --encoding command-line option.\n"
 "\n"
-"HGENCODINGMODE::\n"
+"HGENCODINGMODE\n"
 "    This sets Mercurial's behavior for handling unknown characters\n"
 "    while transcoding user input. The default is \"strict\", which\n"
 "    causes Mercurial to abort if it can't map a character. Other\n"
@@ -7765,45 +7837,46 b' msgid ""'
 "    \"ignore\", which drops them. This setting can be overridden with\n"
 "    the --encodingmode command-line option.\n"
 "\n"
-"HGMERGE::\n"
+"HGMERGE\n"
 "    An executable to use for resolving merge conflicts. The program\n"
 "    will be executed with three arguments: local file, remote file,\n"
 "    ancestor file.\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
-"HGRCPATH::\n"
+"HGRCPATH\n"
 "    A list of files or directories to search for hgrc files. Item\n"
 "    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
 "    platform default search path is used. If empty, only the .hg/hgrc\n"
 "    from the current repository is read.\n"
 "\n"
 "    For each element in HGRCPATH:\n"
-"    * if it's a directory, all files ending with .rc are added\n"
-"    * otherwise, the file itself will be added\n"
-"\n"
-"HGUSER::\n"
+"\n"
+"    - if it's a directory, all files ending with .rc are added\n"
+"    - otherwise, the file itself will be added\n"
+"\n"
+"HGUSER\n"
 "    This is the string used as the author of a commit. If not set,\n"
 "    available values will be considered in this order:\n"
 "\n"
-"    * HGUSER (deprecated)\n"
-"    * hgrc files from the HGRCPATH\n"
-"    * EMAIL\n"
-"    * interactive prompt\n"
-"    * LOGNAME (with '@hostname' appended)\n"
+"    - HGUSER (deprecated)\n"
+"    - hgrc files from the HGRCPATH\n"
+"    - EMAIL\n"
+"    - interactive prompt\n"
+"    - LOGNAME (with '@hostname' appended)\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
-"EMAIL::\n"
+"EMAIL\n"
 "    May be used as the author of a commit; see HGUSER.\n"
 "\n"
-"LOGNAME::\n"
+"LOGNAME\n"
 "    May be used as the author of a commit; see HGUSER.\n"
 "\n"
-"VISUAL::\n"
+"VISUAL\n"
 "    This is the name of the editor to use when committing. See EDITOR.\n"
 "\n"
-"EDITOR::\n"
+"EDITOR\n"
 "    Sometimes Mercurial needs to open a text file in an editor for a\n"
 "    user to modify, for example when writing commit messages. The\n"
 "    editor it uses is determined by looking at the environment\n"
@@ -7811,7 +7884,7 b' msgid ""'
 "    non-empty one is chosen. If all of them are empty, the editor\n"
 "    defaults to 'vi'.\n"
 "\n"
-"PYTHONPATH::\n"
+"PYTHONPATH\n"
 "    This is used by Python to find imported modules and may need to be\n"
 "    set appropriately if this Mercurial is not installed system-wide.\n"
 "    "
@@ -7890,10 +7963,10 b' msgid ""'
 "    While this standard format is often enough, it does not encode the\n"
 "    following information:\n"
 "\n"
-"     - executable status and other permission bits\n"
-"     - copy or rename information\n"
-"     - changes in binary files\n"
-"     - creation or deletion of empty files\n"
+"    - executable status and other permission bits\n"
+"    - copy or rename information\n"
+"    - changes in binary files\n"
+"    - creation or deletion of empty files\n"
 "\n"
 "    Mercurial also supports the extended diff format from the git VCS\n"
 "    which addresses these limitations. The git diff format is not\n"
@@ -7931,12 +8004,12 b' msgid ""'
 "\n"
 "    Three styles are packaged with Mercurial: default (the style used\n"
 "    when no explicit preference is passed), compact and changelog.\n"
-"    Usage:\n"
+"    Usage::\n"
 "\n"
 "        $ hg log -r1 --style changelog\n"
 "\n"
 "    A template is a piece of text, with markup to invoke variable\n"
-"    expansion:\n"
+"    expansion::\n"
 "\n"
 "        $ hg log -r1 --template \"{node}\\n\"\n"
 "        b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
@@ -7945,84 +8018,93 b' msgid ""'
 "    keywords depends on the exact context of the templater. These\n"
 "    keywords are usually available for templating a log-like command:\n"
 "\n"
-"    - author: String. The unmodified author of the changeset.\n"
-"    - branches: String. The name of the branch on which the changeset\n"
-"          was committed. Will be empty if the branch name was default.\n"
-"    - date: Date information. The date when the changeset was committed.\n"
-"    - desc: String. The text of the changeset description.\n"
-"    - diffstat: String. Statistics of changes with the following\n"
-"          format: \"modified files: +added/-removed lines\"\n"
-"    - files: List of strings. All files modified, added, or removed by\n"
-"          this changeset.\n"
-"    - file_adds: List of strings. Files added by this changeset.\n"
-"    - file_mods: List of strings. Files modified by this changeset.\n"
-"    - file_dels: List of strings. Files removed by this changeset.\n"
-"    - node: String. The changeset identification hash, as a\n"
-"          40-character hexadecimal string.\n"
-"    - parents: List of strings. The parents of the changeset.\n"
-"    - rev: Integer. The repository-local changeset revision number.\n"
-"    - tags: List of strings. Any tags associated with the changeset.\n"
+"    :author:    String. The unmodified author of the changeset.\n"
+"    :branches:  String. The name of the branch on which the changeset\n"
+"                was committed. Will be empty if the branch name was\n"
+"                default.\n"
+"    :date:      Date information. The date when the changeset was\n"
+"                committed.\n"
+"    :desc:      String. The text of the changeset description.\n"
+"    :diffstat:  String. Statistics of changes with the following\n"
+"                format: \"modified files: +added/-removed lines\"\n"
+"    :files:     List of strings. All files modified, added, or removed\n"
+"                by this changeset.\n"
+"    :file_adds: List of strings. Files added by this changeset.\n"
+"    :file_mods: List of strings. Files modified by this changeset.\n"
+"    :file_dels: List of strings. Files removed by this changeset.\n"
+"    :node:      String. The changeset identification hash, as a\n"
+"                40-character hexadecimal string.\n"
+"    :parents:   List of strings. The parents of the changeset.\n"
+"    :rev:       Integer. The repository-local changeset revision\n"
+"                number.\n"
+"    :tags:      List of strings. Any tags associated with the\n"
+"                changeset.\n"
 "\n"
 "    The \"date\" keyword does not produce human-readable output. If you\n"
 "    want to use a date in your output, you can use a filter to process\n"
 "    it. Filters are functions which return a string based on the input\n"
 "    variable. You can also use a chain of filters to get the desired\n"
-"    output:\n"
+"    output::\n"
 "\n"
 "       $ hg tip --template \"{date|isodate}\\n\"\n"
 "       2008-08-21 18:22 +0000\n"
 "\n"
 "    List of filters:\n"
 "\n"
-"    - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-"          every line except the last.\n"
-"    - age: Date. Returns a human-readable date/time difference between\n"
-"          the given date/time and the current date/time.\n"
-"    - basename: Any text. Treats the text as a path, and returns the\n"
-"          last component of the path after splitting by the path\n"
-"          separator (ignoring trailing separators). For example,\n"
-"          \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
-"\".\n"
-"    - stripdir: Treat the text as path and strip a directory level, if\n"
-"          possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
-"    - date: Date. Returns a date in a Unix date format, including\n"
-"          the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
-"    - domain: Any text. Finds the first string that looks like an\n"
-"          email address, and extracts just the domain component.\n"
-"          Example: 'User <[e-mail]>' becomes 'example.com'.\n"
-"    - email: Any text. Extracts the first string that looks like an\n"
-"          email address. Example: 'User <[e-mail]>' becomes\n"
-"          '[e-mail]'.\n"
-"    - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
-"          \"<\" and \">\" with XML entities.\n"
-"    - fill68: Any text. Wraps the text to fit in 68 columns.\n"
-"    - fill76: Any text. Wraps the text to fit in 76 columns.\n"
-"    - firstline: Any text. Returns the first line of text.\n"
-"    - nonempty: Any text. Returns '(none)' if the string is empty.\n"
-"    - hgdate: Date. Returns the date as a pair of numbers:\n"
-"          \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
-"    - isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18\n"
-"          13:00 +0200\".\n"
-"    - isodatesec: Date. Returns the date in ISO 8601 format, including\n"
-"          seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
-"          rfc3339date filter.\n"
-"    - localdate: Date. Converts a date to local date.\n"
-"    - obfuscate: Any text. Returns the input text rendered as a\n"
-"          sequence of XML entities.\n"
-"    - person: Any text. Returns the text before an email address.\n"
-"    - rfc822date: Date. Returns a date using the same format used\n"
-"          in email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
-"    - rfc3339date: Date. Returns a date using the Internet date format\n"
-"          specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
-"    - short: Changeset hash. Returns the short form of a changeset\n"
-"          hash, i.e. a 12-byte hexadecimal string.\n"
-"    - shortdate: Date. Returns a date like \"2006-09-18\".\n"
-"    - strip: Any text. Strips all leading and trailing whitespace.\n"
-"    - tabindent: Any text. Returns the text, with every line except\n"
-"          the first starting with a tab character.\n"
-"    - urlescape: Any text. Escapes all \"special\" characters. For\n"
-"          example, \"foo bar\" becomes \"foo%20bar\".\n"
-"    - user: Any text. Returns the user portion of an email address.\n"
+"    :addbreaks:   Any text. Add an XHTML \"<br />\" tag before the end of\n"
+"                  every line except the last.\n"
+"    :age:         Date. Returns a human-readable date/time difference\n"
+"                  between the given date/time and the current\n"
+"                  date/time.\n"
+"    :basename:    Any text. Treats the text as a path, and returns the\n"
+"                  last component of the path after splitting by the\n"
+"                  path separator (ignoring trailing separators). For\n"
+"                  example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//"
+"\"\n"
+"                  becomes \"bar\".\n"
+"    :stripdir:    Treat the text as path and strip a directory level,\n"
+"                  if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
+"                  \"foo\".\n"
+"    :date:        Date. Returns a date in a Unix date format, including\n"
+"                  the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
+"    :domain:      Any text. Finds the first string that looks like an\n"
+"                  email address, and extracts just the domain\n"
+"                  component. Example: 'User <[e-mail]>' becomes\n"
+"                  'example.com'.\n"
+"    :email:       Any text. Extracts the first string that looks like\n"
+"                  an email address. Example: 'User <[e-mail]>'\n"
+"                  becomes '[e-mail]'.\n"
+"    :escape:      Any text. Replaces the special XML/XHTML characters\n"
+"                  \"&\", \"<\" and \">\" with XML entities.\n"
+"    :fill68:      Any text. Wraps the text to fit in 68 columns.\n"
+"    :fill76:      Any text. Wraps the text to fit in 76 columns.\n"
+"    :firstline:   Any text. Returns the first line of text.\n"
+"    :nonempty:    Any text. Returns '(none)' if the string is empty.\n"
+"    :hgdate:      Date. Returns the date as a pair of numbers:\n"
+"                  \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
+"    :isodate:     Date. Returns the date in ISO 8601 format:\n"
+"                  \"2009-08-18 13:00 +0200\".\n"
+"    :isodatesec:  Date. Returns the date in ISO 8601 format, including\n"
+"                  seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
+"                  rfc3339date filter.\n"
+"    :localdate:   Date. Converts a date to local date.\n"
+"    :obfuscate:   Any text. Returns the input text rendered as a\n"
+"                  sequence of XML entities.\n"
+"    :person:      Any text. Returns the text before an email address.\n"
+"    :rfc822date:  Date. Returns a date using the same format used in\n"
+"                  email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+"    :rfc3339date: Date. Returns a date using the Internet date format\n"
+"                  specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
+"    :short:       Changeset hash. Returns the short form of a changeset\n"
+"                  hash, i.e. a 12-byte hexadecimal string.\n"
+"    :shortdate:   Date. Returns a date like \"2006-09-18\".\n"
+"    :strip:       Any text. Strips all leading and trailing whitespace.\n"
+"    :tabindent:   Any text. Returns the text, with every line except\n"
+"                  the first starting with a tab character.\n"
+"    :urlescape:   Any text. Escapes all \"special\" characters. For\n"
+"                  example, \"foo bar\" becomes \"foo%20bar\".\n"
+"    :user:        Any text. Returns the user portion of an email\n"
+"                  address.\n"
 "    "
 msgstr ""
 
@@ -8031,7 +8113,7 b' msgstr "URL-stier"'
 
 msgid ""
 "\n"
-"    Valid URLs are of the form:\n"
+"    Valid URLs are of the form::\n"
 "\n"
 "      local/filesystem/path[#revision]\n"
 "      file://local/filesystem/path[#revision]\n"
@@ -8040,8 +8122,8 b' msgid ""'
 "      ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
 "\n"
 "    Paths in the local filesystem can either point to Mercurial\n"
-"    repositories or to bundle files (as created by 'hg bundle' or\n"
-"    'hg incoming --bundle').\n"
+"    repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
+"    incoming --bundle').\n"
 "\n"
 "    An optional identifier after # indicates a particular branch, tag,\n"
 "    or changeset to use from the remote repository. See also 'hg help\n"
@@ -8052,28 +8134,34 b' msgid ""'
 "    Mercurial server.\n"
 "\n"
 "    Some notes about using SSH with Mercurial:\n"
+"\n"
 "    - SSH requires an accessible shell account on the destination\n"
 "      machine and a copy of hg in the remote path or specified with as\n"
 "      remotecmd.\n"
 "    - path is relative to the remote user's home directory by default.\n"
-"      Use an extra slash at the start of a path to specify an absolute "
-"path:\n"
+"      Use an extra slash at the start of a path to specify an absolute\n"
+"      path::\n"
+"\n"
 "        ssh://example.com//tmp/repository\n"
+"\n"
 "    - Mercurial doesn't use its own compression via SSH; the right\n"
-"      thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
+"      thing to do is to configure it in your ~/.ssh/config, e.g.::\n"
+"\n"
 "        Host *.mylocalnetwork.example.com\n"
 "          Compression no\n"
 "        Host *\n"
 "          Compression yes\n"
+"\n"
 "      Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
 "      or with the --ssh command line option.\n"
 "\n"
 "    These URLs can all be stored in your hgrc with path aliases under\n"
-"    the [paths] section like so:\n"
-"    [paths]\n"
-"    alias1 = URL1\n"
-"    alias2 = URL2\n"
-"    ...\n"
+"    the [paths] section like so::\n"
+"\n"
+"      [paths]\n"
+"      alias1 = URL1\n"
+"      alias2 = URL2\n"
+"      ...\n"
 "\n"
 "    You can then use the alias for any command that uses a URL (for\n"
 "    example 'hg pull alias1' would pull from the 'alias1' path).\n"
@@ -8296,8 +8384,8 b' msgid "cannot create new http repository'
 msgstr "kan ikke lave nyt http depot"
 
 #, python-format
-msgid "%s: ignoring invalid syntax '%s'\n"
-msgstr "%s: ignorerer ugyldig syntaks '%s'\n"
+msgid "ignoring invalid syntax '%s'"
+msgstr "ignorerer ugyldig syntaks '%s'"
 
 #, python-format
 msgid "skipping unreadable ignore file '%s': %s\n"
@@ -8327,17 +8415,6 b' msgid "working copy of .hgtags is change'
 msgstr "arbejdskopien af .hgtags er ændret (deponer venligst .hgtags manuelt)"
 
 #, python-format
-msgid "%s, line %s: %s\n"
-msgstr "%s, linie %s: %s\n"
-
-msgid "cannot parse entry"
-msgstr ""
-
-#, python-format
-msgid "node '%s' is not well formed"
-msgstr "knude '%s' er ikke korrekt formet"
-
-#, python-format
 msgid "working directory has unknown parent '%s'!"
 msgstr "arbejdsbiblioteket har ukendt forældre '%s'!"
 
@@ -8697,9 +8774,6 b' msgstr ""'
 msgid "&Delete"
 msgstr ""
 
-msgid "c"
-msgstr ""
-
 #, python-format
 msgid ""
 "remote changed %s which local deleted\n"
@@ -8845,6 +8919,10 b' msgid "no valid hunks found; trying with'
 msgstr ""
 
 #, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr "%d filer ændret, %d indsættelser(+), %d sletninger(-)\n"
+
+#, python-format
 msgid "exited with status %d"
 msgstr "afsluttede med status %d"
 
@@ -8973,9 +9051,6 b' msgstr ""'
 msgid "&Remote"
 msgstr ""
 
-msgid "r"
-msgstr ""
-
 #, python-format
 msgid ""
 " local changed subrepository %s which remote removed\n"
@@ -9000,6 +9075,17 b' msgstr "hiver fra underdepot %s\\n"'
 msgid "pushing subrepo %s\n"
 msgstr "skubber til underdepot %s\n"
 
+#, python-format
+msgid "%s, line %s: %s\n"
+msgstr "%s, linie %s: %s\n"
+
+msgid "cannot parse entry"
+msgstr ""
+
+#, python-format
+msgid "node '%s' is not well formed"
+msgstr "knude '%s' er ikke korrekt formet"
+
 msgid "unmatched quotes"
 msgstr ""
 
@@ -9065,12 +9151,12 b' msgstr "Angiv venligst et brugernavn."'
 msgid "username %s contains a newline\n"
 msgstr "brugernavn %s indeholder et linieskift\n"
 
+msgid "response expected"
+msgstr "svar forventet"
+
 msgid "unrecognized response\n"
 msgstr "svar ikke genkendt\n"
 
-msgid "response expected"
-msgstr "svar forventet"
-
 msgid "password: "
 msgstr "kodeord: "
 

i18n/de.po

@@ -10,21 +10,22 b''
 # changeset	Änderungssatz
 # check out	auschecken
 # commit	Version
-# commit (v)	übertragen
+# commit (v)	übernehmen
 # deprecated	veraltet
 # hook		Aktion
 # merge		zusammenführen
 # notation	Schreibweise
-# repository	Projektarchiv
+# repository	(Projekt)archiv
+# manage/track  versionieren
 #
-# Die Koordination der Übersetzung erfolgt auf http://bitbucket.org/tobidope/mercurial-german-translation
+# Die Koordination der Übersetzung erfolgt auf https://bitbucket.org/FabianKreutz/hg-i18n-de/
 msgid ""
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2009-06-08 07:35+0200\n"
+"POT-Creation-Date: 2009-09-28 09:57+0300\n"
 "PO-Revision-Date: 2009-04-22 08:04+0200\n"
-"Last-Translator: Tobias Bell <[e-mail]>\n"
+"Last-Translator: Fabian Kreutz <[e-mail]>\n"
 "Language-Team: German (Tobias Bell, Fabian Kreutz, Lutz Horn)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,8 +42,12 b' msgstr "OPTIONEN"'
 msgid "COMMANDS"
 msgstr "BEFEHLE"
 
-msgid "    options:\n"
-msgstr "    Optionen:\n"
+msgid ""
+"    options:\n"
+"\n"
+msgstr ""
+"    Optionen:\n"
+"\n"
 
 #, python-format
 msgid ""
@@ -52,6 +57,100 b' msgstr ""'
 "    Aliase: %s\n"
 "\n"
 
+msgid ""
+"hooks for controlling repository access\n"
+"\n"
+"This hook makes it possible to allow or deny write access to portions\n"
+"of a repository when receiving incoming changesets.\n"
+"\n"
+"The authorization is matched based on the local user name on the\n"
+"system where the hook runs, and not the committer of the original\n"
+"changeset (since the latter is merely informative).\n"
+"\n"
+"The acl hook is best used along with a restricted shell like hgsh,\n"
+"preventing authenticating users from doing anything other than\n"
+"pushing or pulling. The hook is not safe to use if users have\n"
+"interactive shell access, as they can then disable the hook.\n"
+"Nor is it safe if remote users share an account, because then there\n"
+"is no way to distinguish them.\n"
+"\n"
+"To use this hook, configure the acl extension in your hgrc like this::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.acl =\n"
+"\n"
+"  [hooks]\n"
+"  pretxnchangegroup.acl = python:hgext.acl.hook\n"
+"\n"
+"  [acl]\n"
+"  # Check whether the source of incoming changes is in this list\n"
+"  # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
+"  sources = serve\n"
+"\n"
+"The allow and deny sections take a subtree pattern as key (with a glob\n"
+"syntax by default), and a comma separated list of users as the\n"
+"corresponding value. The deny list is checked before the allow list\n"
+"is. ::\n"
+"\n"
+"  [acl.allow]\n"
+"  # If acl.allow is not present, all users are allowed by default.\n"
+"  # An empty acl.allow section means no users allowed.\n"
+"  docs/** = doc_writer\n"
+"  .hgtags = release_engineer\n"
+"\n"
+"  [acl.deny]\n"
+"  # If acl.deny is not present, no users are refused by default.\n"
+"  # An empty acl.deny section means all users allowed.\n"
+"  glob pattern = user4, user5\n"
+"   ** = user6\n"
+msgstr ""
+"Einhängeaktionen zur Zugriffsverwaltung\n"
+"\n"
+"Mit dieser Einhängeaktion kann man den Schreibezugriff auf Teile des\n"
+"Projektarchivs erlauben oder verbietet.\n"
+"\n"
+"Die Autorisation basiert auf dem lokalen Benutzernamen in dem System\n"
+"wo die Aktion gestartet wird und nicht auf der rein informativen Angabe\n"
+"über die Person(en), die die Übernahme der Änderungen ausgeführt hat.\n"
+"\n"
+"Diese Aktion nutzt man am besten in Verbindung mit einer eingeschränkten\n"
+"shell, wie der hgsh. So wird verhindert, dass die Benutzer etwas anderes\n"
+"als eine Schiebe- bzw. Holaktion ausführen, wie z.B. diese Einhängeaktion\n"
+"zu deaktivieren. Unsicher ist es auch, wenn mehrere Benutzer denselben\n"
+"Zugriff auf dem Zielsystem haben, da sie nicht unterschieden werden können.\n"
+"\n"
+"Zur Benutzung muss die acl Erweiterung folgendermaßen in der hgrc\n"
+"konfiguriert werden::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.acl =\n"
+"\n"
+"  [hooks]\n"
+"  pretxnchangegroup.acl = python:hgext.acl.hook\n"
+"\n"
+"  [acl]\n"
+"  # Prüfe nur diese Aktionen als Quellen der neuen Änderungen\n"
+"  # (\"serve\" == ssh oder http, \"push\", \"pull\", \"bundle\")\n"
+"  sources = serve\n"
+"\n"
+"Die Abschnitte \"allow\" und \"deny\" enthalten glob-Muster zur Angabe\n"
+"der geschützten Dateien assoziiert mit einer Kommaliste von Benutzernamen.\n"
+"Die \"deny\"- (Verbots-)liste wird vor der \"allow\"- (Erlaubnis-)Liste\n"
+"geprüft. ::\n"
+"\n"
+"  [acl.allow]\n"
+"  # Ist dieser Abschnitt nicht angegeben, haben alle Benutzer standardmäßig\n"
+"  # Schreibeerlaubnis. Existiert der Abschnitt, ist aber leer, so gilt dies\n"
+"  # als Verbot für alle.\n"
+"  docs/** = dokumentator\n"
+"  .hgtags = release_engineer\n"
+"\n"
+"  [acl.deny]\n"
+"  # Ist dieser Abschnitt nicht angegeben oder ist leer, so ist kein Verbot\n"
+"  # definiert und alle Benutzer haben Schreiberlaubnis.\n"
+"  glob muster = benutzer1, benutzer2\n"
+"   ** = Benutzer3\n"
+
 #, python-format
 msgid "acl: %s not enabled\n"
 msgstr "acl: %s nicht aktiviert\n"
@@ -84,57 +183,39 b' msgstr "acl: Benutzer %s hat keinen Zugr'
 
 #, python-format
 msgid "acl: allowing changeset %s\n"
-msgstr "acl: Gestatte Version %s\n"
-
-msgid ""
-"mercurial bookmarks\n"
-"\n"
-"Mercurial bookmarks are local moveable pointers to changesets. Every\n"
-"bookmark points to a changeset identified by its hash. If you commit a\n"
+msgstr "acl: Gestatte Änderungssatz %s\n"
+
+msgid ""
+"track a line of development with movable markers\n"
+"\n"
+"Bookmarks are local movable markers to changesets. Every bookmark\n"
+"points to a changeset identified by its hash. If you commit a\n"
 "changeset that is based on a changeset that has a bookmark on it, the\n"
-"bookmark is forwarded to the new changeset.\n"
+"bookmark shifts to the new changeset.\n"
 "\n"
 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
 "merge, hg update).\n"
 "\n"
-"The bookmark extension offers the possiblity to have a more git-like\n"
-"experience by adding the following configuration option to your .hgrc:\n"
-"\n"
-"[bookmarks]\n"
-"track.current = True\n"
-"\n"
-"This will cause bookmarks to track the bookmark that you are currently\n"
-"on, and just updates it. This is similar to git's approach of\n"
+"By default, when several bookmarks point to the same changeset, they\n"
+"will all move forward together. It is possible to obtain a more\n"
+"git-like experience by adding the following configuration option to\n"
+"your .hgrc::\n"
+"\n"
+"  [bookmarks]\n"
+"  track.current = True\n"
+"\n"
+"This will cause Mercurial to track the bookmark that you are currently\n"
+"using, and only update it. This is similar to git's approach to\n"
 "branching.\n"
-msgstr ""
-"Mercurial-Lesezeichen\n"
-"\n"
-"Mercurial-Lesezeichen sind lokale, bewegliche Zeiger auf Änderungssätze.\n"
-"Jedes Lesezeichen bezeichnet einen Änderungssatz identifiziert durch seine\n"
-"Prüfsumme. Wenn ein Änderungssatz, der auf einem anderen Änderungssatz mit\n"
-"einem Lesezeichen basiert, übernommen wird, so wird das Lesezeichen auf den\n"
-"neuen Satz verschoben.\n"
-"\n"
-"Ein Lesezeichenname kann für jede Form von Revisionssuche (z.B. hg merge,\n"
-"hg update) verwendet werden.\n"
-"\n"
-"Durch diese Erweiterung ist eine eher git-ähnliche Arbeitsform möglich,\n"
-"indem die folgende Konfigurationsoption in die .hgrc eingefügt wird:\n"
-"\n"
-"[bookmarks]\n"
-"track.current = True\n"
-"\n"
-"Dadurch wird das Lesezeichen bei Aktualisierungen automatisch verschoben.\n"
-"Dies entspricht gits Form von Verzweigungen (branching).\n"
-
-#, fuzzy
-msgid ""
-"mercurial bookmarks\n"
+msgstr "Folgt einem Entwicklungsstrang mit einer beweglichen Markierung\n"
+
+msgid ""
+"track a line of development with movable markers\n"
 "\n"
 "    Bookmarks are pointers to certain commits that move when\n"
-"    commiting. Bookmarks are local. They can be renamed, copied and\n"
+"    committing. Bookmarks are local. They can be renamed, copied and\n"
 "    deleted. It is possible to use bookmark names in 'hg merge' and\n"
-"    'hg update' to update to a given bookmark.\n"
+"    'hg update' to merge and update respectively to a given bookmark.\n"
 "\n"
 "    You can use 'hg bookmark NAME' to set a bookmark on the working\n"
 "    directory's parent revision with the given name. If you specify\n"
@@ -142,7 +223,7 b' msgid ""'
 "    the bookmark is assigned to that revision.\n"
 "    "
 msgstr ""
-"Mercurial Lesezeichen\n"
+"Folgt einem Entwicklungsstrang mit einer beweglichen Markierung\n"
 "\n"
 "    Lesezeichen sind Zeiger auf bestimmte Versionen, die mitwandern,\n"
 "    wenn eine neuen Version erzeugt wird. Lesezeichen sind nur lokal.\n"
@@ -150,7 +231,7 b' msgstr ""'
 "    Lesezeichen bei 'hg merge' und 'hg update' zu nutzen, um auf das\n"
 "    angegebene Lesezeichen zu aktualisieren.\n"
 "\n"
-"    Du kannst 'hg bookmark NAME' aufrufen, um ein Lesezeichen mit dem\n"
+"    Man kann 'hg bookmark NAME' aufrufen, um ein Lesezeichen mit dem\n"
 "    angegeben Namen auf der aktuellen Spitze (tip) zu setzen. Bei Angabe "
 "einer\n"
 "    Revision mit -r REV (REV kann ein vorhandenes Lesezeichen sein) wird "
@@ -193,7 +274,7 b' msgid "hg bookmarks [-f] [-d] [-m NAME] '
 msgstr ""
 
 msgid ""
-"Bugzilla integration\n"
+"hooks for integrating with the Bugzilla bug tracker\n"
 "\n"
 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
@@ -209,65 +290,86 b' msgid ""'
 "be run by Mercurial as the user pushing the change; you will need to\n"
 "ensure the Bugzilla install file permissions are set appropriately.\n"
 "\n"
-"Configuring the extension:\n"
-"\n"
-"    [bugzilla]\n"
-"\n"
-"    host       Hostname of the MySQL server holding the Bugzilla\n"
-"               database.\n"
-"    db         Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
-"    user       Username to use to access MySQL server. Default 'bugs'.\n"
-"    password   Password to use to access MySQL server.\n"
-"    timeout    Database connection timeout (seconds). Default 5.\n"
-"    version    Bugzilla version. Specify '3.0' for Bugzilla versions\n"
-"               3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
-"               and '2.16' for versions prior to 2.18.\n"
-"    bzuser     Fallback Bugzilla user name to record comments with, if\n"
-"               changeset committer cannot be found as a Bugzilla user.\n"
-"    bzdir      Bugzilla install directory. Used by default notify.\n"
-"               Default '/var/www/html/bugzilla'.\n"
-"    notify     The command to run to get Bugzilla to send bug change\n"
-"               notification emails. Substitutes from a map with 3\n"
-"               keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
-"               bugzilla email). Default depends on version; from 2.18\n"
-"               it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-"               %(id)s %(user)s\".\n"
-"    regexp     Regular expression to match bug IDs in changeset commit\n"
-"               message. Must contain one \"()\" group. The default\n"
-"               expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
-"               number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
-"               variations thereof. Matching is case insensitive.\n"
-"    style      The style file to use when formatting comments.\n"
-"    template   Template to use when formatting comments. Overrides\n"
-"               style if specified. In addition to the usual Mercurial\n"
-"               keywords, the extension specifies:\n"
-"                   {bug}       The Bugzilla bug ID.\n"
-"                   {root}      The full pathname of the Mercurial\n"
-"                               repository.\n"
-"                   {webroot}   Stripped pathname of the Mercurial\n"
-"                               repository.\n"
-"                   {hgweb}     Base URL for browsing Mercurial\n"
-"                               repositories.\n"
-"               Default 'changeset {node|short} in repo {root} refers '\n"
-"                       'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
-"    strip      The number of slashes to strip from the front of {root}\n"
-"               to produce {webroot}. Default 0.\n"
-"    usermap    Path of file containing Mercurial committer ID to\n"
-"               Bugzilla user ID mappings. If specified, the file\n"
-"               should contain one mapping per line,\n"
-"               \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
-"               section.\n"
-"\n"
-"    [usermap]\n"
-"    Any entries in this section specify mappings of Mercurial\n"
-"    committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-"    \"committer\"=\"Bugzilla user\"\n"
-"\n"
-"    [web]\n"
-"    baseurl    Base URL for browsing Mercurial repositories. Reference\n"
-"               from templates as {hgweb}.\n"
-"\n"
-"Activating the extension:\n"
+"The extension is configured through three different configuration\n"
+"sections. These keys are recognized in the [bugzilla] section:\n"
+"\n"
+"host\n"
+"  Hostname of the MySQL server holding the Bugzilla database.\n"
+"\n"
+"db\n"
+"  Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
+"\n"
+"user\n"
+"  Username to use to access MySQL server. Default 'bugs'.\n"
+"\n"
+"password\n"
+"  Password to use to access MySQL server.\n"
+"\n"
+"timeout\n"
+"  Database connection timeout (seconds). Default 5.\n"
+"\n"
+"version\n"
+"  Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
+"  '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
+"  to 2.18.\n"
+"\n"
+"bzuser\n"
+"  Fallback Bugzilla user name to record comments with, if changeset\n"
+"  committer cannot be found as a Bugzilla user.\n"
+"\n"
+"bzdir\n"
+"   Bugzilla install directory. Used by default notify. Default\n"
+"   '/var/www/html/bugzilla'.\n"
+"\n"
+"notify\n"
+"  The command to run to get Bugzilla to send bug change notification\n"
+"  emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
+"  and 'user' (committer bugzilla email). Default depends on version;\n"
+"  from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
+"  %(id)s %(user)s\".\n"
+"\n"
+"regexp\n"
+"  Regular expression to match bug IDs in changeset commit message.\n"
+"  Must contain one \"()\" group. The default expression matches 'Bug\n"
+"  1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
+"  1234 and 5678' and variations thereof. Matching is case insensitive.\n"
+"\n"
+"style\n"
+"  The style file to use when formatting comments.\n"
+"\n"
+"template\n"
+"  Template to use when formatting comments. Overrides style if\n"
+"  specified. In addition to the usual Mercurial keywords, the\n"
+"  extension specifies::\n"
+"\n"
+"    {bug}       The Bugzilla bug ID.\n"
+"    {root}      The full pathname of the Mercurial repository.\n"
+"    {webroot}   Stripped pathname of the Mercurial repository.\n"
+"    {hgweb}     Base URL for browsing Mercurial repositories.\n"
+"\n"
+"  Default 'changeset {node|short} in repo {root} refers '\n"
+"          'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
+"\n"
+"strip\n"
+"  The number of slashes to strip from the front of {root} to produce\n"
+"  {webroot}. Default 0.\n"
+"\n"
+"usermap\n"
+"  Path of file containing Mercurial committer ID to Bugzilla user ID\n"
+"  mappings. If specified, the file should contain one mapping per\n"
+"  line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
+"\n"
+"The [usermap] section is used to specify mappings of Mercurial\n"
+"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
+"\"committer\"=\"Bugzilla user\"\n"
+"\n"
+"Finally, the [web] section supports one entry:\n"
+"\n"
+"baseurl\n"
+"  Base URL for browsing Mercurial repositories. Reference from\n"
+"  templates as {hgweb}.\n"
+"\n"
+"Activating the extension::\n"
 "\n"
 "    [extensions]\n"
 "    hgext.bugzilla =\n"
@@ -280,7 +382,7 b' msgid ""'
 "\n"
 "This example configuration is for a collection of Mercurial\n"
 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2.\n"
+"installation in /opt/bugzilla-3.2. ::\n"
 "\n"
 "    [bugzilla]\n"
 "    host=localhost\n"
@@ -288,8 +390,9 b' msgid ""'
 "    version=3.0\n"
 "    bzuser=[e-mail]\n"
 "    bzdir=/opt/bugzilla-3.2\n"
-"    template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
-"rev/{node|short}\\n\\n{desc}\\n\n"
+"    template=Changeset {node|short} in {root|basename}.\n"
+"             {hgweb}/{webroot}/rev/{node|short}\\n\n"
+"             {desc}\\n\n"
 "    strip=5\n"
 "\n"
 "    [web]\n"
@@ -298,13 +401,143 b' msgid ""'
 "    [usermap]\n"
 "    [e-mail]=[e-mail]\n"
 "\n"
-"Commits add a comment to the Bugzilla bug record of the form:\n"
+"Commits add a comment to the Bugzilla bug record of the form::\n"
 "\n"
 "    Changeset 3b16791d6642 in repository-name.\n"
 "    http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
 "\n"
 "    Changeset commit comment. Bug 1234.\n"
 msgstr ""
+"Bugzilla integration\n"
+"\n"
+"Diese Erweiterung (falls als Einhänge-Aktion aktiviert) überträgt Versions-\n"
+"meldungen als Kommentare in Bugzilla, wenn sie eine Bugzilla ID enthalten.\n"
+"Der Status des Bugs wird nicht verändert.\n"
+"\n"
+"Die Bugzilla-Datenbank wird direkt verändert, daher werden nur Instanzen "
+"mit\n"
+"MySQL als Datenspeicher unterstützt.\n"
+"\n"
+"Intern wird ein Bugzilla-Skript zum Senden von Hinweis-Emails verwendet.\n"
+"Dies ist 'processmail' in Versionen vor 2.18 und 'config/sendbugmail.pl'\n"
+"danach. Mercurial führt dies unter der User-ID des Überträgers aus, daher\n"
+"müssen die Dateirechte dieses Skripts entsprechend gesetzt sein.\n"
+"\n"
+"Die Erweiterung wird durch drei Abschnitte in der hgrc konfiguriert. Der\n"
+"Abschnitt [bugzilla] kann die folgenden Einträge enthalten:\n"
+"\n"
+"host\n"
+"  Hostname des Servers auf dem die Bugzilla MySQL-DB läuft.\n"
+"\n"
+"db\n"
+"  Name der Bugzilla Datebank in MySQL. Standard: 'bugs'.\n"
+"\n"
+"user\n"
+"  Benutzername zum Zugriff auf den MySQL-Server. Standard: 'bugs'.\n"
+"\n"
+"password\n"
+"  Password zum Zugriff auf den MySQL-Server.\n"
+"\n"
+"timeout\n"
+"  Datenbank Verbindungs-Zeitgrenze (in Sekunden). Standard: 5.\n"
+"\n"
+"version\n"
+"  Bugzilla Version. '3.0' für Bugzilla Versionen nach und inklusive 3.0,\n"
+"  '2.18' für Versionen seit 2.18 und '2.16' für Versionen davor.\n"
+"\n"
+"bzuser\n"
+"  Ausweich-Benutzername zum Setzen von Kommentaren, falls der Überträger\n"
+"  der Änderungen kein Benutzer in Bugzilla ist.\n"
+"\n"
+"bzdir\n"
+"  Bugzilla Installationsverzeichnis. Notwendig für die Standard\n"
+"  'notify'-Aktion; Standard: '/var/www/html/bugzilla'.\n"
+"\n"
+"notify\n"
+"  Das Kommando um Hinweisemails zu versenden. Die drei Schlüssel 'bzdir',\n"
+"  'id' (Bug ID) und 'user' (Überträger) werden ersetzt.\n"
+"  Der Standard hängt von der Version ab. Ab 2.18 ist es\n"
+"    'cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)s'\n"
+"\n"
+"regexp\n"
+"  Der Reguläre Ausdruck, mit dem Bug IDs in der Versionsmeldung erkannt\n"
+"  werden. Er muss mindestens eine '()' Gruppe enthalten. Der Standardwert\n"
+"  erkennt: 'Bug 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678',\n"
+"  'Bug 1234 and 5678' und Variationen. Großschreibung wird ignoriert.\n"
+"\n"
+"style\n"
+"  Stil-Datei für das Formatieren der Kommentare.\n"
+"\n"
+"template\n"
+"  Vorlagetext für die Bugzilla Kommentare (anstelle der Stil-\n"
+"  Datei). Zusätzlich zu den Mercurial-Schlüsselworten gibt es::\n"
+"\n"
+"    {bug}       Die Bugzilla Bug ID.\n"
+"    {root}      Der volle Pfad des Mercurial Archivs.\n"
+"    {webroot}   Angepasster Pfad des Mercurial Archivs.\n"
+"    {hgweb}     Basis-URL für alle Mercurial Archive.\n"
+"\n"
+"  Standard: 'Änderung {node|short} in Archiv {root} erwähnt Bug {bug}.\\n'\n"
+"            'Details:\\n\\t{desc|tabindent}'\n"
+"\n"
+"strip\n"
+"  Anzahl der Schrägstriche, die vom Beginn von {root} entfernt werden, um\n"
+"  {webroot} zu erhalten. Standard: 0.\n"
+"\n"
+"usermap\n"
+"  Pfad zu einer Datei, die Mercurial Benutzern eine Bugzilla-BenutzerID\n"
+"  zuweist. Falls angegeben, sollte jede Zeile der Form\n"
+"    'Mercurial Benutzer'='Bugzilla Benutzer'\n"
+"  entsprechen. Siehe auch die [usermap] Sektion.\n"
+"\n"
+"Einträge in dieser [usermap] Sektion weisen Mercurial Benutzern eine\n"
+"Bugzilla-BenutzerID zu. Siehe auch Option [bugzilla].usermap.\n"
+"    'Mercurial Benutzer'='Bugzilla Benutzer'\n"
+"\n"
+"Letztlich definiert der Abschnitt [web] noch einen Eintrag:\n"
+"\n"
+"baseurl\n"
+"  Basis-URL für alle Mercurial Archive. Kann in Kommentar-Vorlagen als\n"
+"  {hgweb} verwendet werden.\n"
+"\n"
+"Um diese Erweiterung zu aktivieren::\n"
+"\n"
+"    [extensions]\n"
+"    hgext.bugzilla =\n"
+"\n"
+"    [hooks]\n"
+"    # führt Einhängeaktion für jede Änderung aus, die hierher geholt oder\n"
+"    # geschoben wird\n"
+"    incoming.bugzilla = python:hgext.bugzilla.hook\n"
+"\n"
+"Beispielkonfiguration:\n"
+"\n"
+"Dieses Beispiel geht von einer lokalen Bugzilla 3.2 Installation im "
+"Verzeichnis\n"
+"/opt/bugzilla-3.2 und Mercurial Archiven in /var/local/hg/repos/ aus. ::\n"
+"\n"
+"    [bugzilla]\n"
+"    host=localhost\n"
+"    password=XYZZY\n"
+"    version=3.0\n"
+"    bzuser=[e-mail]\n"
+"    bzdir=/opt/bugzilla-3.2\n"
+"    template=Änderung {node|short} in Archiv {root|basename}.\\n\n"
+"{hgweb}/{webroot}/rev/{node|short}\\n\\n{desc}\\n\n"
+"    strip=5\n"
+"\n"
+"    [web]\n"
+"    baseurl=http://dev.domain.com/hg\n"
+"\n"
+"    [usermap]\n"
+"    [e-mail]=[e-mail]\n"
+"\n"
+"Eine neue Änderung führt dann zu einem solchen Bugzilla-Kommentar::\n"
+"\n"
+"    Änderung 3b16791d6642 in Archiv MyProject.\n"
+"    http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
+"\n"
+"    Setze Zähler am Schleifenende zurück. Bug 1234.\n"
 
 #, python-format
 msgid "connecting to %s:%s as %s, password %s\n"
@@ -312,72 +545,77 b' msgstr "Verbinde mit %s:%s als %s, Passw'
 
 #, python-format
 msgid "query: %s %s\n"
-msgstr ""
+msgstr "Anfrage: %s %s\n"
 
 #, python-format
 msgid "failed query: %s %s\n"
-msgstr ""
+msgstr "Fehlgeschlagene Anfrage: %s %s\n"
 
 msgid "unknown database schema"
-msgstr ""
+msgstr "Unbekanntes Datenbankschema"
 
 #, python-format
 msgid "bug %d already knows about changeset %s\n"
-msgstr ""
+msgstr "Fehler %d hat bereits einen Kommentar über Änderung %s\n"
 
 msgid "telling bugzilla to send mail:\n"
-msgstr ""
+msgstr "Sende Email durch Bugzilla:\n"
 
 #, python-format
 msgid "  bug %s\n"
-msgstr ""
+msgstr "  Fehler %s\n"
 
 #, python-format
 msgid "running notify command %s\n"
-msgstr ""
+msgstr "'notify' Kommando: %s\n"
 
 #, python-format
 msgid "bugzilla notify command %s"
-msgstr ""
+msgstr "Fehler beim 'notify' Kommando: %s"
 
 msgid "done\n"
 msgstr "erledigt\n"
 
 #, python-format
 msgid "looking up user %s\n"
-msgstr ""
+msgstr "Suche BenutzerID-Zuweisung für %s\n"
 
 #, python-format
 msgid "cannot find bugzilla user id for %s"
-msgstr ""
+msgstr "Kann keine Bugzilla BenutzerID für %s finden"
 
 #, python-format
 msgid "cannot find bugzilla user id for %s or %s"
-msgstr ""
+msgstr "Kann keine Bugzilla BenutzerID für %s oder %s finden"
 
 #, python-format
 msgid "bugzilla version %s not supported"
-msgstr ""
+msgstr "Bugzilla Version %s wird nicht unterstützt"
 
 msgid ""
 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
 "details:\n"
 "\t{desc|tabindent}"
 msgstr ""
+"Änderung {node|short} in Archiv {root} erwähnt Bug {bug}.\n"
+"Details:\n"
+"\t{desc|tabindent}"
 
 #, python-format
 msgid "python mysql support not available: %s"
-msgstr ""
+msgstr "Python MySQL Unterstützung nicht verfügbar: %s"
 
 #, python-format
 msgid "hook type %s does not pass a changeset id"
-msgstr ""
+msgstr "Typ %s für Einhängeaktionen übergibt keine Änderungs-ID"
 
 #, python-format
 msgid "database error: %s"
-msgstr ""
-
-#, fuzzy
+msgstr "Datenbankfehler: %s"
+
+msgid "command to display child changesets"
+msgstr "Zum Anzeigen von Kindrevisionen"
+
 msgid ""
 "show the children of the given or working directory revision\n"
 "\n"
@@ -391,7 +629,8 b' msgstr ""'
 "Zeigt die Kinder der übergebenen Revision oder des Arbeitsverzeichnisses an\n"
 "\n"
 "    Zeigt die Kinder der Revision des Arbeitsverzeichnisses an.\n"
-"    Wenn eine Revision durch --rev angegeben wird, werden die Kinder dieser\n"
+"    Wenn eine Revision durch -r/--rev angegeben wird, werden die Kinder "
+"dieser\n"
 "    Revision angezeigt. Wenn eine Datei als Argument angegeben wird, zeige "
 "die\n"
 "    Revision an, in der die Datei zuletzt geändert wurde (nachfolgend der\n"
@@ -405,8 +644,8 b' msgstr "Zeigt die Kinder der \xc3\xbcbergebenen Revision"'
 msgid "hg children [-r REV] [FILE]"
 msgstr "hg children [-r REV] [DATEI]"
 
-msgid "command to show certain statistics about revision history"
-msgstr ""
+msgid "command to display statistics about repository history"
+msgstr "Zeigt Statistiken über die Projekthistorie"
 
 #, python-format
 msgid "Revision %d is a merge, ignoring...\n"
@@ -414,18 +653,22 b' msgstr "Revision %d ist eine Zusammenf\xc3\xbchrung, wird ignoriert...\\n"'
 
 #, python-format
 msgid "generating stats: %d%%"
-msgstr ""
-
-msgid ""
-"graph count of revisions grouped by template\n"
-"\n"
-"    Will graph count of changed lines or revisions grouped by template\n"
-"    or alternatively by date, if dateformat is used. In this case it\n"
-"    will override template.\n"
-"\n"
-"    By default statistics are counted for number of changed lines.\n"
-"\n"
-"    Examples:\n"
+msgstr "Generiere Statistiken: %d%%"
+
+msgid ""
+"histogram of changes to the repository\n"
+"\n"
+"    This command will display a histogram representing the number\n"
+"    of changed lines or revisions, grouped according to the given\n"
+"    template. The default template will group changes by author.\n"
+"    The --dateformat option may be used to group the results by\n"
+"    date instead.\n"
+"\n"
+"    Statistics are based on the number of changed lines, or\n"
+"    alternatively the number of matching revisions if the\n"
+"    --changesets option is specified.\n"
+"\n"
+"    Examples::\n"
 "\n"
 "      # display count of changed lines for every committer\n"
 "      hg churn -t '{author|email}'\n"
@@ -439,48 +682,79 b' msgid ""'
 "      # display count of lines changed in every year\n"
 "      hg churn -f '%Y' -s\n"
 "\n"
-"    The map file format used to specify aliases is fairly simple:\n"
-"\n"
-"    <alias email> <actual email>\n"
-"\n"
-"    By default .hgchurn in the working directory root will be used, if\n"
-"    it exists. Use the --aliases option to override this.\n"
-"    "
-msgstr ""
+"    It is possible to map alternate email addresses to a main address\n"
+"    by providing a file using the following format::\n"
+"\n"
+"      <alias email> <actual email>\n"
+"\n"
+"    Such a file may be specified with the --aliases option, otherwise\n"
+"    a .hgchurn file will be looked for in the working directory root.\n"
+"    "
+msgstr ""
+"Zeigt gruppierte Statistiken über Anzahl der Revisionen/Änderungen an\n"
+"\n"
+"    Zählt Revisionen oder veränderte Zeilen anhand einer gegebenen "
+"Gruppierung\n"
+"    und zeigt sie als Graph an. Gruppiert wird anhand von Vorlagen (siehe\n"
+"    'hg help templating') oder Datum, falls ein Datumsformat angegeben ist.\n"
+"\n"
+"    Standardmäßig werden die veränderten Zeilen gezählt.\n"
+"\n"
+"    Beispiele::\n"
+"\n"
+"      # Zeigt Anzahl der veränderten Zeilen pro Entwickler\n"
+"      hg churn -t '{author|email}'\n"
+"\n"
+"      # Zeigt Aktivität im Tagesverlauf (Gruppiert nach Stunde)\n"
+"      hg churn -f '%H' -s -c\n"
+"\n"
+"      # Zeigt Aktivität pro Monat\n"
+"      hg churn -f '%Y-%m' -s -c\n"
+"\n"
+"      # Zeigt Anzahl der veränderten Zeilen über die Jahre\n"
+"      hg churn -f '%Y' -s\n"
+"\n"
+"    Als Zuweisungsdatei für Alias-Emails zu echten Emails wird "
+"standardmäßig\n"
+"    die .hgchurn Datei in der Archivwurzel verwendet. Die Option --aliases\n"
+"    verändert diese Vorgabe. Das Format ist recht einfach::\n"
+"\n"
+"      <alias Email> <echte Email>\n"
+"    "
 
 #, python-format
 msgid "assuming %i character terminal\n"
-msgstr ""
+msgstr "Gehe von Terminalbreite %i aus\n"
 
 msgid "count rate for the specified revision or range"
-msgstr ""
+msgstr "Zählt nur in gegebener Revision oder Intervall"
 
 msgid "count rate for revisions matching date spec"
 msgstr "Zeigt Revisionen passend zur Datums-Spezifikation"
 
 msgid "template to group changesets"
-msgstr ""
+msgstr "Gruppierungsschlüssel (hg help templating)"
 
 msgid "strftime-compatible format for grouping by date"
-msgstr ""
+msgstr "Gruppierung nach Datum in strftime-kompatiblem Format"
 
 msgid "count rate by number of changesets"
-msgstr ""
+msgstr "Zählt Anzahl der Änderungssätze"
 
 msgid "sort by key (default: sort by count)"
-msgstr ""
+msgstr "Sortiere nach Gruppierungsschlüssel (Standard: nach Anzahl)"
 
 msgid "file with email aliases"
-msgstr ""
+msgstr "Datei mit Alias-Emails"
 
 msgid "show progress"
-msgstr ""
+msgstr "Zeigt Fortschritt an"
 
 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
-msgstr ""
-
-msgid ""
-"add color output to status, qseries, and diff-related commands\n"
+msgstr "hg churn [-d DATUM] [-r REV] [--aliases DATEI] [--progress] [DATEI]"
+
+msgid ""
+"colorize output from some commands\n"
 "\n"
 "This extension modifies the status command to add color to its output\n"
 "to reflect file status, the qseries command to add color to reflect\n"
@@ -493,38 +767,75 b' msgid ""'
 "function (aka ANSI escape codes). This module also provides the\n"
 "render_text function, which can be used to add effects to any text.\n"
 "\n"
-"To enable this extension, add this to your .hgrc file:\n"
-"[extensions]\n"
-"color =\n"
-"\n"
-"Default effects may be overridden from the .hgrc file:\n"
-"\n"
-"[color]\n"
-"status.modified = blue bold underline red_background\n"
-"status.added = green bold\n"
-"status.removed = red bold blue_background\n"
-"status.deleted = cyan bold underline\n"
-"status.unknown = magenta bold underline\n"
-"status.ignored = black bold\n"
-"\n"
-"# 'none' turns off all effects\n"
-"status.clean = none\n"
-"status.copied = none\n"
-"\n"
-"qseries.applied = blue bold underline\n"
-"qseries.unapplied = black bold\n"
-"qseries.missing = red bold\n"
-"\n"
-"diff.diffline = bold\n"
-"diff.extended = cyan bold\n"
-"diff.file_a = red bold\n"
-"diff.file_b = green bold\n"
-"diff.hunk = magenta\n"
-"diff.deleted = red\n"
-"diff.inserted = green\n"
-"diff.changed = white\n"
-"diff.trailingwhitespace = bold red_background\n"
-msgstr ""
+"Default effects may be overridden from the .hgrc file::\n"
+"\n"
+"  [color]\n"
+"  status.modified = blue bold underline red_background\n"
+"  status.added = green bold\n"
+"  status.removed = red bold blue_background\n"
+"  status.deleted = cyan bold underline\n"
+"  status.unknown = magenta bold underline\n"
+"  status.ignored = black bold\n"
+"\n"
+"  # 'none' turns off all effects\n"
+"  status.clean = none\n"
+"  status.copied = none\n"
+"\n"
+"  qseries.applied = blue bold underline\n"
+"  qseries.unapplied = black bold\n"
+"  qseries.missing = red bold\n"
+"\n"
+"  diff.diffline = bold\n"
+"  diff.extended = cyan bold\n"
+"  diff.file_a = red bold\n"
+"  diff.file_b = green bold\n"
+"  diff.hunk = magenta\n"
+"  diff.deleted = red\n"
+"  diff.inserted = green\n"
+"  diff.changed = white\n"
+"  diff.trailingwhitespace = bold red_background\n"
+msgstr ""
+"Färbt die Ausgabe von status, qseries und diff-ähnlichen Kommandos\n"
+"\n"
+"Diese Erweiterung färbt die Ausgabe des Kommandos 'status' anhand des\n"
+"Dateistatus, die Ausgabe von 'qseries' anhand des Patchstatus\n"
+"(angewendet, nicht angewendet, fehlend) und die Ausgabe von\n"
+"diff-ähnlichen Kommandos anhand der Änderung (hinzugefügte oder\n"
+"entfernte Zeilen, Dateistatus und abschliessende Leerstellen) ein.\n"
+"\n"
+"Neben Farbänderungen sind auch andere Effekte wie Fettschreibung oder\n"
+"Unterstreichung möglich. Die Effekte werden durch die ECMA-48 SGR\n"
+"Funktionen (ANSI Escape Codes) realisiert. Die in diesem Module zu\n"
+"findende Funktion 'render_text' kann auch von anderen Modulen verwendet\n"
+"werden, um Texteffekte zu erzeugen.\n"
+"\n"
+"Standardeffekte können durch die .hgrc Datei verändert werden::\n"
+"\n"
+"  [color]\n"
+"  status.modified = blue bold underline red_background\n"
+"  status.added = green bold\n"
+"  status.removed = red bold blue_background\n"
+"  status.deleted = cyan bold underline\n"
+"  status.unknown = magenta bold underline\n"
+"  status.ignored = black bold\n"
+"\n"
+"  # 'none' deaktiviert alle Effekte\n"
+"  status.clean = none\n"
+"  status.copied = none\n"
+"\n"
+"  qseries.applied = blue bold underline\n"
+"  qseries.unapplied = black bold\n"
+"  qseries.missing = red bold\n"
+"\n"
+"  diff.diffline = bold\n"
+"  diff.extended = cyan bold\n"
+"  diff.file_a = red bold\n"
+"  diff.file_b = green bold\n"
+"  diff.hunk = magenta\n"
+"  diff.deleted = red\n"
+"  diff.inserted = green\n"
+"  diff.changed = white\n"
+"  diff.trailingwhitespace = bold red_background\n"
 
 msgid "when to colorize (always, auto, or never)"
 msgstr "Wann soll eingefärbt werden (always, auto oder never)"
@@ -532,13 +843,18 b' msgstr "Wann soll eingef\xc3\xa4rbt werden (always, auto oder never)"'
 msgid "don't colorize output"
 msgstr "Keine Färbung der Ausgabe"
 
-msgid "converting foreign VCS repositories to Mercurial"
-msgstr ""
+#, python-format
+msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
+msgstr "Ignoriere unbekannte Farbe/Effekt %r (gesetzt in color.%s)\n"
+
+msgid "import revisions from foreign VCS repositories into Mercurial"
+msgstr "Importiert Revisionen aus Archiven mit anderem VCS in Mercurial"
 
 msgid ""
 "convert a foreign SCM repository to a Mercurial one.\n"
 "\n"
 "    Accepted source formats [identifiers]:\n"
+"\n"
 "    - Mercurial [hg]\n"
 "    - CVS [cvs]\n"
 "    - Darcs [darcs]\n"
@@ -550,6 +866,7 b' msgid ""'
 "    - Perforce [p4]\n"
 "\n"
 "    Accepted destination formats [identifiers]:\n"
+"\n"
 "    - Mercurial [hg]\n"
 "    - Subversion [svn] (history on branches is not preserved)\n"
 "\n"
@@ -561,23 +878,28 b' msgid ""'
 "    basename of the source with '-hg' appended. If the destination\n"
 "    repository doesn't exist, it will be created.\n"
 "\n"
-"    By default, all sources except Mercurial will use\n"
-"    --branchsort. Mercurial uses --sourcesort to preserve original\n"
-"    revision numbers order. Sort modes have the following effects:\n"
-"      --branchsort: convert from parent to child revision when\n"
-"        possible, which means branches are usually converted one after\n"
-"        the other. It generates more compact repositories.\n"
-"      --datesort: sort revisions by date. Converted repositories have\n"
-"        good-looking changelogs but are often an order of magnitude\n"
-"        larger than the same ones generated by --branchsort.\n"
-"      --sourcesort: try to preserve source revisions order, only\n"
-"        supported by Mercurial sources.\n"
+"    By default, all sources except Mercurial will use --branchsort.\n"
+"    Mercurial uses --sourcesort to preserve original revision numbers\n"
+"    order. Sort modes have the following effects:\n"
+"\n"
+"    --branchsort  convert from parent to child revision when possible,\n"
+"                  which means branches are usually converted one after\n"
+"                  the other. It generates more compact repositories.\n"
+"\n"
+"    --datesort    sort revisions by date. Converted repositories have\n"
+"                  good-looking changelogs but are often an order of\n"
+"                  magnitude larger than the same ones generated by\n"
+"                  --branchsort.\n"
+"\n"
+"    --sourcesort  try to preserve source revisions order, only\n"
+"                  supported by Mercurial sources.\n"
 "\n"
 "    If <REVMAP> isn't given, it will be put in a default location\n"
 "    (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
 "    that maps each source commit ID to the destination ID for that\n"
-"    revision, like so:\n"
-"    <source ID> <destination ID>\n"
+"    revision, like so::\n"
+"\n"
+"      <source ID> <destination ID>\n"
 "\n"
 "    If the file doesn't exist, it's automatically created. It's\n"
 "    updated on each commit copied, so convert-repo can be interrupted\n"
@@ -591,7 +913,7 b' msgid ""'
 "\n"
 "    The filemap is a file that allows filtering and remapping of files\n"
 "    and directories. Comment lines start with '#'. Each line can\n"
-"    contain one of the following directives:\n"
+"    contain one of the following directives::\n"
 "\n"
 "      include path/to/file\n"
 "\n"
@@ -601,11 +923,11 b' msgid ""'
 "\n"
 "    The 'include' directive causes a file, or all files under a\n"
 "    directory, to be included in the destination repository, and the\n"
-"    exclusion of all other files and directories not explicitly included.\n"
-"    The 'exclude' directive causes files or directories to be omitted.\n"
-"    The 'rename' directive renames a file or directory. To rename from\n"
-"    a subdirectory into the root of the repository, use '.' as the\n"
-"    path to rename to.\n"
+"    exclusion of all other files and directories not explicitly\n"
+"    included. The 'exclude' directive causes files or directories to\n"
+"    be omitted. The 'rename' directive renames a file or directory. To\n"
+"    rename from a subdirectory into the root of the repository, use\n"
+"    '.' as the path to rename to.\n"
 "\n"
 "    The splicemap is a file that allows insertion of synthetic\n"
 "    history, letting you specify the parents of a revision. This is\n"
@@ -630,7 +952,7 b' msgid ""'
 "    in one repository from \"default\" to a named branch.\n"
 "\n"
 "    Mercurial Source\n"
-"    -----------------\n"
+"    ----------------\n"
 "\n"
 "    --config convert.hg.ignoreerrors=False    (boolean)\n"
 "        ignore integrity errors when reading. Use it to fix Mercurial\n"
@@ -658,36 +980,38 b' msgid ""'
 "    Because CVS does not have changesets, it is necessary to collect\n"
 "    individual commits to CVS and merge them into changesets. CVS\n"
 "    source uses its internal changeset merging code by default but can\n"
-"    be configured to call the external 'cvsps' program by setting:\n"
-"        --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"    be configured to call the external 'cvsps' program by setting::\n"
+"\n"
+"      --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"\n"
 "    This option is deprecated and will be removed in Mercurial 1.4.\n"
 "\n"
 "    The options shown are the defaults.\n"
 "\n"
-"    Internal cvsps is selected by setting\n"
-"        --config convert.cvsps=builtin\n"
+"    Internal cvsps is selected by setting ::\n"
+"\n"
+"      --config convert.cvsps=builtin\n"
+"\n"
 "    and has a few more configurable options:\n"
-"        --config convert.cvsps.cache=True     (boolean)\n"
-"            Set to False to disable remote log caching, for testing and\n"
-"            debugging purposes.\n"
-"        --config convert.cvsps.fuzz=60        (integer)\n"
-"            Specify the maximum time (in seconds) that is allowed\n"
-"            between commits with identical user and log message in a\n"
-"            single changeset. When very large files were checked in as\n"
-"            part of a changeset then the default may not be long\n"
-"            enough.\n"
-"        --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
-"            Specify a regular expression to which commit log messages\n"
-"            are matched. If a match occurs, then the conversion\n"
-"            process will insert a dummy revision merging the branch on\n"
-"            which this log message occurs to the branch indicated in\n"
-"            the regex.\n"
-"        --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
-"            Specify a regular expression to which commit log messages\n"
-"            are matched. If a match occurs, then the conversion\n"
-"            process will add the most recent revision on the branch\n"
-"            indicated in the regex as the second parent of the\n"
-"            changeset.\n"
+"\n"
+"    --config convert.cvsps.cache=True         (boolean)\n"
+"        Set to False to disable remote log caching, for testing and\n"
+"        debugging purposes.\n"
+"    --config convert.cvsps.fuzz=60            (integer)\n"
+"        Specify the maximum time (in seconds) that is allowed between\n"
+"        commits with identical user and log message in a single\n"
+"        changeset. When very large files were checked in as part of a\n"
+"        changeset then the default may not be long enough.\n"
+"    --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
+"        Specify a regular expression to which commit log messages are\n"
+"        matched. If a match occurs, then the conversion process will\n"
+"        insert a dummy revision merging the branch on which this log\n"
+"        message occurs to the branch indicated in the regex.\n"
+"    --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
+"        Specify a regular expression to which commit log messages are\n"
+"        matched. If a match occurs, then the conversion process will\n"
+"        add the most recent revision on the branch indicated in the\n"
+"        regex as the second parent of the changeset.\n"
 "\n"
 "    The hgext/convert/cvsps wrapper script allows the builtin\n"
 "    changeset merging code to be run without doing a conversion. Its\n"
@@ -737,7 +1061,6 b' msgid ""'
 "    --config convert.p4.startrev=0            (perforce changelist number)\n"
 "        specify initial Perforce revision.\n"
 "\n"
-"\n"
 "    Mercurial Destination\n"
 "    ---------------------\n"
 "\n"
@@ -750,6 +1073,229 b' msgid ""'
 "\n"
 "    "
 msgstr ""
+"Konvertiert Archive unter anderem VCS in ein Mercurial Archiv\n"
+"\n"
+"    Erkannte Quellformate [Befehlsoption]:\n"
+"\n"
+"    - Mercurial [hg]\n"
+"    - CVS [cvs]\n"
+"    - Darcs [darcs]\n"
+"    - git [git]\n"
+"    - Subversion [svn]\n"
+"    - Monotone [mtn]\n"
+"    - GNU Arch [gnuarch]\n"
+"    - Bazaar [bzr]\n"
+"    - Perforce [p4]\n"
+"\n"
+"    Erlaubte Zielformate [Befehlsoption]:\n"
+"\n"
+"    - Mercurial [hg]\n"
+"    - Subversion [svn] (Historie con Zweigen wird nicht erhalten)\n"
+"\n"
+"    Wenn keine Revision angegeben ist, werden alle konvertiert.\n"
+"    Andernfalls werden alle Revision bis zur angegebenen konvertiert.\n"
+"    Die Revisionsangabe muss für das Quellsystem verständlich sein.\n"
+"\n"
+"    Wenn kein Zielverzeichnisname angegeben ist, wird die Endung \"-hg\"\n"
+"    an den Namen der Quelle angehängt. Wenn das Ziel nicht existiert, wird\n"
+"    es erstellt.\n"
+"\n"
+"    Standardmäßig wird die Option \"--branchsort\" für alle Quellen ausser\n"
+"    Mercurial verwendet. Mercurial verwendet \"--sourcesort\", um die\n"
+"    ursprüngliche Reihenfolge der Revisionsnummern zu erhalten.\n"
+"    Die Sortieroptionen haben folgende Effekte:\n"
+"\n"
+"    --branchsort  Konvertiert von Vorfahr zum Kind wenn möglich. Das\n"
+"                  bedeutet, dass Zweige nacheinander konvertiert "
+"werden.                  Dies führt zu kompakteren Archiven.\n"
+"\n"
+"    --datesort    Sortiert die Revisionen nach Datum. Die fertigen Archive\n"
+"                  haben ein gut lesbares Meldungs-Logbuch, sind aber häufig\n"
+"                  eine Zehnerpotenz größer als mit \"branchsort\" "
+"erstellte.\n"
+"\n"
+"    --sourcesort  Versucht die Reihenfolge der Quellrevisionen zu erhalten.\n"
+"                  Dies ist nur von Mercurial als Quelle unterstützt.\n"
+"\n"
+"    Die Datei <REVMAP> (standardmäßig .hg/shamap im Zielarchiv) ist eine\n"
+"    einfache Textdatei, durch die jede Quellrevision per Id mit der Ziel-\n"
+"    revision assoziiert. Das Format ist::\n"
+"\n"
+"      <Quell ID> <Ziel ID>\n"
+"\n"
+"    Diese Datei wird erstellt, wenn sie nicht existiert. Sie wird durch\n"
+"    jeden konvertierten Änderungssatz erweitert, so dass unterbrochene\n"
+"    Konvertierungen durch erneuten Aufruf fortgesetzt werden können.\n"
+"\n"
+"    Die [Nutzernamen-Zuordnungsdatei] ist eine Textdatei die jeden Autor\n"
+"    von Revisionen in der Quelle einem Ziel-Autor zuweist. Dies ist\n"
+"    praktisch für VCS, die Unix-Login zur Identifikation von Autoren\n"
+"    verwenden, wie z.B. CVS. Das Format ist pro Zeile::\n"
+"\n"
+"      <Quellauthor>=<Zeichenkette, z.B. Email und Benutzername>\n"
+"\n"
+"    Eine weitere Abbildungsdatei für Dateinamen erlaubt eine Filterung und\n"
+"    Umbenennung von Dateien und Verzeichnissen. Kommentarzeilen beginnen "
+"mit\n"
+"    einem #. Jede Zeile kann eine der folgenden Direktiven enthalten::\n"
+"\n"
+"      include pfad/zu/datei\n"
+"\n"
+"      exclude pfad/zu/datei\n"
+"\n"
+"      rename von/datei zu/datei\n"
+"\n"
+"    Ist eine \"include\" Direktive angegeben, so werden genau diese Dateien\n"
+"    bzw. alle Dateien in diesen Verzeichnissen ins Zielarchiv übernommen\n"
+"    alle anderen nicht. Durch die \"exclude\" Direktive werden solche\n"
+"    Dateien oder Verzeichnisse angegeben, die nicht übernommen werden "
+"sollen.\n"
+"    Und \"rename\" schliesslich benennt eine Datei oder Verzeichnis um.\n"
+"    Um von einem Unterverzeichnis der Quelle in die Wurzel des Zielarchivs\n"
+"    umzubenennen, kann '.' als Pfad der Zieldatei angegeben werden.\n"
+"\n"
+"    Die Spleißdatei erlaubt die künstliche Einführung von Vorfahrver-\n"
+"    bindungen. Die ist nützlich, wenn einer Zusammenführung unter "
+"Subversion\n"
+"    der andere Vorfahr angegeben werden soll oder zwei ansonsten "
+"unabhängige\n"
+"    Entwicklungslinien verbunden werden sollen. Jeder Eintrag enthält eine\n"
+"    Revisions-ID des Quellarchivs, eine Leerstelle und eine oder (mit "
+"Komma)\n"
+"    zwei Revisions-IDs, die als Vorfahren der ersten angenommen werden\n"
+"    sollen. Die Vorfahren-IDs können entweder im Format der Quelle oder des\n"
+"    Ziels angegeben werden.\n"
+"\n"
+"    Die Zweig-Abbildungsdatei erlaubt das Umbenennen von Zweigen. Zusammen\n"
+"    mit der Spleißdatei können so auch sehr unorganisierte Archive in\n"
+"    ein gute strukturiertes Mercurial-Archiv konvertiert werden.\n"
+"    Die Zeilen dieser Datei sind von der Form \"original neuer_name\".\n"
+"    Damit kann z.B. Code aus \"default\" eines Archivs in einen benannten\n"
+"    Zweig des Ziels gebracht werden.\n"
+"\n"
+"    Mercurial als Quelle\n"
+"    --------------------\n"
+"\n"
+"    --config convert.hg.ignoreerrors=False    (boolean)\n"
+"        Ignoriert Integritätsfehler beim Lesen. Wir benutzt um Mercurial-\n"
+"        Archive ohne RevLog und eines mit RevLog zu konvertieren.\n"
+"    --config convert.hg.saverev=False         (boolean)\n"
+"        Speichert die Original-Revisions-ID im Änderunsgsatz (erzwingt\n"
+"        Änderung der Ziel-IDs)\n"
+"    --config convert.hg.startrev=0            (hg Revisions-ID)\n"
+"        Konvertiert alle Nachfahren ab Startrevision\n"
+"\n"
+"    CVS als Quelle\n"
+"    --------------\n"
+"\n"
+"    Mit CVS als Quelle wird eine Sandkastenumgebung (also eine "
+"Arbeitskopie)\n"
+"    verwenden, um den Beginn der Konversion anzuzeigen. Direkter Zugriff\n"
+"    auf das Archiv ist nicht nötig, es sei denn es ist ein :lokales: "
+"Archiv.\n"
+"    Die Konversion sucht das CVS Verzeichnis in der Wurzel der Arbeitskopie\n"
+"    und verwendet die CVS rlog Kommandos um alle Dateien für die Konversion\n"
+"    zu finden. Wird also keine Abbildungsdatei für Dateinamen verwendet, so\n"
+"    werden alle Dateien unterhalb des Startverzeichnisses konvertiert und\n"
+"    jegliche Verzeichnis-Umordnung im Sandkasten ignoriert.\n"
+"\n"
+"    Da CVS kein Konzept von Änderungssätzen hat, muss jedes einzelne\n"
+"    Übernehmen in Änderungssätze vereinigt werden. Das Standardprogramm\n"
+"    (cvsps) welches dazu verwendet wird kann gewechselt werden::\n"
+"\n"
+"      --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"\n"
+"    This option is deprecated and will be removed in Mercurial 1.4.\n"
+"\n"
+"    Die oben gezeigten Argumente entsprechend dem Standardaufruf.\n"
+"\n"
+"    Das interne cvsps kann so gewählt werden::\n"
+"\n"
+"      --config convert.cvsps=builtin\n"
+"\n"
+"    und hat weitere konfigurierbare Optionen:\n"
+"\n"
+"    --config convert.cvsps.cache=True         (boolean)\n"
+"        Kann für Tests oder Debugging deaktiviert werden, um das Zwischen-\n"
+"        speichern des Quell-Logbuchs zu unterbinden.\n"
+"    --config convert.cvsps.fuzz=60            (Ganzzahl)\n"
+"        Spezifiziert die maximale Zeit (in Sekunden) die zwischen einzelnen\n"
+"        Dateiübernahmen mit selbem Benutzer und Meldung erlaubt sind, damit\n"
+"        sie in den gleichen Änderungssatz übernommen werden. Wenn sehr\n"
+"        große Dateien übernommen wurden, ist der Standard vielleicht zu "
+"klein.\n"
+"    --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
+"        Spezifiziert Zweignamen durch einen Regulären Ausdruck, auf die hin\n"
+"        Versionsmeldungen untersucht werden. Bei Entsprechung wird eine\n"
+"        künstliche Revision als Zusammenführung des aktuellen mit dem\n"
+"        gefunden Zweig eingefügt.\n"
+"    --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
+"        Spezifiziert Zweignamen durch einen Regulären Ausdruck, auf die hin\n"
+"        Versionsmeldungen untersucht werden. Bei Entsprechung wird die\n"
+"        jüngste Revision des angegebenen Zweigs als zweiter Vorfahr der\n"
+"        aktuellen Revision angenommen.\n"
+"\n"
+"    Mit dem Skript hgext/convert/cvsps kann man die interne Zusammenführung\n"
+"    auch ohne Konversation ausführen. Die Parameter sind denen von cvsps "
+"2.1\n"
+"    ähnlich.\n"
+"\n"
+"    Subversion als Quelle\n"
+"    ---------------------\n"
+"\n"
+"    Die trunk/branch/tag Konvention von Subversion wird erkannt:\n"
+"    Standardmäßig wird entweder die angegebene Quell-URL \"svn://repo/pfad"
+"\"\n"
+"    oder ein Unterverzeichnis 'trunk' (falls dies existiert) als einzelner\n"
+"    (default) Zweig angenommen. Wenn ein 'branches' Unterverzeichnis\n"
+"    gefunden wird, so werden dessen Unterverzeichnisse als mögliche Zweige\n"
+"    aufgenommen. Wenn 'tags' existiert, wird es auf Zweigverweise hin "
+"unter-\n"
+"    sucht. Die Standardwerte 'trunk', 'branches' und 'tags' können mit den\n"
+"    folgenden Optionen überschrieben werden. Sie können auf einen Pfad\n"
+"    relativ zur Quell-URL gesetzt oder leer gelassen werden, um die\n"
+"    automatische Erkennung zu verhindern.\n"
+"\n"
+"    --config convert.svn.branches=branches    (Verzeichnisname)\n"
+"        Spezifiziert das Verzeichnis für die Zweige\n"
+"    --config convert.svn.tags=tags            (Verzeichnisname)\n"
+"        Spezifiziert das Verzeichnis für Etiketten\n"
+"    --config convert.svn.trunk=trunk          (Verzeichnisname)\n"
+"        Spezifiziert den Namen des Hauptzweigs\n"
+"\n"
+"    Nur die Konversion von einzelnen Zweigen ist unterstützt. Die Quell-\n"
+"    historie kann vollständig oder ab einer gegebenen Startrevision erfasst\n"
+"    werden:\n"
+"\n"
+"    --config convert.svn.startrev=0           (svn Revisionsnummer)\n"
+"        Spezifiziert eine Startrevision\n"
+"\n"
+"    Perforce als Quelle\n"
+"    -------------------\n"
+"\n"
+"    Der Perforce (P4) Importierer kann einen p4 Depotpfad oder eine Client-\n"
+"    Spezifikation als Quelle annehmen. Alle Dateien werden in ein flaches\n"
+"    Mercurial-Archiv konvertiert und ignoriert dabei Label, Zweige und\n"
+"    Integrationen. Bei Angabe eines Depotpfads wollte auch ein Zielpfad\n"
+"    genannt werden, da dieser sonst als ...-hg ausfallen kann.\n"
+"\n"
+"    Es ist möglich die zu konvertierte Quellhistorie durch Angabe einer\n"
+"    Startrevision zu begrenzen.\n"
+"\n"
+"    --config convert.p4.startrev=0            (perforce changelist-Nummer)\n"
+"        Spezifiziert eine Startrevision\n"
+"\n"
+"    Mercurial als Ziel\n"
+"    ------------------\n"
+"\n"
+"    --config convert.hg.clonebranches=False   (boolean)\n"
+"        Lagert Quellzweige in separaten Klonen ab.\n"
+"    --config convert.hg.tagsbranch=default    (Zweigname)\n"
+"        tag revisions branch name\n"
+"    --config convert.hg.usebranchnames=True   (boolean)\n"
+"        Erhält die Zweignamen\n"
+"\n"
+"    "
 
 msgid ""
 "create changeset information from CVS\n"
@@ -765,37 +1311,37 b' msgid ""'
 msgstr ""
 
 msgid "username mapping filename"
-msgstr ""
+msgstr "Abbildungsdatei für Benutzernamen"
 
 msgid "destination repository type"
-msgstr ""
+msgstr "Zielarchivtyp"
 
 msgid "remap file names using contents of file"
-msgstr ""
+msgstr "Abbildungsdatei für Datei- und Verzeichnisnamen"
 
 msgid "import up to target revision REV"
-msgstr ""
+msgstr "Importiere bis einschliesslich Revision REV"
 
 msgid "source repository type"
-msgstr ""
+msgstr "Quellarchivtyp"
 
 msgid "splice synthesized history into place"
-msgstr ""
+msgstr "Spleißabbildungsdatei"
 
 msgid "change branch names while converting"
-msgstr ""
+msgstr "Zweignamen-Abbildungsdatei"
 
 msgid "try to sort changesets by branches"
-msgstr ""
+msgstr "Sortiere Änderungssätze nach Zweigen"
 
 msgid "try to sort changesets by date"
-msgstr ""
+msgstr "Sortiere Ändeungssätze nach Datum"
 
 msgid "preserve source changesets order"
-msgstr ""
+msgstr "Erhalte Reihenfolge der Quellrevisionen"
 
 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
-msgstr ""
+msgstr "hg convert [OPTION]... QUELLE [ZIEL [REVMAP]]"
 
 msgid "only return changes on specified branches"
 msgstr ""
@@ -834,57 +1380,55 b' msgid ""'
 "warning: lightweight checkouts may cause conversion failures, try with a "
 "regular branch instead.\n"
 msgstr ""
+"Warnung: Leichte Arbeitskopien können zu Konversationsfehlern führen; erwäge "
+"einen regulären Zweig zu nutzen.\n"
 
 msgid "bzr source type could not be determined\n"
-msgstr ""
+msgstr "bzw Quelltyp konnte nicht ermittelt werden\n"
 
 #, python-format
 msgid "%s is not a valid revision in current branch"
-msgstr ""
+msgstr "%s is keine gültige Revision im aktuellen Zweig"
 
 #, python-format
 msgid "%s is not available in %s anymore"
-msgstr ""
+msgstr "%s ist nicht mehr in %s zu finden"
 
 #, python-format
 msgid "%s.%s symlink has no target"
-msgstr ""
+msgstr "Ziel der Verknüpfung %s.%s fehlt"
 
 #, python-format
 msgid "cannot find required \"%s\" tool"
-msgstr ""
+msgstr "Kann benötigtes Werkzeug\"%s\" nicht finden"
 
 #, python-format
 msgid "running: %s\n"
-msgstr ""
+msgstr "führe aus: %s\n"
 
 #, python-format
 msgid "%s error:\n"
-msgstr ""
-
-#, python-format
-msgid "%s %s"
-msgstr ""
+msgstr "%s Fehler:\n"
 
 #, python-format
 msgid "syntax error in %s(%d): key/value pair expected"
-msgstr ""
+msgstr "Syntaxfehler in %s(%d): Schlüssel/Wert-Paar erwartet"
 
 #, python-format
 msgid "could not open map file %r: %s"
-msgstr ""
+msgstr "Kann Abbildungsdatei %r nicht öffnen: %s"
 
 #, python-format
 msgid "%s: missing or unsupported repository"
-msgstr ""
+msgstr "%s: Fehlendes oder nicht unterstütztes Archiv"
 
 #, python-format
 msgid "convert: %s\n"
-msgstr ""
+msgstr "Konvertiert: %s\n"
 
 #, python-format
 msgid "%s: unknown repository type"
-msgstr ""
+msgstr "%s: Unbekannter Archivtyp"
 
 #, python-format
 msgid "unknown sort mode: %s"
@@ -892,190 +1436,202 b' msgstr "Unbekannter Sortiermodus: %s"'
 
 #, python-format
 msgid "cycle detected between %s and %s"
-msgstr ""
+msgstr "Schleife gefunden zwischen %s und %s"
 
 msgid "not all revisions were sorted"
-msgstr ""
+msgstr "Nicht alle Revisionen konnten sortiert werden"
 
 #, python-format
 msgid "Writing author map file %s\n"
-msgstr ""
+msgstr "Schreibe Autoren-Abbildungsdatei %s\n"
 
 #, python-format
 msgid "Ignoring bad line in author map file %s: %s\n"
-msgstr ""
+msgstr "Ignoriere irreguläre Zeile in Autoren-Abbildungsdatei %s: %s\n"
 
 #, python-format
 msgid "mapping author %s to %s\n"
-msgstr ""
+msgstr "Bilder Autor %s auf %s ab\n"
 
 #, python-format
 msgid "overriding mapping for author %s, was %s, will be %s\n"
-msgstr ""
+msgstr "Überschreibe Abbildung für Autor %s: war %s, wird %s\n"
 
 #, python-format
 msgid "spliced in %s as parents of %s\n"
 msgstr ""
 
 msgid "scanning source...\n"
-msgstr ""
+msgstr "Untersuche Quelle...\n"
 
 msgid "sorting...\n"
-msgstr ""
+msgstr "Sortiere...\n"
 
 msgid "converting...\n"
-msgstr ""
+msgstr "Konvertiere...\n"
 
 #, python-format
 msgid "source: %s\n"
-msgstr ""
+msgstr "Quelle: %s\n"
 
 #, python-format
 msgid "assuming destination %s\n"
-msgstr ""
+msgstr "Annahme für Ziel: %s\n"
 
 msgid "more than one sort mode specified"
 msgstr "Mehr als ein Sortiermodus angegeben"
 
 msgid "--sourcesort is not supported by this data source"
-msgstr ""
+msgstr "Option --sourcesort ist für diese Archivquelle nicht unterstützt"
 
 msgid ""
 "warning: support for external cvsps is deprecated and will be removed in "
 "Mercurial 1.4\n"
 msgstr ""
+"Warnung: Unterstützung für externes cvsps ist veraltet und wird in Mercurial "
+"1.4 entfernt\n"
 
 #, python-format
 msgid "revision %s is not a patchset number or date"
-msgstr ""
+msgstr "Revision %s ist weder ein Satz von Patchnummern noch ein Datum"
 
 msgid "using builtin cvsps\n"
-msgstr ""
+msgstr "Nutze internes cvsps\n"
 
 #, python-format
 msgid "connecting to %s\n"
-msgstr ""
+msgstr "Verbinde mit %s\n"
 
 msgid "CVS pserver authentication failed"
-msgstr ""
-
-msgid "server sucks"
-msgstr ""
+msgstr "CVS pserver Authentifikation fehlgeschlagen"
+
+#, python-format
+msgid ""
+"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
+msgstr ""
+"Unerwartete Antwort vom CVS Server: erwartete \"Valid-requsts\", war %r"
 
 #, python-format
 msgid "%d bytes missing from remote file"
-msgstr ""
+msgstr "%d Bytes fehlen in entfernter Datei"
 
 #, python-format
 msgid "cvs server: %s\n"
-msgstr ""
+msgstr "CVS Server: %s\n"
 
 #, python-format
 msgid "unknown CVS response: %s"
-msgstr ""
+msgstr "Unbekannte CVS Antwort: %s"
 
 msgid "collecting CVS rlog\n"
-msgstr ""
+msgstr "Sammle CVS rlog\n"
 
 #, python-format
 msgid "reading cvs log cache %s\n"
-msgstr ""
+msgstr "Lese CVS Logbuch aus Zwischenspeicher %s\n"
 
 #, python-format
 msgid "cache has %d log entries\n"
-msgstr ""
+msgstr "Zwischenspeicher har %d Logbucheinträge\n"
 
 #, python-format
 msgid "error reading cache: %r\n"
-msgstr ""
+msgstr "Fehler beim Lesen des Zwischenspeichers: %r\n"
 
 #, python-format
 msgid "running %s\n"
-msgstr ""
+msgstr "Führe aus: %s\n"
 
 #, python-format
 msgid "prefix=%r directory=%r root=%r\n"
 msgstr ""
 
 msgid "RCS file must be followed by working file"
-msgstr ""
+msgstr "RCS Datei muss von Arbeitsdatei gefolgt sein"
 
 msgid "must have at least some revisions"
-msgstr ""
+msgstr "Mindestens ein paar Revisionen sind benötigt"
 
 msgid "expected revision number"
-msgstr ""
+msgstr "Revisionsnummer erwartet"
 
 msgid "revision must be followed by date line"
-msgstr ""
+msgstr "Revision muss von einer Datumszeile gefolgt sein"
 
 #, python-format
 msgid "found synthetic revision in %s: %r\n"
-msgstr "Synthetische Revision gefundein in %s: %r\n"
+msgstr "Synthetische Revision gefunden in %s: %r\n"
 
 #, python-format
 msgid "writing cvs log cache %s\n"
-msgstr ""
+msgstr "Schreibe CVS Logbuch-Zwischenspeicher %s\n"
 
 #, python-format
 msgid "%d log entries\n"
-msgstr ""
+msgstr "%d Logbucheinträge\n"
 
 msgid "creating changesets\n"
-msgstr ""
+msgstr "Kreiere Änderungssätze\n"
 
 msgid "synthetic changeset cannot have multiple parents"
-msgstr ""
+msgstr "Synthetische Änderungssätze können nicht mehrere Vorfahren haben"
 
 #, python-format
 msgid ""
 "warning: CVS commit message references non-existent branch %r:\n"
 "%s\n"
 msgstr ""
+"Warnung: CVS Versionsmeldung benennt nicht existierenden Zweig %r:\n"
+"%s\n"
 
 #, python-format
 msgid "%d changeset entries\n"
-msgstr ""
+msgstr "%d Änderungen im Satz\n"
+
+#, python-format
+msgid "darcs version 2.1 or newer needed (found %r)"
+msgstr "darcs Version 2.1 oder neuer benötigt (%r gefunden)"
 
 msgid "Python ElementTree module is not available"
-msgstr ""
+msgstr "Python-Modul ElementTree ist nicht verfügbar"
 
 #, python-format
 msgid "cleaning up %s\n"
-msgstr ""
+msgstr "Räume auf: %s\n"
 
 msgid "internal calling inconsistency"
-msgstr ""
+msgstr "Inkonsistenz bei internem Aufruf"
 
 msgid "errors in filemap"
-msgstr ""
+msgstr "Fehler in Dateinamen-Abbildungsdatei"
 
 #, python-format
 msgid "%s:%d: %r already in %s list\n"
-msgstr ""
+msgstr "%s:%d: %r ist bereits in %s-Liste\n"
 
 #, python-format
 msgid "%s:%d: unknown directive %r\n"
-msgstr ""
+msgstr "%s:%d: Unbekannte Direktive %r\n"
 
 msgid "source repository doesn't support --filemap"
-msgstr ""
+msgstr "Quellarchiv unterstützt die Option --filemap nicht"
 
 #, python-format
 msgid "%s does not look like a GNU Arch repo"
-msgstr ""
+msgstr "%s scheint kein GNU Arch Archiv zu sein"
 
 msgid "cannot find a GNU Arch tool"
-msgstr ""
+msgstr "Kann das GNU Arch-Programm nicht finden"
 
 #, python-format
 msgid "analyzing tree version %s...\n"
-msgstr ""
+msgstr "Analysiere Baumversion %s...\n"
 
 #, python-format
 msgid ""
 "tree analysis stopped because it points to an unregistered archive %s...\n"
 msgstr ""
+"Baumanalyse gestoppt, da er ein unregistriertes Archiv referenziert %s...\n"
 
 #, python-format
 msgid "applying revision %s...\n"
@@ -1113,21 +1669,21 b' msgstr ""'
 
 #, python-format
 msgid "pulling from %s into %s\n"
-msgstr ""
+msgstr "Hole von %s nach %s\n"
 
 msgid "filtering out empty revision\n"
 msgstr "Leere Revision wird ausgefiltert\n"
 
 msgid "updating tags\n"
-msgstr ""
+msgstr "Aktualisiere Etiketten\n"
 
 #, python-format
 msgid "%s is not a valid start revision"
-msgstr ""
+msgstr "%s ist keine gültige Startrevision"
 
 #, python-format
 msgid "ignoring: %s\n"
-msgstr ""
+msgstr "ignoriere: %s\n"
 
 msgid "run hg source pre-conversion action\n"
 msgstr ""
@@ -1137,140 +1693,125 b' msgstr ""'
 
 #, python-format
 msgid "%s does not look like a monotone repo"
-msgstr ""
+msgstr "%s scheint kein monotone-Archiv zu sein"
 
 #, python-format
 msgid "copying file in renamed directory from '%s' to '%s'"
-msgstr ""
+msgstr "Kopiere Dateien in unbenanntem Verzeichnis von '%s' nach '%s'"
 
 msgid "reading p4 views\n"
-msgstr ""
+msgstr "Lese p4 Ansichten\n"
 
 msgid "collecting p4 changelists\n"
-msgstr ""
+msgstr "Sammle p4 Änderungslisten\n"
 
 msgid "Subversion python bindings could not be loaded"
-msgstr ""
+msgstr "Pythons Subversion-Unterstützung konnte nicht geladen werden"
 
 #, python-format
 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
-msgstr ""
+msgstr "Pythons Subversion-Unterstützung in Version %d.%d gefunden aber mind. 1.4 benötigt "
 
 msgid "Subversion python bindings are too old, 1.4 or later required"
-msgstr ""
+msgstr "Pythons Subversion-Unterstützung ist zu alt. Mind. Version 1.4 benötigt "
 
 #, python-format
 msgid "svn: revision %s is not an integer"
-msgstr ""
+msgstr "svn: Revision %s ist keine Ganzzahl"
 
 #, python-format
 msgid "svn: start revision %s is not an integer"
-msgstr ""
+msgstr "svn: Startrevision %s ist keine Ganzzahl"
 
 #, python-format
 msgid "no revision found in module %s"
-msgstr ""
+msgstr "Keine Revision in Modul %s gefunden"
 
 #, python-format
 msgid "expected %s to be at %r, but not found"
-msgstr ""
+msgstr "%s bei %r erwartet aber nicht gefunden"
 
 #, python-format
 msgid "found %s at %r\n"
-msgstr ""
+msgstr "%s bei %r gefunden\n"
 
 #, python-format
 msgid "ignoring empty branch %s\n"
-msgstr ""
+msgstr "ignoriere leeren Zweig %s\n"
 
 #, python-format
 msgid "found branch %s at %d\n"
-msgstr ""
+msgstr "Zweig %s bei %d gefunden\n"
 
 msgid "svn: start revision is not supported with more than one branch"
-msgstr ""
+msgstr "svn: Startrevision ist nur für einzelnen Zweig unterstützt"
 
 #, python-format
 msgid "svn: no revision found after start revision %d"
-msgstr ""
+msgstr "svn: Keine Revision nach Startrevision %d gefunden"
 
 #, python-format
 msgid "no tags found at revision %d\n"
-msgstr ""
+msgstr "Keine Etiketten in Revision %d gefunden\n"
 
 #, python-format
 msgid "ignoring foreign branch %r\n"
-msgstr ""
+msgstr "Ignoriere externen Zweig %r\n"
 
 #, python-format
 msgid "%s not found up to revision %d"
-msgstr ""
+msgstr "%s nicht in Revision %d gefunden"
 
 #, python-format
 msgid "branch renamed from %s to %s at %d\n"
-msgstr ""
+msgstr "Zweig von %s auf %s bei %d umbenannt\n"
 
 #, python-format
 msgid "reparent to %s\n"
-msgstr ""
+msgstr "Vorfahrwechsel zu %s\n"
 
 #, python-format
 msgid "copied to %s from %s@%s\n"
-msgstr ""
+msgstr "Kopiert von %s nach %s@%s\n"
 
 #, python-format
 msgid "gone from %s\n"
 msgstr ""
 
 #, python-format
-msgid "found parent directory %s\n"
-msgstr ""
-
-#, python-format
-msgid "base, entry %s %s\n"
-msgstr ""
-
-msgid "munge-o-matic\n"
-msgstr ""
-
-#, python-format
-msgid "info: %s %s %s %s\n"
-msgstr ""
+msgid "entry %s\n"
+msgstr "Eintrag %s\n"
 
 #, python-format
 msgid "unknown path in revision %d: %s\n"
-msgstr ""
+msgstr "Unbekannter Pfad in Revision %d: %s\n"
 
 #, python-format
 msgid "mark %s came from %s:%d\n"
-msgstr ""
+msgstr "Markierung %s kam von %s:%d\n"
 
 #, python-format
 msgid "parsing revision %d (%d changes)\n"
-msgstr ""
+msgstr "Analysiere Revision %d (%d Änderungen)\n"
 
 #, python-format
 msgid "found parent of branch %s at %d: %s\n"
-msgstr ""
+msgstr "Vorfahr con Zweig %s gefunden in %d: %s\n"
 
 msgid "no copyfrom path, don't know what to do.\n"
 msgstr ""
 
 #, python-format
 msgid "fetching revision log for \"%s\" from %d to %d\n"
-msgstr ""
-
-#, python-format
-msgid "skipping blacklisted revision %d\n"
-msgstr ""
+msgstr "Hole Revisionslogbuch für \"%s\" aus %d nach %d\n"
 
 #, python-format
 msgid "revision %d has no entries\n"
-msgstr ""
+msgstr "Revision %d hat keine Einträge\n"
 
 #, python-format
 msgid "svn: branch has no revision %s"
-msgstr ""
+msgstr "svn: Zweig hat keine Revisionen: %s"
 
 #, python-format
 msgid "%r is not under %r, ignoring\n"
@@ -1285,29 +1826,25 b' msgid "initializing svn wc %r\\n"'
 msgstr ""
 
 msgid "unexpected svn output:\n"
-msgstr ""
+msgstr "Unerwartete Ausgabe von Subversion:\n"
 
 msgid "unable to cope with svn output"
-msgstr ""
+msgstr "Ausgabe von Subversion nicht verstanden"
 
 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
 msgstr ""
 
 msgid ""
-"\n"
-"The `extdiff' Mercurial extension allows you to use external programs\n"
-"to compare revisions, or revision with working directory. The external diff\n"
-"programs are called with a configurable set of options and two\n"
+"command to allow external programs to compare revisions\n"
+"\n"
+"The extdiff Mercurial extension allows you to use external programs\n"
+"to compare revisions, or revision with working directory. The external\n"
+"diff programs are called with a configurable set of options and two\n"
 "non-option arguments: paths to directories containing snapshots of\n"
 "files to compare.\n"
 "\n"
-"To enable this extension:\n"
-"\n"
-"  [extensions]\n"
-"  hgext.extdiff =\n"
-"\n"
-"The `extdiff' extension also allows to configure new diff commands, so\n"
-"you do not need to type \"hg extdiff -p kdiff3\" always.\n"
+"The extdiff extension also allows to configure new diff commands, so\n"
+"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
 "\n"
 "  [extdiff]\n"
 "  # add new command that runs GNU diff(1) in 'context diff' mode\n"
@@ -1323,39 +1860,72 b' msgid ""'
 "  meld =\n"
 "\n"
 "  # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
-"  # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
-"  # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
-"in\n"
+"  # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
+"  # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
 "  # your .vimrc\n"
 "  vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
 "\n"
 "You can use -I/-X and list of file or directory names like normal \"hg\n"
-"diff\" command. The `extdiff' extension makes snapshots of only needed\n"
+"diff\" command. The extdiff extension makes snapshots of only needed\n"
 "files, so running the external diff program will actually be pretty\n"
 "fast (at least faster than having to compare the entire tree).\n"
 msgstr ""
+"Erlaubt externen Programmen, Revisionen zu vergleichen\n"
+"\n"
+"Die extdiff Erweiterung erlaubt es, zwei Revisionen oder eine Revision mit\n"
+"dem Arbeitsverzeichnis durch ein externes Programm vergleichen zu lassen.\n"
+"Ein solches Programm wird mit konfigurierbaren Parameters und zwei nicht-\n"
+"Optionen aufgerufen. Dies sind die Pfad zu den zu vergleichenden Daten.\n"
+"\n"
+"Durch diese Erweiterung lassen sich auch neue hg-Kommandos definieren, damit\n"
+"man nicht immer \"hg extdiff -p kdiffs\" eintippen muss. ::\n"
+"\n"
+"  [extdiff]\n"
+"  # Fügt neues Kommando für GNU diff(1) im 'context diff' Modus hinzu\n"
+"  cdiff = gdiff -Nprc5\n"
+"  ## oder auf die alte Art:\n"
+"  #cmd.cdiff = gdiff\n"
+"  #opts.cdiff = -Nprc5\n"
+"\n"
+"  # Fügt neues Kommando \"vdiff\" hinzu, welches kdiff3 ausführt\n"
+"  vdiff = kdiff3\n"
+"\n"
+"  # Fügt Kommando \"meld\" hinzu, welches meld ausführt (Name muss nicht\n"
+"  # wiederholt werden)\n"
+"  meld =\n"
+"\n"
+"  # Fügt Kommando \"vimdiff\" hinzu, welches gvimdiff mit dem DirDiff Plugin\n"
+"  # ausführt. (http://www.vim.org/scripts/script.php?script_id=102).\n"
+"  # Die .vimrc sollte dazu \"let g:DirDiffDynamicDiffText = 1\" enthalten.\n"
+"  vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
+"\n"
+"Neue Kommandos verstehen -I/-X und Dateilisten wie das übliche \"hg diff\".\n"
+"In den Schnappschüssen (die temporären Vergleichsdateien) sind nur die\n"
+"für den Vergleich notwendigen Dateien, damit die Ausführung des externen\n"
+"Programms schneller läuft (als wenn vollständige Projektbäume verglichen\n"
+"würden).\n"
 
 #, python-format
 msgid "making snapshot of %d files from rev %s\n"
-msgstr ""
+msgstr "Erstelle Schnappschuss von %d Dateien aus Revision %s\n"
 
 #, python-format
 msgid "making snapshot of %d files from working directory\n"
-msgstr ""
+msgstr "Erstelle Schnappschuss von %d Dateien aus dem Arbeitsverzeichnis\n"
 
 msgid "cannot specify --rev and --change at the same time"
 msgstr "--rev und --change können nicht gleichzeitig angegeben werden"
 
 #, python-format
 msgid "running %r in %s\n"
-msgstr ""
+msgstr "Führe %r in %s aus\n"
 
 #, python-format
 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
-msgstr ""
+msgstr "Datei wurde während des Vergleichs verändert. Überschreibe: %s (Quelle: %s)\n"
 
 msgid "cleaning up temp directory\n"
-msgstr ""
+msgstr "Säubere temporäres Verzeichnis\n"
 
 msgid ""
 "use external program to diff repository (or selected files)\n"
@@ -1375,24 +1945,66 b' msgid ""'
 "    revisions are specified, the working directory files are compared\n"
 "    to its parent."
 msgstr ""
+"Externes Vergleichsprogramm für Archiv- oder Dateiänderungen\n"
+"\n"
+"    Zeigt die Unterschiede zwischen den Revisionen der angegeben Dateien\n"
+"    durch Aufruf eines externen Programms. Standardmäßig ist dies \"diff\"\n"
+"    mit den Optionen \"-Npru\".\n"
+"\n"
+"    Um ein anderes Programm zu verwenden, nutze die Option -p/--program.\n"
+"    Die zwei zu vergleichenden Verzeichnisse werden automatisch als Aufrufs-\n"
+"    parameter angenommen. Weitere Parameter können durch die Option\n"
+"    -o/--option hinzugefügt werden. Diese werden vor den Verzeichnisnamen\n"
+"    übergeben.\n"
+"\n"
+"    Werden zwei Revisionen angegeben, dann werden die Änderungen zwischen\n"
+"    diesen angezeigt. Ist nur eine Revision angegeben, so wird diese\n"
+"    mit dem Arbeitsverzeichnis verglichen. Ohne Angabe einer Revision\n"
+"    werden die lokalen Änderungen im Arbeitsverzeichnis zu seinem Vorfahren\n"
+"    angezeigt."
 
 msgid "comparison program to run"
-msgstr ""
+msgstr "das externe Vergleichsprogramm"
 
 msgid "pass option to comparison program"
-msgstr ""
+msgstr "Aufrufparameter für das Vergleichsprogramm"
 
 msgid "change made by revision"
 msgstr "Von dieser Revision erzeugte Änderungen"
 
 msgid "hg extdiff [OPT]... [FILE]..."
-msgstr ""
+msgstr "hg extdiff [OPT]... [DATEI]..."
+
+#, python-format
+msgid ""
+"use %(path)s to diff repository (or selected files)\n"
+"\n"
+"    Show differences between revisions for the specified files, using the\n"
+"    %(path)s program.\n"
+"\n"
+"    When two revision arguments are given, then changes are shown between\n"
+"    those revisions. If only one revision is specified then that revision "
+"is\n"
+"    compared to the working directory, and, when no revisions are "
+"specified,\n"
+"    the working directory files are compared to its parent."
+msgstr ""
+"Verwendet %(path)s um Archiv- oder Dateirevisionen zu vergleichen\n"
+"\n"
+"    Zeigt die Unterschiede zwischen Revisionen der angegebenen Dateien\n"
+"    durch das Programm %(path)s an.\n"
+"\n"
+"    Werden zwei Revisionen angegeben, dann werden die Änderungen zwischen\n"
+"    diesen angezeigt. Ist nur eine Revision angegeben, so wird diese\n"
+"    mit dem Arbeitsverzeichnis verglichen. Ohne Angabe einer Revision\n"
+"    werden die lokalen Änderungen im Arbeitsverzeichnis zu seinem Vorfahren\n"
+"    angezeigt."
 
 #, python-format
 msgid "hg %s [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "pulling, updating and merging in one command"
+msgstr "hg %s [OPTION]... [DATEI]..."
+
+msgid "pull, update and merge in one command"
 msgstr "Hole, aktualisiere und führe zusammen in einem Befehl"
 
 msgid ""
@@ -1415,7 +2027,7 b' msgid ""'
 "    "
 msgstr ""
 "Holt Änderungen aus einem entfernten Projektarchiv, führt neue Änderungen "
-"zusammen  wenn nötig.\n"
+"zusammen wenn nötig.\n"
 "\n"
 "    Dies selektiert alle Änderungen des Projektarchivs am angegebenen Pfad\n"
 "    oder der URL und fügt sie dem lokalen Projektarchiv hinzu.\n"
@@ -1486,10 +2098,6 b' msgid "merging with %d:%s\\n"'
 msgstr "Führe zusammen mit %d:%s\n"
 
 #, python-format
-msgid "Automated merge with %s"
-msgstr "Automatisierte Zusammenführung mit %s"
-
-#, python-format
 msgid "new changeset %d:%s merges remote changes with local\n"
 msgstr ""
 "Neuer Änderungssatz %d:%s führt entfernte Änderungen mit lokalen zusammen\n"
@@ -1509,34 +2117,37 b' msgstr "Vertauscht Vorg\xc3\xa4nger bei Zusammenf\xc3\xbchrung"'
 msgid "hg fetch [SOURCE]"
 msgstr "hg fetch [QUELLE]"
 
+msgid "commands to sign and verify changesets"
+msgstr "Nutzt eine Programm um den Fehlerstatus zu bestimmen"
+
 msgid "error while verifying signature"
 msgstr ""
 
 #, python-format
 msgid "%s Bad signature from \"%s\"\n"
-msgstr ""
+msgstr "%s Fehlerhafte Signatur von \"%s\"\n"
 
 #, python-format
 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
-msgstr ""
+msgstr "%s Anmerkung: Signatur ist veraltet (signiert von: \"%s\")\n"
 
 #, python-format
 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
-msgstr ""
+msgstr "%s Anmerkung: Dieser Schlüssel ist veraltet (signiert von: \"%s\")\n"
 
 msgid "list signed changesets"
-msgstr ""
+msgstr "Zeigt signierte Änderungssätze"
 
 #, python-format
 msgid "%s:%d node does not exist\n"
-msgstr ""
+msgstr "%s:%d Knoten existiert nicht\n"
 
 msgid "verify all the signatures there may be for a particular revision"
 msgstr ""
 
 #, python-format
 msgid "No valid signature for %s\n"
-msgstr ""
+msgstr "Keine gültige Signatur für %s\n"
 
 msgid ""
 "add a signature for the current or given revision\n"
@@ -1547,39 +2158,45 b' msgid ""'
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
+"Fügt der aktuellen oder gegebenen Revision eine Signatur hinzu\n"
+"\n"
+"    Wenn keine Revision angegeben ist, wird der Vorgänger des Arbeits-\n"
+"    verzeichnisses verwendet, oder die Spitze des Archivs, falls keine\n"
+"    (die null-) Version geladen ist.\n"
+"\n"
+"    Siehe 'hg help dates' für eine Liste gültiger Formate für -d/--date.\n"
+"    "
 
 msgid "uncommitted merge - please provide a specific revision"
 msgstr "Nicht versionierte Zusammenführung - bitte gib eine Revision an"
 
 msgid "Error while signing"
-msgstr ""
+msgstr "Fehler beim signieren"
 
 msgid ""
 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
 "force)"
 msgstr ""
-
-#, python-format
-msgid "Added signature for changeset %s"
-msgstr ""
+"Arbeitskopie der Datei .hgsigs wurde geändert (bitte manuell übernehmen oder"
+"--force verwendet)"
 
 msgid "unknown signature version"
-msgstr ""
+msgstr "Unbekannte Version der Signatur"
 
 msgid "make the signature local"
-msgstr ""
+msgstr "signiert nur lokal"
 
 msgid "sign even if the sigfile is modified"
-msgstr ""
+msgstr "signiere auch, wenn die Signaturdatei geändert ist"
 
 msgid "do not commit the sigfile after signing"
-msgstr ""
+msgstr "Signaturdatei nach dem Signieren nicht übernehmen"
 
 msgid "the key id to sign with"
-msgstr ""
+msgstr "Die Schlüssel-ID zum Signieren"
 
 msgid "commit message"
-msgstr ""
+msgstr "Versionsmeldung"
 
 msgid "hg sign [OPTION]... [REVISION]..."
 msgstr ""
@@ -1591,16 +2208,21 b' msgid "hg sigs"'
 msgstr ""
 
 msgid ""
-"show revision graphs in terminal windows\n"
+"command to view revision graphs from a shell\n"
 "\n"
 "This extension adds a --graph option to the incoming, outgoing and log\n"
 "commands. When this options is given, an ASCII representation of the\n"
 "revision graph is also shown.\n"
 msgstr ""
+"Zeigt ASCII Revisionsgraphen bei einigen Befehlen"
+"\n"
+"Diese Erweiterung fügt die Option --graph zu den Kommandos incoming,\n"
+"outgoing und log hinzu. Wenn die Option angegeben ist, wird eine ASCII-\n"
+"Repäsentation des Revisionsgraphen angezeigt.\n"
 
 #, python-format
 msgid "--graph option is incompatible with --%s"
-msgstr ""
+msgstr "Option --graph ist inkompatibel mit --%s"
 
 msgid ""
 "show revision history alongside an ASCII revision graph\n"
@@ -1612,6 +2234,12 b' msgid ""'
 "    directory.\n"
 "    "
 msgstr ""
+"Zeigt die Revisionshistorie zusammen mit einem ASCII Revisionsgraphen\n"
+"\n"
+"    Zeigt die Revisionshistorie und einen ASCII-Graphen.\n"
+"\n"
+"    Das @-Zeichen kennzeichnet die Vorgänger des Arbeitsverzeichnisses.\n"
+"    "
 
 #, python-format
 msgid "comparing with %s\n"
@@ -1621,7 +2249,7 b' msgid "no changes found\\n"'
 msgstr "Keine Änderungen gefunden\n"
 
 msgid "show the revision DAG"
-msgstr ""
+msgstr "Zeigt zusätzlich einen ASCII-Revisionsgraphen"
 
 msgid "limit number of changes displayed"
 msgstr "Begrenzt die Anzahl der angezeigten Änderungen"
@@ -1633,43 +2261,43 b' msgid "show the specified revision or ra'
 msgstr "Zeigt die angegebene Revision oder Revisionsfolge"
 
 msgid "hg glog [OPTION]... [FILE]"
-msgstr ""
-
-msgid ""
-"CIA notification\n"
-"\n"
-"This is meant to be run as a changegroup or incoming hook.\n"
-"To configure it, set the following options in your hgrc:\n"
-"\n"
-"[cia]\n"
-"# your registered CIA user name\n"
-"user = foo\n"
-"# the name of the project in CIA\n"
-"project = foo\n"
-"# the module (subproject) (optional)\n"
-"#module = foo\n"
-"# Append a diffstat to the log message (optional)\n"
-"#diffstat = False\n"
-"# Template to use for log messages (optional)\n"
-"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
-"# Style to use (optional)\n"
-"#style = foo\n"
-"# The URL of the CIA notification service (optional)\n"
-"# You can use mailto: URLs to send by email, eg\n"
-"# mailto:[e-mail]\n"
-"# Make sure to set email.from if you do this.\n"
-"#url = http://cia.vc/\n"
-"# print message instead of sending it (optional)\n"
-"#test = False\n"
-"\n"
-"[hooks]\n"
-"# one of these:\n"
-"changegroup.cia = python:hgcia.hook\n"
-"#incoming.cia = python:hgcia.hook\n"
-"\n"
-"[web]\n"
-"# If you want hyperlinks (optional)\n"
-"baseurl = http://server/path/to/repo\n"
+msgstr "hg glog [OPTION]... [DATEI]"
+
+msgid ""
+"hooks for integrating with the CIA.vc notification service\n"
+"\n"
+"This is meant to be run as a changegroup or incoming hook. To\n"
+"configure it, set the following options in your hgrc::\n"
+"\n"
+"  [cia]\n"
+"  # your registered CIA user name\n"
+"  user = foo\n"
+"  # the name of the project in CIA\n"
+"  project = foo\n"
+"  # the module (subproject) (optional)\n"
+"  #module = foo\n"
+"  # Append a diffstat to the log message (optional)\n"
+"  #diffstat = False\n"
+"  # Template to use for log messages (optional)\n"
+"  #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+"  # Style to use (optional)\n"
+"  #style = foo\n"
+"  # The URL of the CIA notification service (optional)\n"
+"  # You can use mailto: URLs to send by email, eg\n"
+"  # mailto:[e-mail]\n"
+"  # Make sure to set email.from if you do this.\n"
+"  #url = http://cia.vc/\n"
+"  # print message instead of sending it (optional)\n"
+"  #test = False\n"
+"\n"
+"  [hooks]\n"
+"  # one of these:\n"
+"  changegroup.cia = python:hgcia.hook\n"
+"  #incoming.cia = python:hgcia.hook\n"
+"\n"
+"  [web]\n"
+"  # If you want hyperlinks (optional)\n"
+"  baseurl = http://server/path/to/repo\n"
 msgstr ""
 
 #, python-format
@@ -1686,45 +2314,33 b' msgid "cia: no project specified"'
 msgstr ""
 
 msgid ""
-"browsing the repository in a graphical way\n"
+"browse the repository in a graphical way\n"
 "\n"
 "The hgk extension allows browsing the history of a repository in a\n"
 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
 "distributed with Mercurial.)\n"
 "\n"
 "hgk consists of two parts: a Tcl script that does the displaying and\n"
-"querying of information, and an extension to mercurial named hgk.py,\n"
+"querying of information, and an extension to Mercurial named hgk.py,\n"
 "which provides hooks for hgk to get information. hgk can be found in\n"
-"the contrib directory, and hgk.py can be found in the hgext directory.\n"
-"\n"
-"To load the hgext.py extension, add it to your .hgrc file (you have to\n"
-"use your global $HOME/.hgrc file, not one in a repository). You can\n"
-"specify an absolute path:\n"
-"\n"
-"  [extensions]\n"
-"  hgk=/usr/local/lib/hgk.py\n"
-"\n"
-"Mercurial can also scan the default python library path for a file\n"
-"named 'hgk.py' if you set hgk empty:\n"
-"\n"
-"  [extensions]\n"
-"  hgk=\n"
+"the contrib directory, and the extension is shipped in the hgext\n"
+"repository, and needs to be enabled.\n"
 "\n"
 "The hg view command will launch the hgk Tcl script. For this command\n"
 "to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file:\n"
+"the path to hgk in your .hgrc file::\n"
 "\n"
 "  [hgk]\n"
 "  path=/location/of/hgk\n"
 "\n"
 "hgk can make use of the extdiff extension to visualize revisions.\n"
-"Assuming you had already configured extdiff vdiff command, just add:\n"
+"Assuming you had already configured extdiff vdiff command, just add::\n"
 "\n"
 "  [hgk]\n"
 "  vdiff=vdiff\n"
 "\n"
 "Revisions context menu will now display additional entries to fire\n"
-"vdiff on hovered and selected revisions."
+"vdiff on hovered and selected revisions.\n"
 msgstr ""
 
 msgid "diff trees from two commits"
@@ -1784,7 +2400,7 b' msgstr ""'
 msgid "hg debug-config"
 msgstr ""
 
-msgid "hg debug-merge-base node node"
+msgid "hg debug-merge-base REV REV"
 msgstr ""
 
 msgid "ignored"
@@ -1805,31 +2421,24 b' msgstr ""'
 msgid "max-count"
 msgstr ""
 
-msgid "hg debug-rev-list [options] revs"
-msgstr ""
-
-msgid ""
-"syntax highlighting in hgweb, based on Pygments\n"
+msgid "hg debug-rev-list [OPTION]... REV..."
+msgstr ""
+
+msgid ""
+"syntax highlighting for hgweb (requires Pygments)\n"
 "\n"
 "It depends on the Pygments syntax highlighting library:\n"
 "http://pygments.org/\n"
 "\n"
-"To enable the extension add this to hgrc:\n"
-"\n"
-"[extensions]\n"
-"hgext.highlight =\n"
-"\n"
-"There is a single configuration option:\n"
-"\n"
-"[web]\n"
-"pygments_style = <style>\n"
+"There is a single configuration option::\n"
+"\n"
+"  [web]\n"
+"  pygments_style = <style>\n"
 "\n"
 "The default is 'colorful'.\n"
-"\n"
-"-- Adam Hupp <[e-mail]>\n"
-msgstr ""
-
-msgid "inotify-based status acceleration for Linux systems\n"
+msgstr ""
+
+msgid "accelerate status report using Linux's inotify service"
 msgstr ""
 
 msgid "start an inotify server for this repository"
@@ -1857,7 +2466,7 b' msgstr ""'
 msgid "name of file to write process ID to"
 msgstr "Dateiname für Prozess-ID"
 
-msgid "hg inserve [OPT]..."
+msgid "hg inserve [OPTION]..."
 msgstr ""
 
 msgid "(found dead inotify server socket; removing it)\n"
@@ -1881,6 +2490,9 b' msgstr ""'
 msgid "failed to contact inotify server: %s\n"
 msgstr ""
 
+msgid "received empty answer from inotify server"
+msgstr ""
+
 #, python-format
 msgid "(inotify: received response from incompatible server version %d)\n"
 msgstr ""
@@ -1931,10 +2543,6 b' msgid "watching directories under %r\\n"'
 msgstr ""
 
 #, python-format
-msgid "status: %r dir(%d) -> %s\n"
-msgstr ""
-
-#, python-format
 msgid "status: %r %s -> %s\n"
 msgstr ""
 
@@ -2000,11 +2608,21 b' msgstr "Unbekannte Abfrageart: %s\\n"'
 msgid "finished setup\n"
 msgstr ""
 
-msgid "polling: no timeout\n"
-msgstr ""
-
-#, python-format
-msgid "polling: %sms timeout\n"
+msgid ""
+"expand expressions into changelog and summaries\n"
+"\n"
+"This extension allows the use of a special syntax in summaries, which\n"
+"will be automatically expanded into links or any other arbitrary\n"
+"expression, much like InterWiki does.\n"
+"\n"
+"A few example patterns (link to bug tracking, etc.) that may be used\n"
+"in your hgrc::\n"
+"\n"
+"  [interhg]\n"
+"  issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
+"  bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
+"i\n"
+"  boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
 msgstr ""
 
 #, python-format
@@ -2016,7 +2634,7 b' msgid "interhg: invalid regexp for %s: %'
 msgstr ""
 
 msgid ""
-"keyword expansion in local repositories\n"
+"expand keywords in tracked files\n"
 "\n"
 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
 "tracked text files selected by your configuration.\n"
@@ -2028,20 +2646,22 b' msgid ""'
 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
 "hgrc files.\n"
 "\n"
-"Example:\n"
+"Example::\n"
 "\n"
 "    [keyword]\n"
 "    # expand keywords in every python file except those matching \"x*\"\n"
 "    **.py =\n"
 "    x*    = ignore\n"
 "\n"
-"Note: the more specific you are in your filename patterns\n"
-"      the less you lose speed in huge repositories.\n"
+"NOTE: the more specific you are in your filename patterns the less you\n"
+"lose speed in huge repositories.\n"
 "\n"
 "For [keywordmaps] template mapping and expansion demonstration and\n"
-"control run \"hg kwdemo\".\n"
-"\n"
-"An additional date template filter {date|utcdate} is provided.\n"
+"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
+"available templates and filters.\n"
+"\n"
+"An additional date template filter {date|utcdate} is provided. It\n"
+"returns a date like \"2006/09/18 15:13:13\".\n"
 "\n"
 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
 "replaced with customized keywords and templates. Again, run \"hg\n"
@@ -2060,8 +2680,8 b' msgid ""'
 "have been checked in.\n"
 "\n"
 "Expansions spanning more than one line and incremental expansions,\n"
-"like CVS' $Log$, are not supported. A keyword template map\n"
-"\"Log = {desc}\" expands to the first line of the changeset description.\n"
+"like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
+"{desc}\" expands to the first line of the changeset description.\n"
 msgstr ""
 
 #, python-format
@@ -2082,34 +2702,59 b' msgid ""'
 "print [keywordmaps] configuration and an expansion example\n"
 "\n"
 "    Show current, custom, or default keyword template maps and their\n"
-"    expansion.\n"
-"\n"
-"    Extend current configuration by specifying maps as arguments and\n"
-"    optionally by reading from an additional hgrc file.\n"
-"\n"
-"    Override current keyword template maps with \"default\" option.\n"
-"    "
-msgstr ""
-
-#, python-format
-msgid ""
-"\n"
-"\t%s\n"
+"    expansions.\n"
+"\n"
+"    Extend the current configuration by specifying maps as arguments\n"
+"    and using -f/--rcfile to source an external hgrc file.\n"
+"\n"
+"    Use -d/--default to disable current configuration.\n"
+"\n"
+"    See \"hg help templates\" for information on templates and filters.\n"
+"    "
 msgstr ""
 
 #, python-format
 msgid "creating temporary repository at %s\n"
 msgstr ""
 
-#, python-format
-msgid ""
-"\n"
-"%s keywords written to %s:\n"
+msgid ""
+"\n"
+"\tconfiguration using custom keyword template maps\n"
+msgstr ""
+
+msgid "\textending current template maps\n"
+msgstr ""
+
+msgid "\toverriding default template maps\n"
+msgstr ""
+
+msgid ""
+"\n"
+"\tconfiguration using default keyword template maps\n"
+msgstr ""
+
+msgid "\tdisabling current template maps\n"
+msgstr ""
+
+msgid ""
+"\n"
+"\tconfiguration using current keyword template maps\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"\n"
+"keywords written to %s:\n"
 msgstr ""
 
 msgid "unhooked all commit hooks\n"
 msgstr ""
 
+msgid ""
+"\n"
+"\tkeywords expanded\n"
+msgstr ""
+
 #, python-format
 msgid ""
 "\n"
@@ -2117,7 +2762,7 b' msgid ""'
 msgstr ""
 
 msgid ""
-"expand keywords in working directory\n"
+"expand keywords in the working directory\n"
 "\n"
 "    Run after (re)enabling keyword expansion.\n"
 "\n"
@@ -2126,16 +2771,32 b' msgid ""'
 msgstr ""
 
 msgid ""
-"print files currently configured for keyword expansion\n"
-"\n"
-"    Crosscheck which files in working directory are potential targets\n"
-"    for keyword expansion. That is, files matched by [keyword] config\n"
-"    patterns but not symlinks.\n"
-"    "
-msgstr ""
-
-msgid ""
-"revert expanded keywords in working directory\n"
+"show files configured for keyword expansion\n"
+"\n"
+"    List which files in the working directory are matched by the\n"
+"    [keyword] configuration patterns.\n"
+"\n"
+"    Useful to prevent inadvertent keyword expansion and to speed up\n"
+"    execution by including only files that are actual candidates for\n"
+"    expansion.\n"
+"\n"
+"    See \"hg help keyword\" on how to construct patterns both for\n"
+"    inclusion and exclusion of files.\n"
+"\n"
+"    Use -u/--untracked to list untracked files as well.\n"
+"\n"
+"    With -a/--all and -v/--verbose the codes used to show the status\n"
+"    of files are::\n"
+"\n"
+"      K = keyword expansion candidate\n"
+"      k = keyword expansion candidate (untracked)\n"
+"      I = ignored\n"
+"      i = ignored (untracked)\n"
+"    "
+msgstr ""
+
+msgid ""
+"revert expanded keywords in the working directory\n"
 "\n"
 "    Run before changing/disabling active keywords or if you experience\n"
 "    problems with \"hg import\" or \"hg merge\".\n"
@@ -2172,7 +2833,7 b' msgid "hg kwshrink [OPTION]... [FILE]...'
 msgstr ""
 
 msgid ""
-"patch management and development\n"
+"manage a stack of patches\n"
 "\n"
 "This extension lets you work with a stack of patches in a Mercurial\n"
 "repository. It manages two stacks of patches - all known patches, and\n"
@@ -2181,186 +2842,213 b' msgid ""'
 "Known patches are represented as patch files in the .hg/patches\n"
 "directory. Applied patches are both patch files and changesets.\n"
 "\n"
-"Common tasks (use \"hg help command\" for more details):\n"
-"\n"
-"prepare repository to work with patches   qinit\n"
-"create new patch                          qnew\n"
-"import existing patch                     qimport\n"
-"\n"
-"print patch series                        qseries\n"
-"print applied patches                     qapplied\n"
-"print name of top applied patch           qtop\n"
-"\n"
-"add known patch to applied stack          qpush\n"
-"remove patch from applied stack           qpop\n"
-"refresh contents of top applied patch     qrefresh\n"
-msgstr ""
+"Common tasks (use \"hg help command\" for more details)::\n"
+"\n"
+"  prepare repository to work with patches   qinit\n"
+"  create new patch                          qnew\n"
+"  import existing patch                     qimport\n"
+"\n"
+"  print patch series                        qseries\n"
+"  print applied patches                     qapplied\n"
+"\n"
+"  add known patch to applied stack          qpush\n"
+"  remove patch from applied stack           qpop\n"
+"  refresh contents of top applied patch     qrefresh\n"
+msgstr ""
+"Patchverwaltung und -entwicklung\n"
+"\n"
+"Diese Erweiterung verwaltet Änderungen des Archivs in Patch-Dateien und\n"
+"führt dazu zwei Stapel (stacks) ein: Alle bekannten und alle lokal\n"
+"angewendeten Patches (eine Untermenge der bekannten).\n"
+"\n"
+"Die Patch Dateien sowie die Stapeldateien werden im Verzeichnis .hg/patches\n"
+"angelegt. Angewendete patches sind weiterhin auch als Änderungssätze in der\n"
+"üblichen Versionshistorie zu finden.\n"
+"\n"
+"Übliche Anwendungen (mehr Details mit \"hg help KOMMANDO\")::\n"
+"\n"
+"  Bereite Archiv auf Arbeit mit mq vor               qinit\n"
+"  Erstelle einen neuen Patch                         qnew\n"
+"  Übernimm externen Patch als bekannt                qimport\n"
+"\n"
+"  Zeige Patch Serien an                              qseries\n"
+"  Zeige angewendete Patches                          qapplied\n"
+"\n"
+"  Wende bekannten Patch an                           qpush\n"
+"  Nimm angewendeten Patch wieder zurück              qpop\n"
+"  Integriere lokale Änderungen in letzten Patch      qrefresh\n"
 
 #, python-format
 msgid "%s appears more than once in %s"
-msgstr ""
+msgstr "%s mehrfach in %s gefunden"
 
 msgid "guard cannot be an empty string"
-msgstr ""
+msgstr "Wächter darf keine leere Zeichenkette sein"
 
 #, python-format
 msgid "guard %r starts with invalid character: %r"
-msgstr ""
+msgstr "Wächter %r beginnt mit ungültigem Zeichen: %r"
 
 #, python-format
 msgid "invalid character in guard %r: %r"
-msgstr ""
+msgstr "Ungültiges Zeichen in Wächter %r: %r"
 
 #, python-format
 msgid "active guards: %s\n"
-msgstr ""
+msgstr "Aktive Wächter: %s\n"
 
 #, python-format
 msgid "guard %r too short"
-msgstr ""
+msgstr "Wächter %r zu kurz"
 
 #, python-format
 msgid "guard %r starts with invalid char"
-msgstr ""
+msgstr "Wächter %r beginnt mit ungültigem Zeichen"
 
 #, python-format
 msgid "allowing %s - no guards in effect\n"
-msgstr ""
+msgstr "Erlaube %s - kein Wächter trifft zu\n"
 
 #, python-format
 msgid "allowing %s - no matching negative guards\n"
-msgstr ""
+msgstr "Erlaube %s - von keinem Wächter abgelehnt\n"
 
 #, python-format
 msgid "allowing %s - guarded by %r\n"
-msgstr ""
+msgstr "Erlaube %s - bewacht durch %r\n"
 
 #, python-format
 msgid "skipping %s - guarded by %r\n"
-msgstr ""
+msgstr "Überspringe %s - bewacht durch %r\n"
 
 #, python-format
 msgid "skipping %s - no matching guards\n"
-msgstr ""
+msgstr "Überspringe %s - kein Wächter trifft zu\n"
 
 #, python-format
 msgid "error removing undo: %s\n"
-msgstr ""
+msgstr "Fehler bei Entfernung von undo: %s\n"
 
 #, python-format
 msgid "apply failed for patch %s"
-msgstr ""
+msgstr "Anwendung von Patch %s schlug fehl"
 
 #, python-format
 msgid "patch didn't work out, merging %s\n"
-msgstr ""
+msgstr "Patch hat nicht gewirkt, führe %s zusammen\n"
 
 #, python-format
 msgid "update returned %d"
-msgstr ""
+msgstr "Aktualisierung gab Fehlercode %d zurück"
 
 msgid "repo commit failed"
-msgstr ""
+msgstr "Übernahme der Änderungen schlug fehl"
 
 #, python-format
 msgid "unable to read %s"
-msgstr ""
+msgstr "Fehler beim Lesen von %s"
 
 #, python-format
 msgid "patch %s does not exist\n"
-msgstr ""
+msgstr "Patch %s existiert nicht\n"
 
 #, python-format
 msgid "patch %s is not applied\n"
-msgstr ""
+msgstr "Patch %s ist nicht angewendet\n"
 
 msgid "patch failed, unable to continue (try -v)\n"
-msgstr ""
+msgstr "Patch schlug fehl und Fortsetzung unmöglich (versuche -v)\n"
 
 #, python-format
 msgid "applying %s\n"
 msgstr "Wende %s an\n"
 
 #, python-format
-msgid "Unable to read %s\n"
-msgstr ""
+msgid "unable to read %s\n"
+msgstr "nicht lesbar: %s\n"
 
 #, python-format
 msgid "imported patch %s\n"
-msgstr ""
+msgstr "Importierter Patch %s\n"
 
 #, python-format
 msgid ""
 "\n"
 "imported patch %s"
 msgstr ""
+"\n"
+"Importierter Patch %s"
 
 #, python-format
 msgid "patch %s is empty\n"
-msgstr ""
+msgstr "Patch %s ist leer\n"
 
 msgid "patch failed, rejects left in working dir\n"
-msgstr ""
+msgstr "Patch schlug fehl, Fehlerabschnitte noch im Arbeitsverzeichnis\n"
 
 msgid "fuzz found when applying patch, stopping\n"
-msgstr ""
+msgstr "fuzz bei Anwendung des patches gefunden - breche ab\n"
 
 #, python-format
 msgid "revision %d is not managed"
-msgstr ""
+msgstr "Revision %d steht nicht unter Versionskontrolle"
 
 #, python-format
 msgid "cannot delete revision %d above applied patches"
-msgstr ""
+msgstr "Kann Revision %d nicht hinter angewendeten Patches löschen"
+
+#, python-format
+msgid "patch %s finalized without changeset message\n"
+msgstr "Patch %s ohne Versionsmeldung finalisiert\n"
 
 msgid "qdelete requires at least one revision or patch name"
-msgstr ""
+msgstr "qdelete benötigt mindestens eine Revision oder einen Patchnamen"
 
 #, python-format
 msgid "cannot delete applied patch %s"
-msgstr ""
+msgstr "kann bereits angewendeten Patch %s nicht löschen"
 
 #, python-format
 msgid "patch %s not in series file"
-msgstr ""
+msgstr "Patch %s ist nicht in der \"series\" Datei"
 
 msgid "no patches applied"
-msgstr ""
+msgstr "Keine Patches angewendet"
 
 msgid "working directory revision is not qtip"
-msgstr ""
+msgstr "Revision des Arbeitsverzeichnisses ist nicht qtip"
 
 msgid "local changes found, refresh first"
-msgstr ""
+msgstr "Lokale Änderungen gefunden. Führe zunächst \"qrefresh\" aus!"
 
 msgid "local changes found"
-msgstr ""
+msgstr "Lokale Änderungen gefunden"
 
 #, python-format
 msgid "\"%s\" cannot be used as the name of a patch"
-msgstr ""
+msgstr "\"%s\" kann nicht als Patchname verwendet werden"
 
 #, python-format
 msgid "patch \"%s\" already exists"
-msgstr ""
+msgstr "Patch \"%s\" existiert bereits"
 
 #, python-format
 msgid "error unlinking %s\n"
-msgstr ""
+msgstr "Fehler beim Löschen von %s\n"
 
 #, python-format
 msgid "patch name \"%s\" is ambiguous:\n"
-msgstr ""
+msgstr "Patchname \"%s\" ist mehrdeutig:\n"
 
 #, python-format
 msgid "patch %s not in series"
-msgstr ""
+msgstr "Patch %s nicht in Serie"
 
 msgid "(working directory not at a head)\n"
 msgstr "(Arbeitsverzeichnis ist keine Kopfversion)\n"
 
 msgid "no patches in series\n"
-msgstr ""
+msgstr "Keine Patches in Serie\n"
 
 #, python-format
 msgid "cannot push to a previous patch: %s"
@@ -2422,11 +3110,15 b' msgstr ""'
 msgid "deletions found between repo revs"
 msgstr ""
 
+#, python-format
+msgid "popping %s\n"
+msgstr "Entferne (obersten) %s\n"
+
 msgid "patch queue now empty\n"
-msgstr ""
+msgstr "Patchschlange ist jetzt leer\n"
 
 msgid "cannot refresh a revision with children"
-msgstr ""
+msgstr "Kann keine Revision mit Kindern aktualisieren"
 
 msgid ""
 "refresh interrupted while patch was popped! (revert --all, qpush to "
@@ -2527,24 +3219,26 b' msgstr ""'
 msgid ""
 "remove patches from queue\n"
 "\n"
-"    The patches must not be applied, unless they are arguments to the\n"
-"    -r/--rev parameter. At least one patch or revision is required.\n"
-"\n"
-"    With --rev, mq will stop managing the named revisions (converting\n"
-"    them to regular mercurial changesets). The qfinish command should\n"
-"    be used as an alternative for qdelete -r, as the latter option is\n"
-"    deprecated.\n"
-"\n"
-"    With -k/--keep, the patch files are preserved in the patch\n"
-"    directory."
+"    The patches must not be applied, and at least one patch is required. "
+"With\n"
+"    -k/--keep, the patch files are preserved in the patch directory.\n"
+"\n"
+"    To stop managing a patch and move it into permanent history,\n"
+"    use the qfinish command."
 msgstr ""
 
 msgid "print the patches already applied"
 msgstr ""
 
+msgid "only one patch applied\n"
+msgstr ""
+
 msgid "print the patches not yet applied"
 msgstr ""
 
+msgid "all patches applied\n"
+msgstr ""
+
 msgid ""
 "import a patch\n"
 "\n"
@@ -2596,7 +3290,7 b' msgid ""'
 "    Source patch repository is looked for in <src>/.hg/patches by\n"
 "    default. Use -p <url> to change.\n"
 "\n"
-"    The patch directory must be a nested mercurial repository, as\n"
+"    The patch directory must be a nested Mercurial repository, as\n"
 "    would be created by qinit -c.\n"
 "    "
 msgstr ""
@@ -2628,15 +3322,9 b' msgstr ""'
 msgid "print the name of the next patch"
 msgstr ""
 
-msgid "all patches applied\n"
-msgstr ""
-
 msgid "print the name of the previous patch"
 msgstr ""
 
-msgid "only one patch applied\n"
-msgstr ""
-
 msgid ""
 "create a new patch\n"
 "\n"
@@ -2938,7 +3626,10 b' msgstr ""'
 msgid "print first line of patch header"
 msgstr ""
 
-msgid "hg qapplied [-s] [PATCH]"
+msgid "show only the last patch"
+msgstr "Zeigt nur den letzten Patch"
+
+msgid "hg qapplied [-1] [-s] [PATCH]"
 msgstr ""
 
 msgid "use pull protocol to copy metadata"
@@ -2965,7 +3656,7 b' msgstr ""'
 msgid "keep patch file"
 msgstr ""
 
-msgid "stop managing a revision"
+msgid "stop managing a revision (DEPRECATED)"
 msgstr ""
 
 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
@@ -3001,7 +3692,7 b' msgstr ""'
 msgid "import file in patch directory"
 msgstr ""
 
-msgid "patch file name"
+msgid "name of patch file"
 msgstr ""
 
 msgid "overwrite existing files"
@@ -3082,16 +3773,16 b' msgstr ""'
 msgid "refresh only files already in the patch and specified files"
 msgstr ""
 
-msgid "add/update \"From: <current user>\" in patch"
-msgstr ""
-
-msgid "add/update \"From: <given user>\" in patch"
-msgstr ""
-
-msgid "update \"Date: <current date>\" in patch (if present)"
-msgstr ""
-
-msgid "update \"Date: <given date>\" in patch (if present)"
+msgid "add/update author field in patch with current user"
+msgstr ""
+
+msgid "add/update author field in patch with given user"
+msgstr ""
+
+msgid "add/update date field in patch with current date"
+msgstr ""
+
+msgid "add/update date field in patch with given date"
 msgstr ""
 
 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
@@ -3160,77 +3851,81 b' msgstr ""'
 msgid "hg qtop [-s]"
 msgstr ""
 
-msgid "hg qunapplied [-s] [PATCH]"
+msgid "show only the first patch"
+msgstr "Zeigt nur den ersten Patch"
+
+msgid "hg qunapplied [-1] [-s] [PATCH]"
 msgstr ""
 
 msgid "finish all applied changesets"
 msgstr ""
 
-msgid "hg qfinish [-a] [REV...]"
-msgstr ""
-
-msgid ""
-"hook extension to email notifications on commits/pushes\n"
-"\n"
-"Subscriptions can be managed through hgrc. Default mode is to print\n"
-"messages to stdout, for testing and configuring.\n"
-"\n"
-"To use, configure notify extension and enable in hgrc like this:\n"
-"\n"
-"   [extensions]\n"
-"   hgext.notify =\n"
-"\n"
-"   [hooks]\n"
-"   # one email for each incoming changeset\n"
-"   incoming.notify = python:hgext.notify.hook\n"
-"   # batch emails when many changesets incoming at one time\n"
-"   changegroup.notify = python:hgext.notify.hook\n"
-"\n"
-"   [notify]\n"
-"   # config items go in here\n"
-"\n"
-" config items:\n"
-"\n"
-" REQUIRED:\n"
-"   config = /path/to/file # file containing subscriptions\n"
-"\n"
-" OPTIONAL:\n"
-"   test = True            # print messages to stdout for testing\n"
-"   strip = 3              # number of slashes to strip for url paths\n"
-"   domain = example.com   # domain to use if committer missing domain\n"
-"   style = ...            # style file to use when formatting email\n"
-"   template = ...         # template to use when formatting email\n"
-"   incoming = ...         # template to use when run as incoming hook\n"
-"   changegroup = ...      # template when run as changegroup hook\n"
-"   maxdiff = 300          # max lines of diffs to include (0=none, -1=all)\n"
-"   maxsubject = 67        # truncate subject line longer than this\n"
-"   diffstat = True        # add a diffstat before the diff content\n"
-"   sources = serve        # notify if source of incoming changes in this "
+msgid "hg qfinish [-a] [REV]..."
+msgstr ""
+
+msgid ""
+"hooks for sending email notifications at commit/push time\n"
+"\n"
+"Subscriptions can be managed through a hgrc file. Default mode is to\n"
+"print messages to stdout, for testing and configuring.\n"
+"\n"
+"To use, configure the notify extension and enable it in hgrc like\n"
+"this::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.notify =\n"
+"\n"
+"  [hooks]\n"
+"  # one email for each incoming changeset\n"
+"  incoming.notify = python:hgext.notify.hook\n"
+"  # batch emails when many changesets incoming at one time\n"
+"  changegroup.notify = python:hgext.notify.hook\n"
+"\n"
+"  [notify]\n"
+"  # config items go here\n"
+"\n"
+"Required configuration items::\n"
+"\n"
+"  config = /path/to/file # file containing subscriptions\n"
+"\n"
+"Optional configuration items::\n"
+"\n"
+"  test = True            # print messages to stdout for testing\n"
+"  strip = 3              # number of slashes to strip for url paths\n"
+"  domain = example.com   # domain to use if committer missing domain\n"
+"  style = ...            # style file to use when formatting email\n"
+"  template = ...         # template to use when formatting email\n"
+"  incoming = ...         # template to use when run as incoming hook\n"
+"  changegroup = ...      # template when run as changegroup hook\n"
+"  maxdiff = 300          # max lines of diffs to include (0=none, -1=all)\n"
+"  maxsubject = 67        # truncate subject line longer than this\n"
+"  diffstat = True        # add a diffstat before the diff content\n"
+"  sources = serve        # notify if source of incoming changes in this "
 "list\n"
-"                          # (serve == ssh or http, push, pull, bundle)\n"
-"   [email]\n"
-"   from = [e-mail]   # email address to send as if none given\n"
-"   [web]\n"
-"   baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
-"\n"
-" notify config file has same format as regular hgrc. it has two\n"
-" sections so you can express subscriptions in whatever way is handier\n"
-" for you.\n"
-"\n"
-"   [usersubs]\n"
-"   # key is subscriber email, value is \",\"-separated list of glob "
-"patterns\n"
-"   user@host = pattern\n"
-"\n"
-"   [reposubs]\n"
-"   # key is glob pattern, value is \",\"-separated list of subscriber "
-"emails\n"
-"   pattern = user@host\n"
-"\n"
-" glob patterns are matched against path to repository root.\n"
-"\n"
-" if you like, you can put notify config file in repository that users\n"
-" can push changes to, they can manage their own subscriptions."
+"                         # (serve == ssh or http, push, pull, bundle)\n"
+"  [email]\n"
+"  from = [e-mail]   # email address to send as if none given\n"
+"  [web]\n"
+"  baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
+"\n"
+"The notify config file has same format as a regular hgrc file. It has\n"
+"two sections so you can express subscriptions in whatever way is\n"
+"handier for you.\n"
+"\n"
+"::\n"
+"\n"
+"  [usersubs]\n"
+"  # key is subscriber email, value is \",\"-separated list of glob patterns\n"
+"  user@host = pattern\n"
+"\n"
+"  [reposubs]\n"
+"  # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
+"  pattern = user@host\n"
+"\n"
+"Glob patterns are matched against path to repository root.\n"
+"\n"
+"If you like, you can put notify config file in repository that users\n"
+"can push changes to, they can manage their own subscriptions.\n"
 msgstr ""
 
 #, python-format
@@ -3264,9 +3959,9 b' msgid "notify: changes have source \\"%s\\'
 msgstr ""
 
 msgid ""
-"browse command output with external pager\n"
-"\n"
-"To set the pager that should be used, set the application variable:\n"
+"browse command output with an external pager\n"
+"\n"
+"To set the pager that should be used, set the application variable::\n"
 "\n"
 "  [pager]\n"
 "  pager = LESS='FSRX' less\n"
@@ -3275,19 +3970,19 b' msgid ""'
 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
 "\n"
 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
-"setting:\n"
+"setting::\n"
 "\n"
 "  [pager]\n"
 "  quiet = True\n"
 "\n"
 "You can disable the pager for certain commands by adding them to the\n"
-"pager.ignore list:\n"
+"pager.ignore list::\n"
 "\n"
 "  [pager]\n"
 "  ignore = version, help, update\n"
 "\n"
 "You can also enable the pager only for certain commands using\n"
-"pager.attend:\n"
+"pager.attend::\n"
 "\n"
 "  [pager]\n"
 "  attend = log\n"
@@ -3299,27 +3994,27 b' msgid ""'
 msgstr ""
 
 msgid ""
-"use suffixes to refer to ancestor revisions\n"
+"interpret suffixes to refer to ancestor revisions\n"
 "\n"
 "This extension allows you to use git-style suffixes to refer to the\n"
 "ancestors of a specific revision.\n"
 "\n"
-"For example, if you can refer to a revision as \"foo\", then:\n"
-"\n"
-"- foo^N = Nth parent of foo\n"
+"For example, if you can refer to a revision as \"foo\", then::\n"
+"\n"
+"  foo^N = Nth parent of foo\n"
 "  foo^0 = foo\n"
 "  foo^1 = first parent of foo\n"
 "  foo^2 = second parent of foo\n"
 "  foo^  = foo^1\n"
 "\n"
-"- foo~N = Nth first grandparent of foo\n"
+"  foo~N = Nth first grandparent of foo\n"
 "  foo~0 = foo\n"
 "  foo~1 = foo^1 = foo^ = first parent of foo\n"
 "  foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
 msgstr ""
 
 msgid ""
-"sending Mercurial changesets as a series of patch emails\n"
+"command to send changesets as (a series of) patch emails\n"
 "\n"
 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
 "describes the series as a whole.\n"
@@ -3328,11 +4023,9 b' msgid ""'
 "first line of the changeset description as the subject text. The\n"
 "message contains two or three body parts:\n"
 "\n"
-"  The changeset description.\n"
-"\n"
-"  [Optional] The result of running diffstat on the patch.\n"
-"\n"
-"  The patch itself, as generated by \"hg export\".\n"
+"- The changeset description.\n"
+"- [Optional] The result of running diffstat on the patch.\n"
+"- The patch itself, as generated by \"hg export\".\n"
 "\n"
 "Each message refers to the first in the series using the In-Reply-To\n"
 "and References headers, so they will show up as a sequence in threaded\n"
@@ -3342,13 +4035,8 b' msgid ""'
 "with a diffstat summary and the changeset summary, so you can be sure\n"
 "you are sending the right changes.\n"
 "\n"
-"To enable this extension:\n"
-"\n"
-"  [extensions]\n"
-"  hgext.patchbomb =\n"
-"\n"
 "To configure other defaults, add a section like this to your hgrc\n"
-"file:\n"
+"file::\n"
 "\n"
 "  [email]\n"
 "  from = My Name <my@email>\n"
@@ -3371,13 +4059,13 b' msgid ""'
 "patchbomb message in a pager or sending the messages directly, it will\n"
 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
 "can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt:\n"
+"files, e.g. with mutt::\n"
 "\n"
 "  % mutt -R -f mbox\n"
 "\n"
-"When you are previewing the patchbomb messages, you can use `formail'\n"
+"When you are previewing the patchbomb messages, you can use ``formail``\n"
 "(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out:\n"
+"package), to send each message out::\n"
 "\n"
 "  % formail -s sendmail -bm -t < mbox\n"
 "\n"
@@ -3387,7 +4075,7 b' msgid ""'
 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
 "that the patchbomb extension can automatically send patchbombs\n"
 "directly from the commandline. See the [email] and [smtp] sections in\n"
-"hgrc(5) for details."
+"hgrc(5) for details.\n"
 msgstr ""
 
 msgid "Please enter a valid value.\n"
@@ -3427,23 +4115,24 b' msgid ""'
 "    single email containing a binary Mercurial bundle as an attachment\n"
 "    will be sent.\n"
 "\n"
-"    Examples:\n"
-"\n"
-"    hg email -r 3000          # send patch 3000 only\n"
-"    hg email -r 3000 -r 3001  # send patches 3000 and 3001\n"
-"    hg email -r 3000:3005     # send patches 3000 through 3005\n"
-"    hg email 3000             # send patch 3000 (deprecated)\n"
-"\n"
-"    hg email -o               # send all patches not in default\n"
-"    hg email -o DEST          # send all patches not in DEST\n"
-"    hg email -o -r 3000       # send all ancestors of 3000 not in default\n"
-"    hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST\n"
-"\n"
-"    hg email -b               # send bundle of all patches not in default\n"
-"    hg email -b DEST          # send bundle of all patches not in DEST\n"
-"    hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
+"    Examples::\n"
+"\n"
+"      hg email -r 3000          # send patch 3000 only\n"
+"      hg email -r 3000 -r 3001  # send patches 3000 and 3001\n"
+"      hg email -r 3000:3005     # send patches 3000 through 3005\n"
+"      hg email 3000             # send patch 3000 (deprecated)\n"
+"\n"
+"      hg email -o               # send all patches not in default\n"
+"      hg email -o DEST          # send all patches not in DEST\n"
+"      hg email -o -r 3000       # send all ancestors of 3000 not in default\n"
+"      hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST\n"
+"\n"
+"      hg email -b               # send bundle of all patches not in default\n"
+"      hg email -b DEST          # send bundle of all patches not in DEST\n"
+"      hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
 "default\n"
-"    hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST\n"
+"      hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in "
+"DEST\n"
 "\n"
 "    Before using this command, you will need to enable email in your\n"
 "    hgrc. See the [email] section in hgrc(5) for details.\n"
@@ -3522,6 +4211,9 b' msgstr ""'
 msgid "message identifier to reply to"
 msgstr ""
 
+msgid "flags to add in subject prefixes"
+msgstr ""
+
 msgid "email addresses of recipients"
 msgstr ""
 
@@ -3534,7 +4226,7 b' msgstr ""'
 msgid "send changes not in target as a binary bundle"
 msgstr ""
 
-msgid "file name of the bundle attachment"
+msgid "name of the bundle attachment file"
 msgstr ""
 
 msgid "a revision to send"
@@ -3553,6 +4245,9 b' msgstr ""'
 msgid "hg email [OPTION]... [DEST]..."
 msgstr ""
 
+msgid "command to delete untracked files from the working directory"
+msgstr "Löscht nicht versionierte Dateien aus dem Arbeitsverzeichnis"
+
 msgid ""
 "removes files not tracked by Mercurial\n"
 "\n"
@@ -3560,13 +4255,16 b' msgid ""'
 "    and uncommitted changes in an otherwise-clean source tree.\n"
 "\n"
 "    This means that purge will delete:\n"
-"     - Unknown files: files marked with \"?\" by \"hg status\"\n"
-"     - Empty directories: in fact Mercurial ignores directories unless\n"
-"       they contain files under source control management\n"
+"\n"
+"    - Unknown files: files marked with \"?\" by \"hg status\"\n"
+"    - Empty directories: in fact Mercurial ignores directories unless\n"
+"      they contain files under source control management\n"
+"\n"
 "    But it will leave untouched:\n"
-"     - Modified and unmodified tracked files\n"
-"     - Ignored files (unless --all is specified)\n"
-"     - New files added to the repository (with \"hg add\")\n"
+"\n"
+"    - Modified and unmodified tracked files\n"
+"    - Ignored files (unless --all is specified)\n"
+"    - New files added to the repository (with \"hg add\")\n"
 "\n"
 "    If directories are given on the command line, only files in these\n"
 "    directories are considered.\n"
@@ -3600,8 +4298,8 b' msgstr ""'
 msgid "purge ignored files too"
 msgstr ""
 
-msgid "print the file names instead of deleting them"
-msgstr ""
+msgid "print filenames instead of deleting them"
+msgstr "Zeigt Dateinamen an, statt sie zu entfernen"
 
 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
 msgstr ""
@@ -3611,19 +4309,18 b' msgid "hg purge [OPTION]... [DIR]..."'
 msgstr ""
 
 msgid ""
-"move sets of revisions to a different ancestor\n"
+"command to move sets of revisions to a different ancestor\n"
 "\n"
 "This extension lets you rebase changesets in an existing Mercurial\n"
 "repository.\n"
 "\n"
 "For more information:\n"
-"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
+"http://mercurial.selenic.com/wiki/RebaseExtension\n"
 msgstr ""
 
 msgid "first revision, do not change ancestor\n"
 msgstr "Erste Revision, ändere den Vorgänger nicht\n"
 
-#, fuzzy
 msgid ""
 "move changeset (and descendants) to a different branch\n"
 "\n"
@@ -3643,8 +4340,8 b' msgstr ""'
 "    lokale Änderungen abhängig von einem Hauptentwicklunszweig zu\n"
 "    linearisieren.\n"
 "\n"
-"    Sollte ein Rebase unterbrochen werden, um manuell eine Zusammenführung\n"
-"    auszuführen, kann er mit --continue wieder aufgenommen oder mit --abort\n"
+"    Sollte eine Verschiebung zwecks manueller Konfliktbehebung unterbrochen\n"
+"    werden, kann sie mit --continue wieder aufgenommen oder mit --abort\n"
 "    abgebrochen werden.\n"
 "    "
 
@@ -3804,8 +4501,7 b' msgid ""'
 "| [-c] | [-a]"
 msgstr ""
 
-# Nicht übersetzen
-msgid "interactive change selection during commit or qrefresh"
+msgid "commands to interactively select changes for commit/qrefresh"
 msgstr ""
 
 msgid "this modifies a binary file (all or nothing)\n"
@@ -3845,30 +4541,9 b' msgstr "&Quit, \xc3\xbcbernimmt keine \xc3\x84nderungen"'
 msgid "&?"
 msgstr ""
 
-msgid "y"
-msgstr ""
-
-msgid "?"
-msgstr ""
-
 msgid "y - record this change"
 msgstr "y - übernimmt diese Änderung"
 
-msgid "s"
-msgstr ""
-
-msgid "f"
-msgstr ""
-
-msgid "d"
-msgstr ""
-
-msgid "a"
-msgstr ""
-
-msgid "q"
-msgstr ""
-
 msgid "user quit"
 msgstr "Abbruch durch Benutzer"
 
@@ -3879,6 +4554,9 b' msgstr "\xc3\x9cberpr\xc3\xbcfe \xc3\x84nderungen an %s?"'
 msgid " and "
 msgstr " und "
 
+msgid "y"
+msgstr ""
+
 #, python-format
 msgid "record this change to %r?"
 msgstr "Übernehme die Änderung an %r?"
@@ -3898,42 +4576,42 b' msgid ""'
 "    You will be prompted for whether to record changes to each\n"
 "    modified file, and for files with multiple changes, for each\n"
 "    change to use. For each query, the following responses are\n"
-"    possible:\n"
-"\n"
-"    y - record this change\n"
-"    n - skip this change\n"
-"\n"
-"    s - skip remaining changes to this file\n"
-"    f - record remaining changes to this file\n"
-"\n"
-"    d - done, skip remaining changes and files\n"
-"    a - record all changes to all remaining files\n"
-"    q - quit, recording no changes\n"
-"\n"
-"    ? - display help"
-msgstr ""
-"Interaktive Auswahl von Änderungen zur Übernahme ins Archiv\n"
-"\n"
-"    Falls keine Liste von Dateien übergeben wird, gelten alle von\n"
+"    possible::\n"
+"\n"
+"      y - record this change\n"
+"      n - skip this change\n"
+"\n"
+"      s - skip remaining changes to this file\n"
+"      f - record remaining changes to this file\n"
+"\n"
+"      d - done, skip remaining changes and files\n"
+"      a - record all changes to all remaining files\n"
+"      q - quit, recording no changes\n"
+"\n"
+"      ? - display help"
+msgstr ""
+"Interaktive Auswahl der Änderungen zur Übernahme ins Archiv\n"
+"\n"
+"    Falls keine Liste von Dateien angegeben wird, gelten alle von\n"
 "    \"hg status\" gemeldeten Änderungen als Kandidaten für 'record'.\n"
 "\n"
-"    Siehe 'hg help dates' für eine Liste aller gültigen Formate für -d/--\n"
+"    Siehe 'hg help dates' für eine Liste gültiger Formate für -d/--date.\n"
 "\n"
 "    Es erfolgt eine Abfrage für jede Datei, ob Änderungen übernommen\n"
-"    werden sollen, bei Dateien mit mehreren Änderungen für jede einzelne\n"
-"    Änderung. Folgenden Antworten sind bei jeder Anfrage möglich:\n"
-"\n"
-"    y - übernimmt diese Änderung\n"
-"    n - überspringt diese Änderung\n"
-"\n"
-"    s - überspringt verbleibende Änderungen dieser Datei\n"
-"    f - übernimmt verbleibende Änderungen dieser Datei\n"
-"\n"
-"    d - fertig, überspringt verbleibende Änderungen und Dateien\n"
-"    a - übernimmt alle Änderungen aller verbleibenden Dateien\n"
-"    q - beendet ohne Änderungen zu übernehmen\n"
-"\n"
-"    ? - zeigt Hilfe an"
+"    werden sollen. Bei Dateien mit mehreren Änderungen für jede einzelne\n"
+"    Änderung. Folgenden Antworten sind bei jeder Anfrage möglich::\n"
+"\n"
+"      y - übernimmt diese Änderung\n"
+"      n - überspringt diese Änderung\n"
+"\n"
+"      s - überspringt verbleibende Änderungen dieser Datei\n"
+"      f - übernimmt verbleibende Änderungen dieser Datei\n"
+"\n"
+"      d - fertig, überspringt verbleibende Änderungen und Dateien\n"
+"      a - übernimmt alle Änderungen aller verbleibenden Dateien\n"
+"      q - beendet ohne Änderungen zu übernehmen\n"
+"\n"
+"      ? - zeigt Hilfe an"
 
 msgid "'mq' extension not loaded"
 msgstr "'mq' Erweiterung nicht geladen"
@@ -3964,8 +4642,28 b' msgstr "hg record [OPTION]... [DATEI]...'
 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
 msgstr "hg qrecord [OPTION]... PATCH [DATEI]..."
 
-msgid ""
-"patch transplanting tool\n"
+msgid "share a common history between several working directories"
+msgstr ""
+
+msgid ""
+"create a new shared repository (experimental)\n"
+"\n"
+"    Initialize a new repository and working directory that shares its\n"
+"    history with another repository.\n"
+"\n"
+"    NOTE: actions that change history such as rollback or moving the\n"
+"    source may confuse sharers.\n"
+"    "
+msgstr ""
+
+msgid "do not create a working copy"
+msgstr "erstelle keine Arbeitskopie"
+
+msgid "[-U] SOURCE [DEST]"
+msgstr "[-U] QUELLE [ZIEL]"
+
+msgid ""
+"command to transplant changesets from another branch\n"
 "\n"
 "This extension allows you to transplant patches from another branch.\n"
 "\n"
@@ -4028,9 +4726,9 b' msgid ""'
 "\n"
 "    Selected changesets will be applied on top of the current working\n"
 "    directory with the log of the original changeset. If --log is\n"
-"    specified, log messages will have a comment appended of the form:\n"
-"\n"
-"    (transplanted from CHANGESETHASH)\n"
+"    specified, log messages will have a comment appended of the form::\n"
+"\n"
+"      (transplanted from CHANGESETHASH)\n"
 "\n"
 "    You can rewrite the changelog message with the --filter option.\n"
 "    Its argument will be invoked with the current changelog message as\n"
@@ -4111,7 +4809,7 b' msgid ""'
 msgstr ""
 
 msgid ""
-"allow to use MBCS path with problematic encoding.\n"
+"allow the use of MBCS paths with problematic encodings\n"
 "\n"
 "Some MBCS encodings are not good for some path operations (i.e.\n"
 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
@@ -4121,33 +4819,30 b' msgid ""'
 "operation.\n"
 "\n"
 "This extension is useful for:\n"
-" * Japanese Windows users using shift_jis encoding.\n"
-" * Chinese Windows users using big5 encoding.\n"
-" * All users who use a repository with one of problematic encodings on\n"
-"   case-insensitive file system.\n"
+"\n"
+"- Japanese Windows users using shift_jis encoding.\n"
+"- Chinese Windows users using big5 encoding.\n"
+"- All users who use a repository with one of problematic encodings on\n"
+"  case-insensitive file system.\n"
 "\n"
 "This extension is not needed for:\n"
-" * Any user who use only ASCII chars in path.\n"
-" * Any user who do not use any of problematic encodings.\n"
+"\n"
+"- Any user who use only ASCII chars in path.\n"
+"- Any user who do not use any of problematic encodings.\n"
 "\n"
 "Note that there are some limitations on using this extension:\n"
-" * You should use single encoding in one repository.\n"
-" * You should set same encoding for the repository by locale or\n"
-"   HGENCODING.\n"
-"\n"
-"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n"
-"\n"
-"  [extensions]\n"
-"  hgext.win32mbcs =\n"
+"\n"
+"- You should use single encoding in one repository.\n"
+"- You should set same encoding for the repository by locale or\n"
+"  HGENCODING.\n"
 "\n"
 "Path encoding conversion are done between Unicode and\n"
-"encoding.encoding which is decided by mercurial from current locale\n"
+"encoding.encoding which is decided by Mercurial from current locale\n"
 "setting or HGENCODING.\n"
-"\n"
-msgstr ""
-
-#, python-format
-msgid "[win32mbcs] filename conversion fail with %s encoding\n"
+msgstr ""
+
+#, python-format
+msgid "[win32mbcs] filename conversion failed with %s encoding\n"
 msgstr ""
 
 msgid "[win32mbcs] cannot activate on this platform.\n"
@@ -4157,6 +4852,36 b' msgstr ""'
 msgid "[win32mbcs] activated with encoding: %s\n"
 msgstr ""
 
+msgid ""
+"perform automatic newline conversion\n"
+"\n"
+"To perform automatic newline conversion, use::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.win32text =\n"
+"  [encode]\n"
+"  ** = cleverencode:\n"
+"  # or ** = macencode:\n"
+"\n"
+"  [decode]\n"
+"  ** = cleverdecode:\n"
+"  # or ** = macdecode:\n"
+"\n"
+"If not doing conversion, to make sure you do not commit CRLF/CR by "
+"accident::\n"
+"\n"
+"  [hooks]\n"
+"  pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
+"  # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
+"\n"
+"To do the same check on a server to prevent CRLF/CR from being\n"
+"pushed or pulled::\n"
+"\n"
+"  [hooks]\n"
+"  pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
+"  # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
+msgstr ""
+
 #, python-format
 msgid ""
 "WARNING: %s already has %s line endings\n"
@@ -4193,28 +4918,22 b' msgid ""'
 msgstr ""
 
 msgid ""
-"zeroconf support for mercurial repositories\n"
+"discover and advertise repositories on the local network\n"
 "\n"
 "Zeroconf enabled repositories will be announced in a network without\n"
 "the need to configure a server or a service. They can be discovered\n"
 "without knowing their actual IP address.\n"
 "\n"
-"To use the zeroconf extension add the following entry to your hgrc\n"
-"file:\n"
-"\n"
-"[extensions]\n"
-"hgext.zeroconf =\n"
-"\n"
 "To allow other people to discover your repository using run \"hg serve\"\n"
-"in your repository.\n"
-"\n"
-" $ cd test\n"
-" $ hg serve\n"
-"\n"
-"You can discover zeroconf enabled repositories by running \"hg paths\".\n"
-"\n"
-" $ hg paths\n"
-" zc-test = http://example.com:8000/test\n"
+"in your repository::\n"
+"\n"
+"  $ cd test\n"
+"  $ hg serve\n"
+"\n"
+"You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
+"\n"
+"  $ hg paths\n"
+"  zc-test = http://example.com:8000/test\n"
 msgstr ""
 
 msgid "archive prefix contains illegal components"
@@ -4280,7 +4999,7 b' msgid "too many revisions specified"'
 msgstr "Zu viele Revisionen angegeben"
 
 #, python-format
-msgid "invalid format spec '%%%s' in output file name"
+msgid "invalid format spec '%%%s' in output filename"
 msgstr "Ungültiges Format '%%%s' für den Namen der Ausgabedatei"
 
 #, python-format
@@ -4432,7 +5151,7 b' msgstr "Kann fehlender Datei nicht folge'
 msgid "%s:%s copy source revision cannot be found!\n"
 msgstr "%s:%s Revision des Originals nicht gefunden!\n"
 
-msgid "can only follow copies/renames for explicit file names"
+msgid "can only follow copies/renames for explicit filenames"
 msgstr ""
 "Kopien/Umbenennungen können nur zu expliziten Dateinamen verfolgt werden"
 
@@ -4442,7 +5161,7 b' msgstr ""'
 "entfernt."
 
 msgid "HG: Leave message empty to abort commit."
-msgstr ""
+msgstr "HG: Leere Versionsmeldung wird das Übernehmen abbrechen."
 
 #, python-format
 msgid "HG: user: %s"
@@ -4456,6 +5175,10 b' msgid "HG: branch \'%s\'"'
 msgstr ""
 
 #, python-format
+msgid "HG: subrepo %s"
+msgstr "HG: Unterarchiv %s"
+
+#, python-format
 msgid "HG: added %s"
 msgstr ""
 
@@ -4480,7 +5203,7 b' msgid ""'
 "    repository.\n"
 "\n"
 "    The files will be added to the repository at the next commit. To\n"
-"    undo an add before that, see hg revert.\n"
+"    undo an add before that, see hg forget.\n"
 "\n"
 "    If no names are given, add all files to the repository.\n"
 "    "
@@ -4508,11 +5231,11 b' msgid ""'
 "    commit.\n"
 "\n"
 "    Use the -s/--similarity option to detect renamed files. With a\n"
-"    parameter > 0, this compares every removed file with every added\n"
-"    file and records those similar enough as renames. This option\n"
-"    takes a percentage between 0 (disabled) and 100 (files must be\n"
-"    identical) as its parameter. Detecting renamed files this way can\n"
-"    be expensive.\n"
+"    parameter greater than 0, this compares every removed file with\n"
+"    every added file and records those similar enough as renames. This\n"
+"    option takes a percentage between 0 (disabled) and 100 (files must\n"
+"    be identical) as its parameter. Detecting renamed files this way\n"
+"    can be expensive.\n"
 "    "
 msgstr ""
 "Fügt alle neuen Dateien hinzu, löscht alle fehlenden Dateien\n"
@@ -4525,7 +5248,7 b' msgstr ""'
 "    Übernehmen (commit).\n"
 "\n"
 "    Nutze die Option -s um umbenannte Dateien zu entdecken. Mit einem\n"
-"    Parameter > 0 wird jede entfernte Datei mit jeder hinzugefügten "
+"    Parameter > 0 wird jede gelöschte Datei mit jeder hinzugefügten "
 "verglichen\n"
 "    und bei genügender Ähnlichkeit als Umbenennung markiert. Diese Option\n"
 "    erwartet eine Prozentangabe zwischen 0 (deaktiviert) und 100 (Dateien\n"
@@ -4540,20 +5263,21 b' msgid "similarity must be between 0 and '
 msgstr "similarity muss zwischen 0 und 100 liegen"
 
 msgid ""
-"show changeset information per file line\n"
+"show changeset information by line for each file\n"
 "\n"
 "    List changes in files, showing the revision id responsible for\n"
 "    each line\n"
 "\n"
-"    This command is useful to discover who did a change or when a\n"
-"    change took place.\n"
+"    This command is useful for discovering when a change was made and\n"
+"    by whom.\n"
 "\n"
 "    Without the -a/--text option, annotate will avoid processing files\n"
-"    it detects as binary. With -a, annotate will generate an\n"
-"    annotation anyway, probably with undesirable results.\n"
-"    "
-msgstr ""
-"Zeigt Änderungssatz (changeset) Informationen pro Dateizeile an\n"
+"    it detects as binary. With -a, annotate will annotate the file\n"
+"    anyway, although the results will probably be neither useful\n"
+"    nor desirable.\n"
+"    "
+msgstr ""
+"Zeigt Informationen über Änderungssätze pro Dateizeile an\n"
 "\n"
 "    Listet Änderungen in Dateien mit der zugehörigen Revisions-Id für jede\n"
 "    Zeile auf\n"
@@ -4561,14 +5285,14 b' msgstr ""'
 "    Dieser Befehl ist nützlich, um herauszufinden wer eine Änderung gemacht\n"
 "    hat oder wann eine Änderung stattgefunden hat.\n"
 "\n"
-"    Ohne die Option -a wird die Verarbeitung von Binärdateien vermieden.\n"
-"    Mit -a werden auch solche Dateien verarbeitet, wahrscheinlich mit "
-"unerwünschtem\n"
-"    Ergebnis.\n"
-"    "
-
-msgid "at least one file name or pattern required"
-msgstr "Zumindest ein Dateiname oder Muster benötigt"
+"    Ohne den Schalter -a/--text wird die Verarbeitung von Binärdateien\n"
+"    vermieden. Mit -a werden auch solche Dateien verarbeitet, "
+"wahrscheinlich\n"
+"    mit unerwünschtem Ergebnis.\n"
+"    "
+
+msgid "at least one filename or pattern is required"
+msgstr "Mindestens ein Dateiname oder Muster benötigt"
 
 msgid "at least one of -n/-c is required for -l"
 msgstr "Zumindest -n oder -c werden für -l benötigt"
@@ -4578,20 +5302,20 b' msgid "%s: binary file\\n"'
 msgstr "%s: Binärdatei\n"
 
 msgid ""
-"create unversioned archive of a repository revision\n"
+"create an unversioned archive of a repository revision\n"
 "\n"
 "    By default, the revision used is the parent of the working\n"
 "    directory; use -r/--rev to specify a different revision.\n"
 "\n"
 "    To specify the type of archive to create, use -t/--type. Valid\n"
-"    types are:\n"
-"\n"
-"    \"files\" (default): a directory full of files\n"
-"    \"tar\": tar archive, uncompressed\n"
-"    \"tbz2\": tar archive, compressed using bzip2\n"
-"    \"tgz\": tar archive, compressed using gzip\n"
-"    \"uzip\": zip archive, uncompressed\n"
-"    \"zip\": zip archive, compressed using deflate\n"
+"    types are::\n"
+"\n"
+"      \"files\" (default): a directory full of files\n"
+"      \"tar\": tar archive, uncompressed\n"
+"      \"tbz2\": tar archive, compressed using bzip2\n"
+"      \"tgz\": tar archive, compressed using gzip\n"
+"      \"uzip\": zip archive, uncompressed\n"
+"      \"zip\": zip archive, compressed using deflate\n"
 "\n"
 "    The exact name of the destination archive or directory is given\n"
 "    using a format string; see 'hg help export' for details.\n"
@@ -4606,17 +5330,18 b' msgstr ""'
 "\n"
 "    Standardmäßig wird die Vorgängerversion der im Arbeitsverzeichnis "
 "gefundenen\n"
-"    verwendet. Eine andere Reversion kann mit \"-r\" angegeben werden.\n"
-"\n"
-"    Um den Typ des Archivs anzugeben, nutze \"-t\". Gültige\n"
-"    Typen sind:\n"
-"\n"
-"    \"files\" (Standard): ein Verzeichnis voller Dateien\n"
-"    \"tar\": tar Archiv, unkomprimiert\n"
-"    \"tbz2\": tar Archiv, komprimiert mit bzip2\n"
-"    \"tgz\": tar Archiv, komprimiert mit gzip\n"
-"    \"uzip\": zip Archiv, unkomprimiert\n"
-"    \"zip\": zip Archiv, komprimiert mit deflate\n"
+"    verwendet. Eine andere Reversion kann mit \"-r/--rev\" angegeben "
+"werden.\n"
+"\n"
+"    Um den Typ des Archivs anzugeben, nutze \"-t/--type\". Gültige\n"
+"    Typen sind::\n"
+"\n"
+"      \"files\" (Standard): ein Verzeichnis voller Dateien\n"
+"      \"tar\": tar Archiv, unkomprimiert\n"
+"      \"tbz2\": tar Archiv, komprimiert mit bzip2\n"
+"      \"tgz\": tar Archiv, komprimiert mit gzip\n"
+"      \"uzip\": zip Archiv, unkomprimiert\n"
+"      \"zip\": zip Archiv, komprimiert mit deflate\n"
 "\n"
 "    Der exakte Name des Zielarchivs oder -verzeichnises wird mit\n"
 "    einem Format-String angegeben; siehe 'hg help export' für Details.\n"
@@ -4642,9 +5367,9 b' msgid ""'
 "    Commit the backed out changes as a new changeset. The new\n"
 "    changeset is a child of the backed out changeset.\n"
 "\n"
-"    If you back out a changeset other than the tip, a new head is\n"
+"    If you backout a changeset other than the tip, a new head is\n"
 "    created. This head will be the new tip and you should merge this\n"
-"    backout changeset with another head (current one by default).\n"
+"    backout changeset with another head.\n"
 "\n"
 "    The --merge option remembers the parent of the working directory\n"
 "    before starting the backout, then merges the new head with that\n"
@@ -4671,7 +5396,7 b' msgstr ""'
 "sofort\n"
 "    übernommen, sondern existiert als lokale Änderung.\n"
 "\n"
-"    Siehe 'hg help dates' für eine Liste gültiger Formate für -d/--date.\n"
+"    Siehe \"hg help dates\" für eine Liste gültiger Formate für -d/--date.\n"
 "    "
 
 msgid "please specify just one revision"
@@ -4680,13 +5405,13 b' msgstr "Bitte nur eine Revision angeben"'
 msgid "please specify a revision to backout"
 msgstr "Bitte eine Revision, die zurückgezogen werden soll, angeben"
 
-msgid "cannot back out change on a different branch"
+msgid "cannot backout change on a different branch"
 msgstr "Kann die Änderung auf einem abweichenden Zweig nicht rückgängig machen"
 
-msgid "cannot back out a change with no parents"
+msgid "cannot backout a change with no parents"
 msgstr "Kann eine Änderung ohne Vorgängerversion nicht rückgängig machen"
 
-msgid "cannot back out a merge changeset without --parent"
+msgid "cannot backout a merge changeset without --parent"
 msgstr "Kann eine Zusammenführung nicht ohne --parent rückgängig machen"
 
 #, python-format
@@ -4697,10 +5422,6 b' msgid "cannot use --parent on non-merge '
 msgstr "Kann mit --parent nur Zusammenführung rückgängig machen"
 
 #, python-format
-msgid "Backed out changeset %s"
-msgstr "Änderungssatz %s wurde rückgängig gemacht"
-
-#, python-format
 msgid "changeset %s backs out changeset %s\n"
 msgstr "Änderungssatz %s macht Änderungssatz %s rückgängig\n"
 
@@ -4722,67 +5443,61 b' msgid ""'
 "    bad, then mark the latest changeset which is free from the problem\n"
 "    as good. Bisect will update your working directory to a revision\n"
 "    for testing (unless the -U/--noupdate option is specified). Once\n"
-"    you have performed tests, mark the working directory as bad or\n"
-"    good and bisect will either update to another candidate changeset\n"
+"    you have performed tests, mark the working directory as good or\n"
+"    bad, and bisect will either update to another candidate changeset\n"
 "    or announce that it has found the bad revision.\n"
 "\n"
 "    As a shortcut, you can also use the revision argument to mark a\n"
 "    revision as good or bad without checking it out first.\n"
 "\n"
-"    If you supply a command it will be used for automatic bisection.\n"
-"    Its exit status will be used as flag to mark revision as bad or\n"
-"    good. In case exit status is 0 the revision is marked as good, 125\n"
-"    - skipped, 127 (command not found) - bisection will be aborted;\n"
-"    any other status bigger than 0 will mark revision as bad.\n"
+"    If you supply a command, it will be used for automatic bisection.\n"
+"    Its exit status will be used to mark revisions as good or bad:\n"
+"    status 0 means good, 125 means to skip the revision, 127\n"
+"    (command not found) will abort the bisection, and any other\n"
+"    non-zero exit status means the revision is bad.\n"
 "    "
 msgstr ""
 "Binäre Suche von Änderungssätzen\n"
 "\n"
-"    Dieser Befehl hilft Änderungssätze zu finden, die Probleme eingeführt "
-"haben.\n"
-"    Dies geschieht, indem eine Revision nach der anderen geladen und "
-"getestet\n"
-"    wird, bis zwei aufeinanderfolgende Revisionen ohne und mit Fehler\n"
-"    gefunden wurden. Das Laden geschieht wie bei einer binären Suche, indem\n"
-"    das Intervall der in Frage kommenden Revisionen immer halbiert wird.\n"
-"\n"
-"    Als Startintervall muss zunächst die letzte als 'gut' bekannte und die\n"
-"    erste 'schlechte' Revision markiert werden. Das Arbeitsverzeichnis wird\n"
-"    dadurch auf eine Revision zum Testen gebracht (es sei denn, die Option\n"
-"    --noupdate ist angegeben). Mit -g (Test erfolgreich = gute Revision) "
-"und\n"
-"    -b (Fehler gefunden = schlechte Revision) wird diese dann markiert und "
-"die\n"
-"    nächste geladen, bzw. das Ziel (die Problemrevision) gemeldet.\n"
-"\n"
-"    Die Markierung kann automatisch durch einem Testprogramm (Option -c) "
-"statt-\n"
-"    finden. Ein Rückgabewert von 0 bedeutet dabei Erfolg, 125 Überspringen\n"
-"    (wie manuell Option -s), 127 Abbruch und jeder andere positive Wert\n"
-"    Fehler (schlechte Revision).\n"
+"    Dieser Befehl hilft Änderungssätze zu finden, die Probleme eingeführt\n"
+"    haben. Dies geschieht, indem eine Revision nach der anderen geladen und\n"
+"    getestet wird, bis zwei aufeinanderfolgende Revisionen ohne und mit\n"
+"    Fehler gefunden wurden.\n"
+"\n"
+"    Markiere zunächst die früheste Version, von der bekannt ist, dass der\n"
+"    Fehler dort auftritt und die entsprechende letzte fehlerfreie Version.\n"
+"    Bisect wird das Arbeitsverzeichnis dann auf eine zu testede Revision\n"
+"    bringen (es sei denn, die Option -U/--noupdate ist angegeben). Nachdem\n"
+"    der Test ausgeführt wurde, muss diese Revision als gut oder schlecht\n"
+"    markiert werden. Bisect wird dann zur nächsten Revision wechseln oder\n"
+"    das Ziel (die erste schlechte Revision) melden.\n"
+"\n"
+"    Die Markierung kann automatisch durch einem Testprogramm stattfinden.\n"
+"    Ein Rückgabewert von 0 bedeutet dabei Erfolg, 125 Überspringen, 127\n"
+"    (Kommando nicht gefunden) Abbruch und jeder andere positive Wert Fehler.\n"
 "    "
 
 msgid "The first good revision is:\n"
-msgstr "Die erste gute Revision ist:\n"
+msgstr "Die erste fehlerfreie Revision ist:\n"
 
 msgid "The first bad revision is:\n"
-msgstr "Die erste schlechte Revision ist:\n"
+msgstr "Die erste fehlerhafte Revision ist:\n"
 
 msgid "Due to skipped revisions, the first good revision could be any of:\n"
 msgstr ""
-"Aufgrund übersprungener Revisionen könnte die erste gute Revision\n"
+"Aufgrund übersprungener Revisionen könnte die erste fehlerfreie Revision\n"
 "eine der folgenden sein:\n"
 
 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
 msgstr ""
-"Aufgrund übersprungener Revisionen könnte die erste schlechte Revision\n"
+"Aufgrund übersprungener Revisionen könnte die erste fehlerhafte Revision\n"
 "eine der folgenden sein:\n"
 
 msgid "cannot bisect (no known good revisions)"
-msgstr "Kann Suche nicht starten (keine bekannte gute Revision)"
+msgstr "Kann Suche nicht starten (keine bekannte fehlerfreie Revision)"
 
 msgid "cannot bisect (no known bad revisions)"
-msgstr "Kann Suche nicht starten (keine bekannte schlechte Revision)"
+msgstr "Kann Suche nicht starten (keine bekannte fehlerhafte Revision)"
 
 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
 msgstr "(Die Syntax 'hg bisect <cmd>' ist veraltet)\n"
@@ -4791,6 +5506,10 b' msgid "incompatible arguments"'
 msgstr "Inkompatible Argumente"
 
 #, python-format
+msgid "cannot find executable: %s"
+msgstr "Kann ausführbare Datei nicht finden: %s"
+
+#, python-format
 msgid "failed to execute %s"
 msgstr "Fehler bei der Ausführung von %s"
 
@@ -4799,29 +5518,31 b' msgid "%s killed"'
 msgstr "%s gestorben"
 
 #, python-format
-msgid "Changeset %s: %s\n"
-msgstr "Änderungssatz %s: %s\n"
-
-#, python-format
-msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
-msgstr "Teste Änderungssatz %s:%s (%s Änderungssätze verbleiben, ~%s Tests)\n"
+msgid "Changeset %d:%s: %s\n"
+msgstr "Änderungssatz %d:%s: %s\n"
+
+#, python-format
+msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
+msgstr "Teste Änderungssatz %d:%s (%d Änderungssätze verbleiben, ~%d Tests)\n"
 
 msgid ""
 "set or show the current branch name\n"
 "\n"
 "    With no argument, show the current branch name. With one argument,\n"
-"    set the working directory branch name (the branch does not exist\n"
-"    in the repository until the next commit). It is recommended to use\n"
-"    the 'default' branch as your primary development branch.\n"
+"    set the working directory branch name (the branch will not exist\n"
+"    in the repository until the next commit). Standard practice\n"
+"    recommends that primary development take place on the 'default'\n"
+"    branch.\n"
 "\n"
 "    Unless -f/--force is specified, branch will not let you set a\n"
-"    branch name that shadows an existing branch.\n"
+"    branch name that already exists, even if it's inactive.\n"
 "\n"
 "    Use -C/--clean to reset the working directory branch to that of\n"
 "    the parent of the working directory, negating a previous branch\n"
 "    change.\n"
 "\n"
-"    Use the command 'hg update' to switch to an existing branch.\n"
+"    Use the command 'hg update' to switch to an existing branch. Use\n"
+"    'hg commit --close-branch' to mark this branch as closed.\n"
 "    "
 msgstr ""
 "Setzt oder zeigt den Namen des aktuellen Zweigs\n"
@@ -4832,10 +5553,11 b' msgstr ""'
 "    Es wird empfohlen den 'default'-Zweig als Hauptentwicklungszweig zu\n"
 "    nutzen.\n"
 "\n"
-"    Außer bei Angabe von --force lässt 'hg branch' nicht zu, einen Namen zu\n"
-"    vergeben, der einen existierenden Zweig überdeckt.\n"
-"\n"
-"    Nutze --clean um den neuen Namen rückgängig zu machen. Die Arbeitskopie\n"
+"    Außer bei Angabe von -f/--force lässt 'hg branch' nicht zu, einen Namen\n"
+"    zu vergeben, der einen existierenden Zweig überdeckt.\n"
+"\n"
+"    Nutze -C/--clean um den neuen Namen rückgängig zu machen. Die "
+"Arbeitskopie\n"
 "    hat dann wieder den selben Namen wie der Vorgänger im Projektarchiv.\n"
 "\n"
 "    Um auf einen anderen (existierenden) Zweig zu wechseln, siehe 'hg "
@@ -4857,9 +5579,11 b' msgid ""'
 "list repository named branches\n"
 "\n"
 "    List the repository's named branches, indicating which ones are\n"
-"    inactive. If active is specified, only show active branches.\n"
-"\n"
-"    A branch is considered active if it contains repository heads.\n"
+"    inactive. If -c/--closed is specified, also list branches which have\n"
+"    been marked closed (see hg commit --close-branch).\n"
+"\n"
+"    If -a/--active is specified, only show active branches. A branch\n"
+"    is considered active if it contains repository heads.\n"
 "\n"
 "    Use the command 'hg update' to switch to an existing branch.\n"
 "    "
@@ -4867,9 +5591,11 b' msgstr ""'
 "Zeigt alle benannten Zweige des Projektarchiv an\n"
 "\n"
 "    Listet die benannten Zweige des Projektarchiv auf und zeigt an, welche\n"
-"    inaktiv sind. Mit der Option -a werden nur aktive Zweige ausgegeben.\n"
-"\n"
-"    Ein Zweig gilt als aktiv, wenn er Köpfe des Projektarchivs enthält.\n"
+"    inaktiv sind. Zweige, die durch \"hg commit --close-branch\" geschlossen\n"
+"    wurden, werden nur mit dem Schalter -c/--closed angezeigt.\n"
+"\n"
+"    Mit der Option -a/--active werden nur aktive Zweige ausgegeben. Ein\n"
+"    Zweig gilt als aktiv, wenn er echte Köpfe besitzt.\n"
 "\n"
 "    Um auf einen anderen (existierenden) Zweig zu wechseln, siehe 'hg "
 "update'.\n"
@@ -4884,9 +5610,11 b' msgid ""'
 "    If no destination repository is specified the destination is\n"
 "    assumed to have all the nodes specified by one or more --base\n"
 "    parameters. To create a bundle containing all changesets, use\n"
-"    -a/--all (or --base null). To change the compression method\n"
-"    applied, use the -t/--type option (by default, bundles are\n"
-"    compressed using bz2).\n"
+"    -a/--all (or --base null).\n"
+"\n"
+"    You can change compression method with the -t/--type option.\n"
+"    The available compression methods are: none, bzip2, and\n"
+"    gzip (by default, bundles are compressed using bzip2).\n"
 "\n"
 "    The bundle file can then be transferred using conventional means\n"
 "    and applied to another repository with the unbundle or pull\n"
@@ -4905,8 +5633,10 b' msgstr ""'
 "    Falls kein Zielarchiv angegeben ist, wird angenommen, dass das Ziel\n"
 "    alle Knoten enthält, die durch einen oder mehrere --base Parameter\n"
 "    angegeben wurden. Um ein Bündel aller Änderungssätze zu erzeugen, nutze\n"
-"    --all (oder --base null). Die angewendete Kompressionsmethode kann mit\n"
-"    der Option -t gewählt werden (standardmäßig bz2).\n"
+"    -a/--all (oder --base null).\n"
+"\n"
+"    Die angewendete Kompressionsmethode kann mit der Option -t/--type\n"
+"    gewählt werden: none (nicht komprimieren), bzip2 (standard) oder gzip.\n"
 "\n"
 "    Die Bündeldatei kann mit üblichen Mitteln transportiert und auf ein "
 "anderes\n"
@@ -4935,30 +5665,31 b' msgid ""'
 "\n"
 "    Output may be to a file, in which case the name of the file is\n"
 "    given using a format string. The formatting rules are the same as\n"
-"    for the export command, with the following additions:\n"
-"\n"
-"    %s   basename of file being printed\n"
-"    %d   dirname of file being printed, or '.' if in repository root\n"
-"    %p   root-relative path name of file being printed\n"
+"    for the export command, with the following additions::\n"
+"\n"
+"      %s   basename of file being printed\n"
+"      %d   dirname of file being printed, or '.' if in repository root\n"
+"      %p   root-relative path name of file being printed\n"
 "    "
 msgstr ""
 "Gibt den Inhalt von Dateien in der aktuellen oder angegebenen Revision aus\n"
 "\n"
 "    Gibt die angegebenen Dateien aus, wie sie zur gegebenen Revision waren.\n"
 "    Wenn keine Revision angegeben wird, wird die Vorgängerversion des\n"
-"    Arbeitsverzeichnisses genutzt. Ansonsten die Spitze, falls keine\n"
+"    Arbeitsverzeichnisses genutzt, oder die Spitze, falls keine\n"
 "    Revision geladen ist.\n"
 "\n"
 "    Die Ausgabe kann in eine Datei erfolgen. In diesem Fall wird der Name\n"
 "    der Datei mit einem Formatstring vorgegeben. Die Formatierungsregeln "
 "sind\n"
-"    analog des 'export'-Befehls mit folgenden Ergänzungen:\n"
-"\n"
-"    %s   Dateiname der ausgegebenen Datei\n"
-"    %d   Verzeichnisname der Datei oder '.' in der Wurzel des Archivs\n"
-"    %p   Pfad und Dateiname relativ zur Archiv-Wurzel\n"
-"    "
-
+"    dem 'export'-Befehl analog, mit folgenden Ergänzungen::\n"
+"\n"
+"      %s   Dateiname der ausgegebenen Datei\n"
+"      %d   Verzeichnisname der Datei oder '.' in der Wurzel des Archivs\n"
+"      %p   Pfad und Dateiname relativ zur Archiv-Wurzel\n"
+"    "
+
+#, fuzzy
 msgid ""
 "make a copy of an existing repository\n"
 "\n"
@@ -4984,8 +5715,7 b' msgid ""'
 "\n"
 "    It is possible to specify an ssh:// URL as the destination, but no\n"
 "    .hg/hgrc and working directory will be created on the remote side.\n"
-"    Look at the help text for URLs for important details about ssh://\n"
-"    URLs.\n"
+"    Please see 'hg help urls' for important details about ssh:// URLs.\n"
 "\n"
 "    For efficiency, hardlinks are used for cloning whenever the source\n"
 "    and destination are on the same filesystem (note this applies only\n"
@@ -4995,7 +5725,7 b' msgid ""'
 "    avoid hardlinking.\n"
 "\n"
 "    In some cases, you can clone repositories and checked out files\n"
-"    using full hardlinks with\n"
+"    using full hardlinks with ::\n"
 "\n"
 "      $ cp -al REPO REPOCLONE\n"
 "\n"
@@ -5005,7 +5735,6 b' msgid ""'
 "    breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
 "    this is not compatible with certain extensions that place their\n"
 "    metadata under the .hg directory, such as mq.\n"
-"\n"
 "    "
 msgstr ""
 "Erzeugt eine Kopie eines bestehenden Projektarchivs\n"
@@ -5044,7 +5773,7 b' msgstr ""'
 "    um das Erzeugen von 'hardlinks' zu vermeiden.\n"
 "\n"
 "    In einigen Fällen können Archiv und Arbeitskopie unter Nutzung\n"
-"    von 'hardlinks' kopiert werden mit\n"
+"    von 'hardlinks' kopiert werden mit ::\n"
 "\n"
 "      $ cp -al REPO REPOCLONE\n"
 "\n"
@@ -5063,13 +5792,13 b' msgid ""'
 "\n"
 "    Commit changes to the given files into the repository. Unlike a\n"
 "    centralized RCS, this operation is a local operation. See hg push\n"
-"    for means to actively distribute your changes.\n"
+"    for a way to actively distribute your changes.\n"
 "\n"
 "    If a list of files is omitted, all changes reported by \"hg status\"\n"
 "    will be committed.\n"
 "\n"
 "    If you are committing the result of a merge, do not provide any\n"
-"    file names or -I/-X filters.\n"
+"    filenames or -I/-X filters.\n"
 "\n"
 "    If no commit message is specified, the configured editor is\n"
 "    started to prompt you for a message.\n"
@@ -5084,7 +5813,7 b' msgstr ""'
 "    bei zentralen Versionsverwaltungssystem ist dies eine lokale Operation.\n"
 "    Vergleiche hg push für Wege zur aktiven Verteilung der Änderungen.\n"
 "\n"
-"    Sollten keine Dateien übergeben werden, werden alle von 'hg status'\n"
+"    Sollten keine Dateien übergeben werden, werden alle von \"hg status\"\n"
 "    angezeigten Änderungen Bestandteil der neuen Revision.\n"
 "\n"
 "    Wenn das Ergebnis einer Zusammenführung übernommen werden soll, dürfen\n"
@@ -5097,6 +5826,9 b' msgstr ""'
 "date.\n"
 "    "
 
+msgid "nothing changed\n"
+msgstr "Keine Änderung\n"
+
 msgid "created new head\n"
 msgstr "neuer Kopf erzeugt\n"
 
@@ -5112,14 +5844,14 b' msgid ""'
 "    the source must be a single file.\n"
 "\n"
 "    By default, this command copies the contents of files as they\n"
-"    stand in the working directory. If invoked with -A/--after, the\n"
+"    exist in the working directory. If invoked with -A/--after, the\n"
 "    operation is recorded, but no copying is performed.\n"
 "\n"
 "    This command takes effect with the next commit. To undo a copy\n"
 "    before that, see hg revert.\n"
 "    "
 msgstr ""
-"Markiert Dateien als Kopien bereits übernommener Dateien\n"
+"Markiert Dateien als Kopien bereits versionierter Dateien\n"
 "\n"
 "    Markiert das Ziel als Kopie der Quelle, so dass es die Versionshistorie "
 "der\n"
@@ -5131,7 +5863,7 b' msgstr ""'
 "sie\n"
 "    im Arbeitsverzeichnis vorliegt. Existiert das Ziel jedoch schon, so "
 "kann\n"
-"    dieses durch Angabe der Option --after/-A als Kopie nachträglich "
+"    dieses durch Angabe der Option -A/--after als Kopie nachträglich "
 "markiert\n"
 "    werden.\n"
 "\n"
@@ -5188,7 +5920,6 b' msgstr "%s im Manifest 1, aber aufgef\xc3\xbchrt im Status %s"'
 msgid ".hg/dirstate inconsistent with current parent's manifest"
 msgstr ".hg/dirstate inkonsistent mit dem Manifest des aktuellen Vorgängers"
 
-#, fuzzy
 msgid ""
 "show combined config settings from all hgrc files\n"
 "\n"
@@ -5200,8 +5931,8 b' msgid ""'
 "    With multiple arguments, print names and values of all config\n"
 "    items with matching section names.\n"
 "\n"
-"    With the --debug flag, the source (filename and line number) is\n"
-"    printed for each config item.\n"
+"    With --debug, the source (filename and line number) is printed\n"
+"    for each config item.\n"
 "    "
 msgstr ""
 "Zeigt die kombinierten Konfigurationswerte aller hgrc-Dateien an\n"
@@ -5213,7 +5944,11 b' msgstr ""'
 "    Konfigurationseintrages angezeigt.\n"
 "\n"
 "    Mit mehreren Argumenten werden die Namen und Werte aller passenden\n"
-"    Konfigurationseinträge angezeigt."
+"    Konfigurationseinträge angezeigt.\n"
+"\n"
+"    Mit dem --debug Schalter wird der Dateiname und die Zeilennummer der\n"
+"    Definitionsquelle mit jedem Eintrag ausgegeben.\n"
+"    "
 
 msgid "only one config item permitted"
 msgstr "Nur ein Konfigurationseintrag ist erlaubt"
@@ -5253,11 +5988,11 b' msgstr "Liest ein Datum ein und gibt es '
 msgid "dump the contents of an index file"
 msgstr ""
 
-msgid "dump an index DAG as a .dot file"
+msgid "dump an index DAG as a graphviz dot file"
 msgstr ""
 
 msgid "test Mercurial installation"
-msgstr "Tested die Mercurial Installation"
+msgstr "Testet die Mercurial Installation"
 
 #, python-format
 msgid "Checking encoding (%s)...\n"
@@ -5301,8 +6036,8 b' msgstr ""'
 "sein. Prüfe die .hgrc Datei!)\n"
 
 msgid ""
-" Internal patcher failure, please report this error to http://www.selenic."
-"com/mercurial/bts\n"
+" Internal patcher failure, please report this error to http://mercurial."
+"selenic.com/bts/\n"
 msgstr ""
 "Fehlschlag des internen patch Werkzeugs. Bitte melden Sie diesen Fehler bei "
 "http://www.selenic.com/mercurial/bts\n"
@@ -5398,6 +6133,7 b' msgstr ""'
 "aufschlussreich.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "dump the header and diffs for one or more changesets\n"
 "\n"
@@ -5411,23 +6147,23 b' msgid ""'
 "    first parent only.\n"
 "\n"
 "    Output may be to a file, in which case the name of the file is\n"
-"    given using a format string. The formatting rules are as follows:\n"
-"\n"
-"    %%   literal \"%\" character\n"
-"    %H   changeset hash (40 bytes of hexadecimal)\n"
-"    %N   number of patches being generated\n"
-"    %R   changeset revision number\n"
-"    %b   basename of the exporting repository\n"
-"    %h   short-form changeset hash (12 bytes of hexadecimal)\n"
-"    %n   zero-padded sequence number, starting at 1\n"
-"    %r   zero-padded changeset revision number\n"
+"    given using a format string. The formatting rules are as follows::\n"
+"\n"
+"      %%   literal \"%\" character\n"
+"      %H   changeset hash (40 bytes of hexadecimal)\n"
+"      %N   number of patches being generated\n"
+"      %R   changeset revision number\n"
+"      %b   basename of the exporting repository\n"
+"      %h   short-form changeset hash (12 bytes of hexadecimal)\n"
+"      %n   zero-padded sequence number, starting at 1\n"
+"      %r   zero-padded changeset revision number\n"
 "\n"
 "    Without the -a/--text option, export will avoid generating diffs\n"
 "    of files it detects as binary. With -a, export will generate a\n"
 "    diff anyway, probably with undesirable results.\n"
 "\n"
 "    Use the -g/--git option to generate diffs in the git extended diff\n"
-"    format. Read the diffs help topic for more information.\n"
+"    format. See 'hg help diffs' for more information.\n"
 "\n"
 "    With the --switch-parent option, the diff will be against the\n"
 "    second parent. It can be useful to review a merge.\n"
@@ -5447,16 +6183,16 b' msgstr ""'
 "    Die Ausgabe kann in eine Datei erfolgen (Option -o). In diesem Fall "
 "wird\n"
 "    der Name für jede ausgegebene Revision anhand einer Formatangabe "
-"erzeugt:\n"
-"\n"
-"    %%   literales \"%\" Zeichen\n"
-"    %H   Prüfsumme des Änderungssatzes (40 Byte hexadezimal)\n"
-"    %N   Anzahl der generierten Patches\n"
-"    %R   Revisionnummer des Änderungssatzes\n"
-"    %b   Basisname des exportierten Archivs\n"
-"    %h   Kurzform der Prüfsumme des Änderungssatzes (12 Byte hexadezimal)\n"
-"    %n   laufende Nummer mit führenden Nullen, beginnend bei 1\n"
-"    %r   Revisionsnummer mit führenden Nullen\n"
+"erzeugt::\n"
+"\n"
+"      %%   literales \"%\" Zeichen\n"
+"      %H   Prüfsumme des Änderungssatzes (40 Byte hexadezimal)\n"
+"      %N   Anzahl der generierten Patches\n"
+"      %R   Revisionnummer des Änderungssatzes\n"
+"      %b   Basisname des exportierten Archivs\n"
+"      %h   Kurzform der Prüfsumme des Änderungssatzes (12 Byte hexadezimal)\n"
+"      %n   laufende Nummer mit führenden Nullen, beginnend bei 1\n"
+"      %r   Revisionsnummer mit führenden Nullen\n"
 "\n"
 "    Ohne die Option -a vermeidet export den Vergleich von binären Dateien.\n"
 "    Mit -a wird der Vergleich in jedem Fall durchgeführt, wahrscheinlich "
@@ -5478,6 +6214,27 b' msgid "exporting patch:\\n"'
 msgstr "Exportiere Patch:\n"
 
 msgid ""
+"forget the specified files on the next commit\n"
+"\n"
+"    Mark the specified files so they will no longer be tracked\n"
+"    after the next commit.\n"
+"\n"
+"    This only removes files from the current branch, not from the\n"
+"    entire project history, and it does not delete them from the\n"
+"    working directory.\n"
+"\n"
+"    To undo a forget before the next commit, see hg add.\n"
+"    "
+msgstr ""
+
+msgid "no files specified"
+msgstr "Keine Dateien angegeben"
+
+#, python-format
+msgid "not removing %s: file is already untracked\n"
+msgstr "Entferne %s nicht: Datei ist nicht versioniert\n"
+
+msgid ""
 "search for a pattern in specified files and revisions\n"
 "\n"
 "    Search revisions of files for a regular expression.\n"
@@ -5521,36 +6278,55 b' msgid ""'
 "\n"
 "    With no arguments, show all repository head changesets.\n"
 "\n"
-"    If branch or revisions names are given this will show the heads of\n"
-"    the specified branches or the branches those revisions are tagged\n"
-"    with.\n"
-"\n"
 "    Repository \"heads\" are changesets that don't have child\n"
 "    changesets. They are where development generally takes place and\n"
 "    are the usual targets for update and merge operations.\n"
 "\n"
-"    Branch heads are changesets that have a given branch tag, but have\n"
-"    no child changesets with that tag. They are usually where\n"
-"    development on the given branch takes place.\n"
+"    If one or more REV is given, the \"branch heads\" will be shown for\n"
+"    the named branch associated with that revision. The name of the\n"
+"    branch is called the revision's branch tag.\n"
+"\n"
+"    Branch heads are revisions on a given named branch that do not have\n"
+"    any descendants on the same branch. A branch head could be a true head\n"
+"    or it could be the last changeset on a branch before a new branch\n"
+"    was created. If none of the branch heads are true heads, the branch\n"
+"    is considered inactive. If -c/--closed is specified, also show branch\n"
+"    heads marked closed (see hg commit --close-branch).\n"
+"\n"
+"    If STARTREV is specified only those heads (or branch heads) that\n"
+"    are descendants of STARTREV will be displayed.\n"
 "    "
 msgstr ""
 "Zeigt die Köpfe des Archivs oder von Entwicklungszweigen\n"
 "\n"
-"    Ohne Argumente werden alle Kopfversionen angezeigt\n"
-"\n"
-"    Wenn Zweig- oder Revisionsnamen angegeben werden, werden die Köpfe\n"
-"    dieser Zweige oder der Zweige, mit denen die Revisionen markiert\n"
-"    wurden, angezeigt.\n"
-"\n"
-"    Die \"Köpfe\" eines Archivs sind Änderungssätze, die keine\n"
-"    Folgeversion haben. Hier findet typischerweise die Entwicklung statt\n"
-"    und diese Versionen sind normalerweise Ziel von Aktualisierungen oder\n"
-"    Zusammenführungen.\n"
-"\n"
-"    Köpfe von Zweigen sind Versionen mit einem Zweignamen, die aber\n"
-"    keine Folgeversionen dieses Namens haben. Hier findet typischerweise\n"
-"    die Entwicklung dieses Zweiges statt.\n"
-"    "
+"    Ohne Argumente werden alle Köpfe des Archivs angezeigt.\n"
+"\n"
+"    Archivköpfe sind Revisionen, die keine Kinder haben. Typischerweise "
+"geht\n"
+"    die Entwicklung hier weiter und die Köpfe sind häufig Ziel von\n"
+"    Aktualisierungen und Zusammenführungen.\n"
+"\n"
+"    Wenn eine oder mehrere REV Argumente gegeben sind, werden die Köpfe von\n"
+"    den benannten Zweigen dieser Revisionen angezeigt. Der Name des Zweigs\n"
+"    wird auch das Zweigetikett der Revision genannt.\n"
+"\n"
+"    Zweigköpfe sind Revisionen eines bestimmten Zweigs, die keine Kinder\n"
+"    im selben Zweig besitzen. Dies kann ein \"echter\" Kopf sein, oder die\n"
+"    letzte Revision bevor ein neuer Zweig erstellt wurde. Falls kein Kopf\n"
+"    eines Zweigs ein echter Kopf ist, gilt der Zweig als inaktiv. Zweige\n"
+"    die mit dem Übernahmeoption \"--close-branch\" geschlossen wurden,\n"
+"    werden nur mit dem -c/--closed Schalter angezeigt.\n"
+"\n"
+"    Bei Angabe einer STARTREV werden nur solche Köpfe (oder Zweigköpfe)\n"
+"    angezeigt, die Nachfahren der gegebenen Revision sind.\n"
+"    "
+
+msgid "you must specify a branch to use --closed"
+msgstr "für --closed muss ein Zweig angegeben sein"
+
+#, python-format
+msgid "no open branch heads on branch %s\n"
+msgstr "Keine offenen Zweigköpfe auf Zweig %s\n"
 
 #, python-format
 msgid "no changes on branch %s containing %s are reachable from %s\n"
@@ -5561,10 +6337,11 b' msgstr ""'
 msgid "no changes on branch %s are reachable from %s\n"
 msgstr "Keine Änderungen auf dem Zweig %s sind von %s erreichbar\n"
 
+#, fuzzy
 msgid ""
 "show help for a given topic or a help overview\n"
 "\n"
-"    With no arguments, print a list of commands and short help.\n"
+"    With no arguments, print a list of commands with short help messages.\n"
 "\n"
 "    Given a topic, extension, or command name, print help for that\n"
 "    topic."
@@ -5618,25 +6395,19 b' msgstr "Optionen:\\n"'
 msgid "no commands defined\n"
 msgstr "keine Befehle definiert\n"
 
-msgid ""
-"\n"
-"enabled extensions:\n"
-"\n"
-msgstr ""
-"\n"
-"Aktive Erweiterungen:\n"
-"\n"
-
-#, python-format
-msgid " %s   %s\n"
-msgstr ""
+msgid "enabled extensions:"
+msgstr "Aktive Erweiterungen:"
 
 msgid "no help text available"
 msgstr "keine Hilfe verfügbar"
 
 #, python-format
-msgid "%s extension - %s\n"
-msgstr "%s Erweiterung - %s\n"
+msgid ""
+"%s extension - %s\n"
+"\n"
+msgstr ""
+"%s Erweiterung - %s\n"
+"\n"
 
 msgid "Mercurial Distributed SCM\n"
 msgstr ""
@@ -5657,13 +6428,15 b' msgstr ""'
 "Zusätzliche Hilfethemen:\n"
 "\n"
 
+#, fuzzy
 msgid ""
 "identify the working copy or specified revision\n"
 "\n"
 "    With no revision, print a summary of the current state of the\n"
 "    repository.\n"
 "\n"
-"    With a path, do a lookup in another repository.\n"
+"    Specifying a path to a repository root or Mercurial bundle will\n"
+"    cause lookup to operate on that repository/bundle.\n"
 "\n"
 "    This summary identifies the repository state using one or two\n"
 "    parent hash identifiers, followed by a \"+\" if there are\n"
@@ -5676,7 +6449,8 b' msgstr ""'
 "    Ohne Revision wird eine Zusammenfassung des aktuellen Status des\n"
 "    Projektarchivs angezeigt.\n"
 "\n"
-"    Mit einem Pfad wird eine Abfrage auf ein anderes Archiv ausgeführt.\n"
+"    Mit einem Pfad auf ein Projektverzeichnis oder ein Bündel wird eine\n"
+"    Abfrage auf dies andere Archiv/Bündel ausgeführt.\n"
 "\n"
 "    Die Zusammenfassung beschreibt den Zustand des Projektarchivs unter\n"
 "    Nutzung von ein oder zwei Prüfsummenbezeichnern, gefolgt von einem \"+"
@@ -5686,6 +6460,7 b' msgstr ""'
 "    falls nicht der 'default'-Zweig vorliegt.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "import an ordered set of patches\n"
 "\n"
@@ -5695,8 +6470,8 b' msgid ""'
 "    will abort unless given the -f/--force flag.\n"
 "\n"
 "    You can import a patch straight from a mail message. Even patches\n"
-"    as attachments work (body part must be type text/plain or\n"
-"    text/x-patch to be used). From and Subject headers of email\n"
+"    as attachments work (to use the body part, it must have type\n"
+"    text/plain or text/x-patch). From and Subject headers of email\n"
 "    message are used as default committer and commit message. All\n"
 "    text/plain body parts before first diff are added to commit\n"
 "    message.\n"
@@ -5715,8 +6490,9 b' msgid ""'
 "    With -s/--similarity, hg will attempt to discover renames and\n"
 "    copies in the patch in the same way as 'addremove'.\n"
 "\n"
-"    To read a patch from standard input, use patch name \"-\". See 'hg\n"
-"    help dates' for a list of formats valid for -d/--date.\n"
+"    To read a patch from standard input, use \"-\" as the patch name. If\n"
+"    a URL is specified, the patch will be downloaded from it.\n"
+"    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
 "Importiert eine Liste von Patches\n"
@@ -5770,18 +6546,19 b' msgstr ""'
 "Meldung:\n"
 "%s\n"
 
-msgid "not a mercurial patch"
+msgid "not a Mercurial patch"
 msgstr "Kein Mercurial Patch"
 
 msgid "patch is damaged or loses information"
 msgstr "Prüfsumme stimmt nicht überein: Patch korrumpiert"
 
+#, fuzzy
 msgid ""
 "show new changesets found in source\n"
 "\n"
 "    Show new changesets found in the specified path/URL or the default\n"
-"    pull location. These are the changesets that would be pulled if a\n"
-"    pull was requested.\n"
+"    pull location. These are the changesets that would have been pulled\n"
+"    if a pull at the time you issued this command.\n"
 "\n"
 "    For remote repository, using --bundle avoids downloading the\n"
 "    changesets twice if the incoming is followed by a pull.\n"
@@ -5791,12 +6568,8 b' msgid ""'
 msgstr ""
 "Zeigt neue Revisionen in einer externen Quelle an\n"
 "\n"
-"    Zeigt alle neuen Änderungen an, die durch ein \"hg pull\" vom "
-"angegebenen\n"
-"    Pfad/URL oder dem 'default'-Pfad geholt werden würden. Diese "
-"Änderungssätze\n"
-"    würden geholt, wenn 'hg pull' ausgeführt würde.\n"
-"\n"
+"    Zeigt alle neuen Änderungen an, die durch ein \"hg pull\" vom \n"
+"    angegebenen Pfad/URL oder dem 'default'-Pfad geholt werden würden.\n"
 "    Für entfernte Archive sorgt die Option --bundle dafür, dass die "
 "Änderungen\n"
 "    bei einem folgenden \"hg pull\" nicht ein zweites Mal geholt werden.\n"
@@ -5804,11 +6577,12 b' msgstr ""'
 "    Siehe \"hg help pull\" für gültige Angaben für die Quelle.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "create a new repository in the given directory\n"
 "\n"
 "    Initialize a new repository in the given directory. If the given\n"
-"    directory does not exist, it is created.\n"
+"    directory does not exist, it will be created.\n"
 "\n"
 "    If no directory is given, the current directory is used.\n"
 "\n"
@@ -5827,23 +6601,24 b' msgstr ""'
 "    Siehe 'hg help urls' für mehr Informationen.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "locate files matching specific patterns\n"
 "\n"
-"    Print all files under Mercurial control whose names match the\n"
-"    given patterns.\n"
-"\n"
-"    This command searches the entire repository by default. To search\n"
-"    just the current directory and its subdirectories, use\n"
-"    \"--include .\".\n"
-"\n"
-"    If no patterns are given to match, this command prints all file\n"
-"    names.\n"
+"    Print files under Mercurial control in the working directory whose\n"
+"    names match the given patterns.\n"
+"\n"
+"    By default, this command searches all directories in the working\n"
+"    directory. To search just the current directory and its\n"
+"    subdirectories, use \"--include .\".\n"
+"\n"
+"    If no patterns are given to match, this command prints the names\n"
+"    of all files under Mercurial control in the working directory.\n"
 "\n"
 "    If you want to feed the output of this command into the \"xargs\"\n"
 "    command, use the -0 option to both this command and \"xargs\". This\n"
 "    will avoid the problem of \"xargs\" treating single filenames that\n"
-"    contain white space as multiple filenames.\n"
+"    contain whitespace as multiple filenames.\n"
 "    "
 msgstr ""
 "Suche Dateien mit bestimmtem Namen\n"
@@ -5864,6 +6639,7 b' msgstr ""'
 "    mit Leerzeichen in Dateinamen vermeidet.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "show revision history of entire repository or files\n"
 "\n"
@@ -5871,8 +6647,8 b' msgid ""'
 "    project.\n"
 "\n"
 "    File history is shown without following rename or copy history of\n"
-"    files. Use -f/--follow with a file name to follow history across\n"
-"    renames and copies. --follow without a file name will only show\n"
+"    files. Use -f/--follow with a filename to follow history across\n"
+"    renames and copies. --follow without a filename will only show\n"
 "    ancestors or descendants of the starting revision. --follow-first\n"
 "    only follows the first parent of merge revisions.\n"
 "\n"
@@ -5882,16 +6658,15 b' msgid ""'
 "\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "\n"
-"    By default this command outputs: changeset id and hash, tags,\n"
-"    non-trivial parents, user, date and time, and a summary for each\n"
-"    commit. When the -v/--verbose switch is used, the list of changed\n"
-"    files and full commit message is shown.\n"
+"    By default this command prints revision number and changeset id,\n"
+"    tags, non-trivial parents, user, date and time, and a summary for\n"
+"    each commit. When the -v/--verbose switch is used, the list of\n"
+"    changed files and full commit message are shown.\n"
 "\n"
 "    NOTE: log -p/--patch may generate unexpected diff output for merge\n"
 "    changesets, as it will only compare the merge changeset against\n"
-"    its first parent. Also, the files: list will only reflect files\n"
-"    that are different from BOTH parents.\n"
-"\n"
+"    its first parent. Also, only files different from BOTH parents\n"
+"    will appear in files:.\n"
 "    "
 msgstr ""
 "Zeigt die Revisionshistorie des Archivs oder von Dateien an\n"
@@ -5934,10 +6709,10 b' msgid ""'
 "\n"
 "    Print a list of version controlled files for the given revision.\n"
 "    If no revision is given, the first parent of the working directory\n"
-"    is used, or the null revision if none is checked out.\n"
-"\n"
-"    With -v flag, print file permissions, symlink and executable bits.\n"
-"    With --debug flag, print file revision hashes.\n"
+"    is used, or the null revision if no revision is checked out.\n"
+"\n"
+"    With -v, print file permissions, symlink and executable bits.\n"
+"    With --debug, print file revision hashes.\n"
 "    "
 msgstr ""
 "Gibt das Manifest der angegebenen oder aktuellen Revision aus.\n"
@@ -5950,25 +6725,26 b' msgstr ""'
 "\n"
 "    Mit dem Schalter -v werden zusätzlich zum Dateinamen auch die Rechte "
 "und\n"
-"    der Dateityp (Verknüpfung/ausführbar) ausgegeben. Mit --debug auch noch\n"
+"    der Dateityp (Verknüpfung/ausführbar) ausgegeben; mit --debug auch noch\n"
 "    die Prüfsumme.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "merge working directory with another revision\n"
 "\n"
-"    The contents of the current working directory is updated with all\n"
-"    changes made in the requested revision since the last common\n"
-"    predecessor revision.\n"
+"    The current working directory is updated with all changes made in\n"
+"    the requested revision since the last common predecessor revision.\n"
 "\n"
 "    Files that changed between either parent are marked as changed for\n"
 "    the next commit and a commit must be performed before any further\n"
-"    updates are allowed. The next commit has two parents.\n"
+"    updates to the repository are allowed. The next commit will have\n"
+"    two parents.\n"
 "\n"
 "    If no revision is specified, the working directory's parent is a\n"
 "    head revision, and the current branch contains exactly one other\n"
 "    head, the other head is merged with by default. Otherwise, an\n"
-"    explicit revision to merge with must be provided.\n"
+"    explicit revision with which to merge with must be provided.\n"
 "    "
 msgstr ""
 "Führt das Arbeitsverzeichnis mit einer anderen Revision zusammen\n"
@@ -6031,14 +6807,15 b' msgstr ""'
 "    Siehe Hilfe zu 'pull' für das Format der Zieladresse.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "show the parents of the working directory or revision\n"
 "\n"
 "    Print the working directory's parent revisions. If a revision is\n"
 "    given via -r/--rev, the parent of that revision will be printed.\n"
-"    If a file argument is given, revision in which the file was last\n"
-"    changed (before the working directory revision or the argument to\n"
-"    --rev if given) is printed.\n"
+"    If a file argument is given, the revision in which the file was\n"
+"    last changed (before the working directory revision or the\n"
+"    argument to --rev if given) is printed.\n"
 "    "
 msgstr ""
 "Zeigt die Vorgänger des Arbeitsverzeichnisses oder einer Revision\n"
@@ -6051,18 +6828,19 b' msgstr ""'
 "    angegeben).\n"
 "    "
 
-msgid "can only specify an explicit file name"
+msgid "can only specify an explicit filename"
 msgstr "Ein expliziter Dateiname muss angegeben werden"
 
 #, python-format
 msgid "'%s' not found in manifest!"
 msgstr "'%s' nicht im Manifest gefunden!"
 
+#, fuzzy
 msgid ""
 "show aliases for remote repositories\n"
 "\n"
 "    Show definition of symbolic path name NAME. If no name is given,\n"
-"    show definition of available names.\n"
+"    show definition of all available names.\n"
 "\n"
 "    Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
 "    and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
@@ -6087,7 +6865,7 b' msgid "not found!\\n"'
 msgstr "nicht gefunden!\n"
 
 msgid "not updating, since new heads added\n"
-msgstr "Aktualisierung nicht durchgeführt, da neue Köpfe hingefügt wurden\n"
+msgstr "Aktualisierung nicht durchgeführt, da neue Köpfe hinzugefügt wurden\n"
 
 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
 msgstr ""
@@ -6096,17 +6874,21 b' msgstr ""'
 msgid "(run 'hg update' to get a working copy)\n"
 msgstr "(führe \"hg update\" aus, um ein Arbeitsverzeichnis zu erstellen)\n"
 
+#, fuzzy
 msgid ""
 "pull changes from the specified source\n"
 "\n"
-"    Pull changes from a remote repository to the local one.\n"
+"    Pull changes from a remote repository to a local one.\n"
 "\n"
 "    This finds all changes from the repository at the specified path\n"
-"    or URL and adds them to the local repository. By default, this\n"
-"    does not update the copy of the project in the working directory.\n"
-"\n"
-"    Use hg incoming if you want to see what will be added by the next\n"
-"    pull without actually adding the changes to the repository.\n"
+"    or URL and adds them to a local repository (the current one unless\n"
+"    -R is specified). By default, this does not update the copy of the\n"
+"    project in the working directory.\n"
+"\n"
+"    Use hg incoming if you want to see what would have been added by a\n"
+"    pull at the time you issued this command. If you then decide to\n"
+"    added those changes to the repository, you should use pull -r X\n"
+"    where X is the last changeset listed by hg incoming.\n"
 "\n"
 "    If SOURCE is omitted, the 'default' path will be used.\n"
 "    See 'hg help urls' for more information.\n"
@@ -6129,6 +6911,7 b' msgstr ""'
 "    Formate für die Quellangabe.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "push changes to the specified destination\n"
 "\n"
@@ -6141,14 +6924,13 b' msgid ""'
 "\n"
 "    By default, push will refuse to run if it detects the result would\n"
 "    increase the number of remote heads. This generally indicates the\n"
-"    the client has forgotten to pull and merge before pushing.\n"
+"    user forgot to pull and merge before pushing.\n"
 "\n"
 "    If -r/--rev is used, the named revision and all its ancestors will\n"
 "    be pushed to the remote repository.\n"
 "\n"
-"    Look at the help text for URLs for important details about ssh://\n"
+"    Please see 'hg help urls' for important details about ssh://\n"
 "    URLs. If DESTINATION is omitted, a default path will be used.\n"
-"    See 'hg help urls' for more information.\n"
 "    "
 msgstr ""
 "Überträgt lokale Änderungen in das angegebene Ziel\n"
@@ -6197,6 +6979,7 b' msgstr ""'
 "    nur dann nötig sein, wenn eine Meldung von Mercurial es vorschlägt.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "remove the specified files on the next commit\n"
 "\n"
@@ -6206,19 +6989,19 b' msgid ""'
 "    entire project history. -A/--after can be used to remove only\n"
 "    files that have already been deleted, -f/--force can be used to\n"
 "    force deletion, and -Af can be used to remove files from the next\n"
-"    revision without deleting them.\n"
+"    revision without deleting them from the working directory.\n"
 "\n"
 "    The following table details the behavior of remove for different\n"
 "    file states (columns) and option combinations (rows). The file\n"
-"    states are Added, Clean, Modified and Missing (as reported by hg\n"
-"    status). The actions are Warn, Remove (from branch) and Delete\n"
-"    (from disk).\n"
-"\n"
-"           A  C  M  !\n"
-"    none   W  RD W  R\n"
-"    -f     R  RD RD R\n"
-"    -A     W  W  W  R\n"
-"    -Af    R  R  R  R\n"
+"    states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
+"    reported by hg status). The actions are Warn, Remove (from branch)\n"
+"    and Delete (from disk)::\n"
+"\n"
+"             A  C  M  !\n"
+"      none   W  RD W  R\n"
+"      -f     R  RD RD R\n"
+"      -A     W  W  W  R\n"
+"      -Af    R  R  R  R\n"
 "\n"
 "    This command schedules the files to be removed at the next commit.\n"
 "    To undo a remove before that, see hg revert.\n"
@@ -6240,22 +7023,19 b' msgstr ""'
 "    (Reihen). Die Dateizustände sind Hinzugefügt (A), Unverändert (C),\n"
 "    Verändert (M) und Fehlend (!) (wie von 'hg status' angezeigt). Die\n"
 "    Aktionen sind Warnen, Entfernen (aus dem Zweig) und Löschen\n"
-"    (von der Festplatte).\n"
-"\n"
-"           A  C  M  !\n"
-"    keine  W  EL W  E\n"
-"    -f     E  EL EL E\n"
-"    -A     W  W  W  E\n"
-"    -Af    E  E  E  E\n"
+"    (von der Festplatte)::\n"
+"\n"
+"             A  C  M  !\n"
+"      keine  W  EL W  E\n"
+"      -f     E  EL EL E\n"
+"      -A     W  W  W  E\n"
+"      -Af    E  E  E  E\n"
 "\n"
 "    Die Dateien werden im Projektarchiv beim nächsten Übernehmen (commit)\n"
 "    entfernt. Um diese Aktion vorher rückgängig zu machen, siehe 'hg "
 "revert'.\n"
 "    "
 
-msgid "no files specified"
-msgstr "Keine Dateien angegeben"
-
 #, python-format
 msgid "not removing %s: file is untracked\n"
 msgstr "Entferne %s nicht: Datei ist nicht versioniert\n"
@@ -6265,7 +7045,7 b' msgid "not removing %s: file %s (use -f '
 msgstr "Entferne nicht %s: Datei %s (Nutze -f um Entfernung zu erzwingen)\n"
 
 msgid "still exists"
-msgstr "Existiert immernoch"
+msgstr "Existiert immer noch"
 
 msgid "is modified"
 msgstr "Ist modifiziert"
@@ -6307,6 +7087,7 b' msgstr ""'
 "    \"hg revert\" rückgängig gemacht werden.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "retry file merges from a merge or update\n"
 "\n"
@@ -6318,13 +7099,14 b' msgid ""'
 "    will be overwritten if the merge is retried with resolve. The\n"
 "    -m/--mark switch should be used to mark the file as resolved.\n"
 "\n"
-"    This command will also allow listing resolved files and manually\n"
-"    marking and unmarking files as resolved. All files must be marked\n"
-"    as resolved before the new commits are permitted.\n"
-"\n"
-"    The codes used to show the status of files are:\n"
-"    U = unresolved\n"
-"    R = resolved\n"
+"    This command also allows listing resolved files and manually\n"
+"    indicating whether or not files are resolved. All files must be\n"
+"    marked as resolved before a commit is permitted.\n"
+"\n"
+"    The codes used to show the status of files are::\n"
+"\n"
+"      U = unresolved\n"
+"      R = resolved\n"
 "    "
 msgstr ""
 "Wiederholt eine Dateizusammenführung oder Aktualisierung\n"
@@ -6342,13 +7124,14 b' msgstr ""'
 "    -m/--mark als aufgelöst markiert werden.\n"
 "\n"
 "    Der aktuelle Status wird mit -l/--list angezeigt. Die dabei verwendeten\n"
-"    Zeichen bedeuten:\n"
+"    Zeichen bedeuten::\n"
+"\n"
 "      U = noch konfliktbehaftet (unresolved)\n"
 "      R = konfliktfrei (resolved)\n"
 "    "
 
 msgid "too many options specified"
-msgstr "Zuviele Optionen angegeben"
+msgstr "Zu viele Optionen angegeben"
 
 msgid "can't specify --all and patterns"
 msgstr "Verwende nicht --all gleichzeitig mit einem Dateimuster"
@@ -6455,18 +7238,20 b' msgstr "Datei nicht unter Versionskontro'
 msgid "no changes needed to %s\n"
 msgstr "keine Änderungen notwendig für %s\n"
 
+#, fuzzy
 msgid ""
 "roll back the last transaction\n"
 "\n"
 "    This command should be used with care. There is only one level of\n"
 "    rollback, and there is no way to undo a rollback. It will also\n"
 "    restore the dirstate at the time of the last transaction, losing\n"
-"    any dirstate changes since that time.\n"
+"    any dirstate changes since that time. This command does not alter\n"
+"    the working directory.\n"
 "\n"
 "    Transactions are used to encapsulate the effects of all commands\n"
 "    that create new changesets or propagate existing changesets into a\n"
 "    repository. For example, the following commands are transactional,\n"
-"    and their effects can be rolled back:\n"
+"    and their effects can be rolled back::\n"
 "\n"
 "      commit\n"
 "      import\n"
@@ -6494,7 +7279,7 b' msgstr ""'
 "    Transaktionen werden verwendet um den Effekt aller Befehle, die "
 "Änderungs-\n"
 "    sätze erstellen oder verteilen, zu kapseln. Die folgenden Befehle\n"
-"    werden durch Transaktionen geschützt:\n"
+"    werden durch Transaktionen geschützt::\n"
 "\n"
 "      commit\n"
 "      import\n"
@@ -6548,15 +7333,16 b' msgstr ""'
 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
 msgstr "Höre auf http://%s%s/%s (gebunden an %s:%d)\n"
 
+#, fuzzy
 msgid ""
 "show changed files in the working directory\n"
 "\n"
 "    Show status of files in the repository. If names are given, only\n"
 "    files that match are shown. Files that are clean or ignored or\n"
-"    source of a copy/move operation, are not listed unless -c/--clean,\n"
-"    -i/--ignored, -C/--copies or -A/--all is given. Unless options\n"
-"    described with \"show only ...\" are given, the options -mardu are\n"
-"    used.\n"
+"    the source of a copy/move operation, are not listed unless\n"
+"    -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
+"    Unless options described with \"show only ...\" are given, the\n"
+"    options -mardu are used.\n"
 "\n"
 "    Option -q/--quiet hides untracked (unknown and ignored) files\n"
 "    unless explicitly requested with -u/--unknown or -i/--ignored.\n"
@@ -6567,17 +7353,19 b' msgid ""'
 "    to one merge parent.\n"
 "\n"
 "    If one revision is given, it is used as the base revision.\n"
-"    If two revisions are given, the difference between them is shown.\n"
-"\n"
-"    The codes used to show the status of files are:\n"
-"    M = modified\n"
-"    A = added\n"
-"    R = removed\n"
-"    C = clean\n"
-"    ! = missing (deleted by non-hg command, but still tracked)\n"
-"    ? = not tracked\n"
-"    I = ignored\n"
-"      = the previous added file was copied from here\n"
+"    If two revisions are given, the differences between them are\n"
+"    shown.\n"
+"\n"
+"    The codes used to show the status of files are::\n"
+"\n"
+"      M = modified\n"
+"      A = added\n"
+"      R = removed\n"
+"      C = clean\n"
+"      ! = missing (deleted by non-hg command, but still tracked)\n"
+"      ? = not tracked\n"
+"      I = ignored\n"
+"        = origin of the previous file listed as A (added)\n"
 "    "
 msgstr ""
 "Zeigt geänderte Dateien im Arbeitsverzeichnis\n"
@@ -6607,16 +7395,17 b' msgstr ""'
 "    Bei Angabe zweier Revisionen werden die Unterschiede zwischen diesen\n"
 "    beiden gezeigt.\n"
 "\n"
-"    Die Kürzel zur Angabe des Status einer Datei sind:\n"
-"    M = modifiziert\n"
-"    A = hinzugefügt (added)\n"
-"    R = entfernt (removed)\n"
-"    C = unverändert (clean)\n"
-"    ! = verschwunden (nicht durch einen hg-Befehl gelöscht, aber immer\n"
-"        noch überwacht)\n"
-"    ? = nicht überwacht\n"
-"    I = ignoriert\n"
-"      = die zuvor hinzugefügt Datei wurde von hier kopiert\n"
+"    Die Kürzel zur Angabe des Status einer Datei sind::\n"
+"\n"
+"      M = modifiziert\n"
+"      A = hinzugefügt (added)\n"
+"      R = entfernt (removed)\n"
+"      C = unverändert (clean)\n"
+"      ! = verschwunden (nicht durch einen hg-Befehl gelöscht, aber immer\n"
+"          noch überwacht)\n"
+"      ? = nicht überwacht\n"
+"      I = ignoriert\n"
+"        = die zuvor hinzugefügt Datei wurde von hier kopiert\n"
 "    "
 
 msgid ""
@@ -6687,16 +7476,8 b' msgid "tag \'%s\' is not a local tag"'
 msgstr "Etikett '%s' ist nicht lokal"
 
 #, python-format
-msgid "Removed tag %s"
-msgstr "Etikett %s entfernt"
-
-#, python-format
 msgid "tag '%s' already exists (use -f to force)"
-msgstr "Etikett '%s' exitiert bereitsi; erzwinge mit -f/--force"
-
-#, python-format
-msgid "Added tag %s for changeset %s"
-msgstr "Etikett %s für Änderungssatz %s hinzugefügt"
+msgstr "Etikett '%s' existiert bereits; erzwinge mit -f/--force"
 
 msgid ""
 "list repository tags\n"
@@ -6712,12 +7493,13 b' msgstr ""'
 "    --verbose werden lokale in einer dritten Spalte als solche markiert.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "show the tip revision\n"
 "\n"
-"    The tip revision (usually just called the tip) is the most\n"
-"    recently added changeset in the repository, the most recently\n"
-"    changed head.\n"
+"    The tip revision (usually just called the tip) is the changeset\n"
+"    most recently added to the repository (and therefore the most\n"
+"    recently changed head).\n"
 "\n"
 "    If you have just made a commit, that commit will be the tip. If\n"
 "    you have just pulled changes from another repository, the tip of\n"
@@ -6767,7 +7549,8 b' msgid ""'
 "\n"
 "    When there are uncommitted changes, use option -C/--clean to\n"
 "    discard them, forcibly replacing the state of the working\n"
-"    directory with the requested revision.\n"
+"    directory with the requested revision. Alternately, use -c/--check\n"
+"    to abort.\n"
 "\n"
 "    When there are uncommitted changes and option -C/--clean is not\n"
 "    used, and the parent revision and requested revision are on the\n"
@@ -6814,6 +7597,9 b' msgstr ""'
 "    Siehe 'hg help dates' für eine Liste gültiger Formate für -d/--date.\n"
 "    "
 
+msgid "uncommitted local changes"
+msgstr "Ausstehende nicht versionierte Änderungen"
+
 msgid ""
 "verify the integrity of the repository\n"
 "\n"
@@ -7006,7 +7792,7 b' msgid "parent to choose when backing out'
 msgstr "Wählt einen Vorgänger bei Rücknahme einer Zusammenführung"
 
 msgid "revision to backout"
-msgstr "Die Zurückzunehmende Revision"
+msgstr "Die zurückzunehmende Revision"
 
 msgid "[OPTION]... [-r] REV"
 msgstr ""
@@ -7033,7 +7819,7 b' msgid "[-gbsr] [-c CMD] [REV]"'
 msgstr "[-gbsr] [-c PROGRAMM] [REV]"
 
 msgid "set branch name even if it shadows an existing branch"
-msgstr "Setzt Zweignamen, selbst wenn es bestehenden Zweig verschattet"
+msgstr "Setzt Zweignamen, selbst wenn es einen bestehenden Zweig verdeckt"
 
 msgid "reset branch name to parent branch name"
 msgstr "Setzt Zweignamen zum Namen des Vorgängers zurück"
@@ -7044,6 +7830,9 b' msgstr ""'
 msgid "show only branches that have unmerged heads"
 msgstr "Zeigt nur Zweige mit mehreren Köpfen"
 
+msgid "show normal and closed branches"
+msgstr "Zeigt normale und geschlossene Zweige"
+
 msgid "[-a]"
 msgstr ""
 
@@ -7149,6 +7938,9 b' msgstr "Zeigt gespeicherte Modifikations'
 msgid "[OPTION]..."
 msgstr ""
 
+msgid "revision to check"
+msgstr "Die zu prüfende Revision"
+
 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
 msgstr "[OPTION]... [-r REV1 [-r REV2]] [DATEI]..."
 
@@ -7187,13 +7979,13 b' msgstr "[OPTION]... MUSTER [DATEI]..."'
 msgid "show only heads which are descendants of REV"
 msgstr "Zeigt nur Köpfe, die Nachkommen dieser Revision sind"
 
-msgid "show only the active heads from open branches"
+msgid "show only the active branch heads from open branches"
 msgstr "Zeigt nur aktive Köpfe von offenen Zweigen"
 
-msgid "show normal and closed heads"
-msgstr "Zeigt normale und abgeschlossene Kopfversionen"
-
-msgid "[-r REV] [REV]..."
+msgid "show normal and closed branch heads"
+msgstr "Zeigt normale und geschlossene Kopfversionen"
+
+msgid "[-r STARTREV] [REV]..."
 msgstr ""
 
 msgid "[TOPIC]"
@@ -7234,7 +8026,7 b' msgid "don\'t commit, just update the wor'
 msgstr "Kein Übernehmen, nur Aktualisierung des Arbeitsverzeichnisses"
 
 msgid "apply patch to the nodes from which it was generated"
-msgstr "Wendet patch auf die Knoten an, von denen er erstellt wurde"
+msgstr "Wendet Patch auf die Knoten an, von denen er erstellt wurde"
 
 msgid "use any branch information in patch (implied by --exact)"
 msgstr ""
@@ -7486,6 +8278,9 b' msgstr "[-u] DATEI..."'
 msgid "overwrite locally modified files (no backup)"
 msgstr "Überschreibt lokale Modifikationen von Dateien (keine Sicherung)"
 
+msgid "check for uncommitted changes"
+msgstr "prüft auf nicht versionierte Änderungen"
+
 msgid "[-C] [-d DATE] [[-r] REV]"
 msgstr "[-C] [-d DATUM] [[-r] REV]"
 
@@ -7661,7 +8456,7 b' msgstr "Abbruch: Unzureichender Speicher'
 msgid "** unknown exception encountered, details follow\n"
 msgstr "** Unbekannter Fehler, Details folgen\n"
 
-msgid "** report bug details to http://www.selenic.com/mercurial/bts\n"
+msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
 msgstr "** Problemdetails bitte bei http://www.selenic.com/mercurial/bts\n"
 
 msgid "** or [e-mail]\n"
@@ -7706,7 +8501,7 b' msgid "Option --cwd may not be abbreviat'
 msgstr "Option --cwd kann nicht abgekürzt werden!"
 
 msgid ""
-"Option -R has to be separated from other options (i.e. not -qR) and --"
+"Option -R has to be separated from other options (e.g. not -qR) and --"
 "repository may only be abbreviated as --repo!"
 msgstr ""
 "Option -R muss von anderen Optionen getrennt werden (also z.B. nicht -qR) "
@@ -7718,7 +8513,7 b' msgstr ""'
 
 #, python-format
 msgid "repository '%s' is not local"
-msgstr "Projektarchiv '%s' is nicht lokal"
+msgstr "Projektarchiv '%s' ist nicht lokal"
 
 msgid "invalid arguments"
 msgstr "ungültige Parameter"
@@ -7772,9 +8567,6 b' msgstr ""'
 msgid "&Other"
 msgstr ""
 
-msgid "l"
-msgstr ""
-
 #, python-format
 msgid "merging %s and %s to %s\n"
 msgstr ""
@@ -7802,9 +8594,6 b' msgstr ""'
 msgid "&Yes"
 msgstr ""
 
-msgid "n"
-msgstr ""
-
 #, python-format
 msgid "merging %s failed!\n"
 msgstr ""
@@ -7817,72 +8606,115 b' msgstr ""'
 msgid "unknown bisect kind %s"
 msgstr ""
 
+msgid ""
+"\n"
+"    Mercurial has the ability to add new features through the use of\n"
+"    extensions. Extensions may add new commands, add options to\n"
+"    existing commands, change the default behavior of commands, or\n"
+"    implement hooks.\n"
+"\n"
+"    Extensions are not loaded by default for a variety of reasons:\n"
+"    they can increase startup overhead; they may be meant for advanced\n"
+"    usage only; they may provide potentially dangerous abilities (such\n"
+"    as letting you destroy or modify history); they might not be ready\n"
+"    for prime time; or they may alter some usual behaviors of stock\n"
+"    Mercurial. It is thus up to the user to activate extensions as\n"
+"    needed.\n"
+"\n"
+"    To enable the \"foo\" extension, either shipped with Mercurial or in\n"
+"    the Python search path, create an entry for it in your hgrc, like\n"
+"    this::\n"
+"\n"
+"      [extensions]\n"
+"      foo =\n"
+"\n"
+"    You may also specify the full path to an extension::\n"
+"\n"
+"      [extensions]\n"
+"      myfeature = ~/.hgext/myfeature.py\n"
+"\n"
+"    To explicitly disable an extension enabled in an hgrc of broader\n"
+"    scope, prepend its path with !::\n"
+"\n"
+"      [extensions]\n"
+"      # disabling extension bar residing in /path/to/extension/bar.py\n"
+"      hgext.bar = !/path/to/extension/bar.py\n"
+"      # ditto, but no path was supplied for extension baz\n"
+"      hgext.baz = !\n"
+"    "
+msgstr ""
+
+msgid "disabled extensions:"
+msgstr "Inaktive Erweiterungen:"
+
 msgid "Date Formats"
 msgstr "Datumsformate"
 
+#, fuzzy
 msgid ""
 "\n"
 "    Some commands allow the user to specify a date, e.g.:\n"
-"    * backout, commit, import, tag: Specify the commit date.\n"
-"    * log, revert, update: Select revision(s) by date.\n"
-"\n"
-"    Many date formats are valid. Here are some examples:\n"
-"\n"
-"    \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-"    \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-"    \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-"    \"Dec 6\" (midnight)\n"
-"    \"13:18\" (today assumed)\n"
-"    \"3:39\" (3:39AM assumed)\n"
-"    \"3:39pm\" (15:39)\n"
-"    \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-"    \"2006-12-6 13:18\"\n"
-"    \"2006-12-6\"\n"
-"    \"12-6\"\n"
-"    \"12/6\"\n"
-"    \"12/6/6\" (Dec 6 2006)\n"
-"\n"
-"    Lastly, there is Mercurial's internal format:\n"
-"\n"
-"    \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
+"\n"
+"    - backout, commit, import, tag: Specify the commit date.\n"
+"    - log, revert, update: Select revision(s) by date.\n"
+"\n"
+"    Many date formats are valid. Here are some examples::\n"
+"\n"
+"      \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
+"      \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
+"      \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
+"      \"Dec 6\" (midnight)\n"
+"      \"13:18\" (today assumed)\n"
+"      \"3:39\" (3:39AM assumed)\n"
+"      \"3:39pm\" (15:39)\n"
+"      \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+"      \"2006-12-6 13:18\"\n"
+"      \"2006-12-6\"\n"
+"      \"12-6\"\n"
+"      \"12/6\"\n"
+"      \"12/6/6\" (Dec 6 2006)\n"
+"\n"
+"    Lastly, there is Mercurial's internal format::\n"
+"\n"
+"      \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
 "\n"
 "    This is the internal representation format for dates. unixtime is\n"
 "    the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
 "    offset is the offset of the local timezone, in seconds west of UTC\n"
 "    (negative if the timezone is east of UTC).\n"
 "\n"
-"    The log command also accepts date ranges:\n"
-"\n"
-"    \"<{datetime}\" - at or before a given date/time\n"
-"    \">{datetime}\" - on or after a given date/time\n"
-"    \"{datetime} to {datetime}\" - a date range, inclusive\n"
-"    \"-{days}\" - within a given number of days of today\n"
-"    "
-msgstr ""
-"\n"
-"    Einige Befehle erlauben dem Benuter ein Datum anzugeben, z.B.:\n"
+"    The log command also accepts date ranges::\n"
+"\n"
+"      \"<{datetime}\" - at or before a given date/time\n"
+"      \">{datetime}\" - on or after a given date/time\n"
+"      \"{datetime} to {datetime}\" - a date range, inclusive\n"
+"      \"-{days}\" - within a given number of days of today\n"
+"    "
+msgstr ""
+"\n"
+"    Einige Befehle erlauben dem Benutzer ein Datum anzugeben, z.B.:\n"
 "    * backout, commit, import, tag: Angabe des Versionsdatums.\n"
 "    * log, revert, update: Selektion von Revisionen anhand ihres Datums.\n"
 "\n"
-"    Viele Datumsformate sind erlaubt. Hier einige Beispiele:\n"
-"\n"
-"    \"Wed Dec 6 13:18:29 2006\" (Lokale Zeitzone angenommen)\n"
-"    \"Dec 6 13:18 -0600\" (Jahr angenommen, Zeitverschiebung angegeben)\n"
-"    \"Dec 6 13:18 UTC\" (UTC und GMT sind Aliase für +0000)\n"
-"    \"Dec 6\" (Mitternacht)\n"
-"    \"13:18\" (Heute angenommen)\n"
-"    \"3:39\" (3:39 morgens angenommen)\n"
-"    \"3:39pm\" (15:39)\n"
-"    \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-"    \"2006-12-6 13:18\"\n"
-"    \"2006-12-6\"\n"
-"    \"12-6\"\n"
-"    \"12/6\"\n"
-"    \"12/6/6\" (Dec 6 2006)\n"
-"\n"
-"    Schließlich gibt es Mercurials internes Format:\n"
-"\n"
-"    \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
+"    Viele Datumsformate sind erlaubt. Hier einige Beispiele::\n"
+"\n"
+"      \"Wed Dec 6 13:18:29 2006\" (Lokale Zeitzone angenommen)\n"
+"      \"Dec 6 13:18 -0600\" (Jahr angenommen, Zeitverschiebung angegeben)\n"
+"      \"Dec 6 13:18 UTC\" (UTC und GMT sind Aliase für +0000)\n"
+"      \"Dec 6\" (Mitternacht)\n"
+"      \"13:18\" (Heute angenommen)\n"
+"      \"3:39\" (3:39 morgens angenommen)\n"
+"      \"3:39pm\" (15:39)\n"
+"      \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+"      \"2006-12-6 13:18\"\n"
+"      \"2006-12-6\"\n"
+"      \"12-6\"\n"
+"      \"12/6\"\n"
+"      \"12/6/6\" (Dec 6 2006)\n"
+"\n"
+"    Schließlich gibt es Mercurials internes Format::\n"
+"\n"
+"      \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
 "\n"
 "    Dies ist das internationale Darstellungsformat für Daten. Die Unixzeit "
 "(unixtime) ist\n"
@@ -7892,18 +8724,19 b' msgstr ""'
 "(negativ\n"
 "    wenn die Zeitzone östlich der UTC ist).\n"
 "\n"
-"    Der log-Befehl akkzeptiert auch Datumsbereiche:\n"
-"\n"
-"    \"<{datetime}\" - an oder vor einem/r angegebenen Datum/Uhrzeit\n"
-"    \">{datetime}\" - zu oder nach einem/r angegebenen Datum/Uhrzeit\n"
-"    \"{datetime} to {datetime}\" - ein Datumsbereich, inklusive\n"
-"    \"-{tage}\" - innerhalb der angegebenen Anzahl von Tagen vor dem "
+"    Der log-Befehl akkzeptiert auch Datumsbereiche::\n"
+"\n"
+"      \"<{datetime}\" - an oder vor einem/r angegebenen Datum/Uhrzeit\n"
+"      \">{datetime}\" - zu oder nach einem/r angegebenen Datum/Uhrzeit\n"
+"      \"{datetime} to {datetime}\" - ein Datumsbereich, inklusive\n"
+"      \"-{tage}\" - innerhalb der angegebenen Anzahl von Tagen vor dem "
 "heutigen Tag\n"
 "    "
 
 msgid "File Name Patterns"
 msgstr "Dateimuster"
 
+#, fuzzy
 msgid ""
 "\n"
 "    Mercurial accepts several notations for identifying one or more\n"
@@ -7919,34 +8752,34 b' msgid ""'
 "    the current repository root.\n"
 "\n"
 "    To use an extended glob, start a name with \"glob:\". Globs are\n"
-"    rooted at the current directory; a glob such as \"*.c\" will only\n"
-"    match files in the current directory ending with \".c\".\n"
-"\n"
-"    The supported glob syntax extensions are \"**\" to match any string\n"
-"    across path separators and \"{a,b}\" to mean \"a or b\".\n"
+"    rooted at the current directory; a glob such as \"``*.c``\" will\n"
+"    only match files in the current directory ending with \".c\".\n"
+"\n"
+"    The supported glob syntax extensions are \"``**``\" to match any\n"
+"    string across path separators and \"{a,b}\" to mean \"a or b\".\n"
 "\n"
 "    To use a Perl/Python regular expression, start a name with \"re:\".\n"
 "    Regexp pattern matching is anchored at the root of the repository.\n"
 "\n"
-"    Plain examples:\n"
-"\n"
-"    path:foo/bar   a name bar in a directory named foo in the root of\n"
-"                   the repository\n"
-"    path:path:name a file or directory named \"path:name\"\n"
-"\n"
-"    Glob examples:\n"
-"\n"
-"    glob:*.c       any name ending in \".c\" in the current directory\n"
-"    *.c            any name ending in \".c\" in the current directory\n"
-"    **.c           any name ending in \".c\" in any subdirectory of the\n"
-"                   current directory including itself.\n"
-"    foo/*.c        any name ending in \".c\" in the directory foo\n"
-"    foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
-"                   including itself.\n"
-"\n"
-"    Regexp examples:\n"
-"\n"
-"    re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
+"    Plain examples::\n"
+"\n"
+"      path:foo/bar   a name bar in a directory named foo in the root\n"
+"                     of the repository\n"
+"      path:path:name a file or directory named \"path:name\"\n"
+"\n"
+"    Glob examples::\n"
+"\n"
+"      glob:*.c       any name ending in \".c\" in the current directory\n"
+"      *.c            any name ending in \".c\" in the current directory\n"
+"      **.c           any name ending in \".c\" in any subdirectory of the\n"
+"                     current directory including itself.\n"
+"      foo/*.c        any name ending in \".c\" in the directory foo\n"
+"      foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
+"                     including itself.\n"
+"\n"
+"    Regexp examples::\n"
+"\n"
+"      re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
 "\n"
 "    "
 msgstr ""
@@ -7981,28 +8814,26 b' msgstr ""'
 "    Erkennung mit regulären Ausdrücken wird an der Wurzel des Projektarchivs "
 "verankert.\n"
 "\n"
-"    Pfad-Beispiele:\n"
-"\n"
-"    path:foo/bar   eine Datei bar in einem Verzeichnis foo an der Basis des\n"
-"                   des Projektarchivs\n"
-"    path:path:name eine Datei oder eine Verzeichnis mit dem Namen \"path:name"
-"\"\n"
-"\n"
-"    Glob-Beispiele:\n"
-"\n"
-"    glob:*.c       jeder Name endend mit \".c\" im aktuellen Verzeichnis\n"
-"    *.c            jeder Name endend mit \".c\" im aktuellen Verzeichnis\n"
-"    **.c           jeder Name endend mit \".c\" im aktuellen Verzeichnis "
-"und\n"
-"                   jedem Unterverzeichnis\n"
-"    foo/*.c        jeder Name endend mit \".c\" im Verzeichnis foo\n"
-"    foo/**.c       jeder Name endend mit \".c\" im Verzeichnis foo und "
-"jedem\n"
-"                   Unterverzeichnis.\n"
-"\n"
-"    Reguläre Ausdrücke Beispiele::\n"
-"\n"
-"    re:.*\\.c$      jeder Name endend mit \".c\" überall im Projektarchiv\n"
+"    Pfad-Beispiele::\n"
+"\n"
+"      path:foo/bar   eine Datei bar in einem Verzeichnis foo an der Basis\n"
+"                     des Projektarchivs\n"
+"      path:path:name eine Datei oder eine Verzeichnis mit dem Namen \"path:"
+"name\"\n"
+"\n"
+"    Glob-Beispiele::\n"
+"\n"
+"      glob:*.c       jeder Name endend mit \".c\" im aktuellen Verzeichnis\n"
+"      *.c            jeder Name endend mit \".c\" im aktuellen Verzeichnis\n"
+"      **.c           jeder Name endend mit \".c\" im aktuellen Verzeichnis\n"
+"                     und jedem Unterverzeichnis\n"
+"      foo/*.c        jeder Name endend mit \".c\" im Verzeichnis foo\n"
+"      foo/**.c       jeder Name endend mit \".c\" im Verzeichnis foo\n"
+"                     und jedem Unterverzeichnis.\n"
+"\n"
+"    Beispiel mit regulärem Ausdruck::\n"
+"\n"
+"      re:.*\\.c$      jeder Name endend mit \".c\" überall im Projektarchiv\n"
 "\n"
 "    "
 
@@ -8011,25 +8842,25 b' msgstr "Umgebungsvariablen"'
 
 msgid ""
 "\n"
-"HG::\n"
+"HG\n"
 "    Path to the 'hg' executable, automatically passed when running\n"
 "    hooks, extensions or external tools. If unset or empty, this is\n"
 "    the hg executable's name if it's frozen, or an executable named\n"
 "    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
 "    Windows) is searched.\n"
 "\n"
-"HGEDITOR::\n"
+"HGEDITOR\n"
 "    This is the name of the editor to run when committing. See EDITOR.\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
-"HGENCODING::\n"
+"HGENCODING\n"
 "    This overrides the default locale setting detected by Mercurial.\n"
 "    This setting is used to convert data including usernames,\n"
 "    changeset descriptions, tag names, and branches. This setting can\n"
 "    be overridden with the --encoding command-line option.\n"
 "\n"
-"HGENCODINGMODE::\n"
+"HGENCODINGMODE\n"
 "    This sets Mercurial's behavior for handling unknown characters\n"
 "    while transcoding user input. The default is \"strict\", which\n"
 "    causes Mercurial to abort if it can't map a character. Other\n"
@@ -8037,45 +8868,46 b' msgid ""'
 "    \"ignore\", which drops them. This setting can be overridden with\n"
 "    the --encodingmode command-line option.\n"
 "\n"
-"HGMERGE::\n"
+"HGMERGE\n"
 "    An executable to use for resolving merge conflicts. The program\n"
 "    will be executed with three arguments: local file, remote file,\n"
 "    ancestor file.\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
-"HGRCPATH::\n"
+"HGRCPATH\n"
 "    A list of files or directories to search for hgrc files. Item\n"
 "    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
 "    platform default search path is used. If empty, only the .hg/hgrc\n"
 "    from the current repository is read.\n"
 "\n"
 "    For each element in HGRCPATH:\n"
-"    * if it's a directory, all files ending with .rc are added\n"
-"    * otherwise, the file itself will be added\n"
-"\n"
-"HGUSER::\n"
+"\n"
+"    - if it's a directory, all files ending with .rc are added\n"
+"    - otherwise, the file itself will be added\n"
+"\n"
+"HGUSER\n"
 "    This is the string used as the author of a commit. If not set,\n"
 "    available values will be considered in this order:\n"
 "\n"
-"    * HGUSER (deprecated)\n"
-"    * hgrc files from the HGRCPATH\n"
-"    * EMAIL\n"
-"    * interactive prompt\n"
-"    * LOGNAME (with '@hostname' appended)\n"
+"    - HGUSER (deprecated)\n"
+"    - hgrc files from the HGRCPATH\n"
+"    - EMAIL\n"
+"    - interactive prompt\n"
+"    - LOGNAME (with '@hostname' appended)\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
-"EMAIL::\n"
+"EMAIL\n"
 "    May be used as the author of a commit; see HGUSER.\n"
 "\n"
-"LOGNAME::\n"
+"LOGNAME\n"
 "    May be used as the author of a commit; see HGUSER.\n"
 "\n"
-"VISUAL::\n"
+"VISUAL\n"
 "    This is the name of the editor to use when committing. See EDITOR.\n"
 "\n"
-"EDITOR::\n"
+"EDITOR\n"
 "    Sometimes Mercurial needs to open a text file in an editor for a\n"
 "    user to modify, for example when writing commit messages. The\n"
 "    editor it uses is determined by looking at the environment\n"
@@ -8083,7 +8915,7 b' msgid ""'
 "    non-empty one is chosen. If all of them are empty, the editor\n"
 "    defaults to 'vi'.\n"
 "\n"
-"PYTHONPATH::\n"
+"PYTHONPATH\n"
 "    This is used by Python to find imported modules and may need to be\n"
 "    set appropriately if this Mercurial is not installed system-wide.\n"
 "    "
@@ -8097,22 +8929,21 b' msgid ""'
 "    Mercurial supports several ways to specify individual revisions.\n"
 "\n"
 "    A plain integer is treated as a revision number. Negative integers\n"
-"    are treated as topological offsets from the tip, with -1 denoting\n"
-"    the tip. As such, negative numbers are only useful if you've\n"
-"    memorized your local tree numbers and want to save typing a single\n"
-"    digit. This editor suggests copy and paste.\n"
+"    are treated as sequential offsets from the tip, with -1 denoting\n"
+"    the tip, -2 denoting the revision prior to the tip, and so forth.\n"
 "\n"
 "    A 40-digit hexadecimal string is treated as a unique revision\n"
 "    identifier.\n"
 "\n"
 "    A hexadecimal string less than 40 characters long is treated as a\n"
-"    unique revision identifier, and referred to as a short-form\n"
+"    unique revision identifier and is referred to as a short-form\n"
 "    identifier. A short-form identifier is only valid if it is the\n"
 "    prefix of exactly one full-length identifier.\n"
 "\n"
-"    Any other string is treated as a tag name, which is a symbolic\n"
-"    name associated with a revision identifier. Tag names may not\n"
-"    contain the \":\" character.\n"
+"    Any other string is treated as a tag or branch name. A tag name is\n"
+"    a symbolic name associated with a revision identifier. A branch\n"
+"    name denotes the tipmost revision of that branch. Tag and branch\n"
+"    names must not contain the \":\" character.\n"
 "\n"
 "    The reserved name \"tip\" is a special tag that always identifies\n"
 "    the most recent revision.\n"
@@ -8132,10 +8963,7 b' msgstr ""'
 "    Eine einfache Ganzzahl wird als Revisionsnummer behandelt. Negative\n"
 "    Zahlen beschreiben den topologischen Abstand von der Spitze (tip), "
 "wobei\n"
-"    -1 die Spitze selbst ist. Daher sind negative Zahlen nur dann nützlich,\n"
-"    wenn man sich die lokalen Revisionsnummern einprägt und das Tippen "
-"einer\n"
-"    Zahl sparen möchte. Der Verfasser empfiehlt 'copy and paste'.\n"
+"    -1 die Spitze selbst ist.\n"
 "\n"
 "    Eine 40-stellige Hexadezimalzahl gilt als eindeutiger Identifikator\n"
 "    einer Revision.\n"
@@ -8145,22 +8973,21 b' msgstr ""'
 "    Die Kurzform ist nur dann gültig, wenn sie Präfix exakt einer Langform\n"
 "    eines Identifikators ist.\n"
 "\n"
-"    Jede andere Zeichenfolge wird als Name einer Marke (tag) behandelt.\n"
-"    Dieser symbolische Name verweist auf einen Revisionsidentifikator. "
-"Namen\n"
-"    von Marken dürfen das Zeichen \":\" nicht enthalten.\n"
-"\n"
-"    Der reservierte Name \"tip\" ist eine spezielle Marke die immer auf die\n"
-"    jüngste Revision verweist.\n"
+"    Jede andere Zeichenfolge wird als Name eines Etiketts behandelt.\n"
+"    Dieser symbolische Name verweist auf einen Revisionsidentifikator.\n"
+"    Etiketten dürfen das Zeichen \":\" nicht enthalten.\n"
+"\n"
+"    Der reservierte Name \"tip\" ist ein spezielles Etikett, welches immer\n"
+"    auf die jüngste Revision verweist.\n"
 "\n"
 "    Der reservierte Name \"null\" bezeichnet die null-Revision. Sie ist die\n"
 "    Revision eines leeren Projektarchivs und der Vorgänger der Version 0.\n"
 "\n"
 "    Der reservierte Name \".\" bezeichnete die Vorgängerversion des\n"
-"    Arbeitsverzeichnisses. Falls kein Check-Out des Arbeitsverzeichnisses\n"
-"    vorliegt ist er äquivalent zu null. Falls eine nicht versionierte\n"
-"    Zusammenführung in Bearbeitung ist, bezeichnet \".\" die Revision des\n"
-"    ersten Vorgängers.\n"
+"    Arbeitsverzeichnisses. Falls das Arbeitsverzeichnis leer ist, ist diese\n"
+"    äquivalent zu \"null\". Falls eine nicht versionierte Zusammenführung\n"
+"    in Bearbeitung ist, bezeichnet \".\" die Revision des ersten "
+"Vorgängers.\n"
 "    "
 
 msgid "Specifying Multiple Revisions"
@@ -8218,10 +9045,10 b' msgid ""'
 "    While this standard format is often enough, it does not encode the\n"
 "    following information:\n"
 "\n"
-"     - executable status and other permission bits\n"
-"     - copy or rename information\n"
-"     - changes in binary files\n"
-"     - creation or deletion of empty files\n"
+"    - executable status and other permission bits\n"
+"    - copy or rename information\n"
+"    - changes in binary files\n"
+"    - creation or deletion of empty files\n"
 "\n"
 "    Mercurial also supports the extended diff format from the git VCS\n"
 "    which addresses these limitations. The git diff format is not\n"
@@ -8259,12 +9086,12 b' msgid ""'
 "\n"
 "    Three styles are packaged with Mercurial: default (the style used\n"
 "    when no explicit preference is passed), compact and changelog.\n"
-"    Usage:\n"
+"    Usage::\n"
 "\n"
 "        $ hg log -r1 --style changelog\n"
 "\n"
 "    A template is a piece of text, with markup to invoke variable\n"
-"    expansion:\n"
+"    expansion::\n"
 "\n"
 "        $ hg log -r1 --template \"{node}\\n\"\n"
 "        b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
@@ -8273,127 +9100,151 b' msgid ""'
 "    keywords depends on the exact context of the templater. These\n"
 "    keywords are usually available for templating a log-like command:\n"
 "\n"
-"    - author: String. The unmodified author of the changeset.\n"
-"    - branches: String. The name of the branch on which the changeset\n"
-"          was committed. Will be empty if the branch name was default.\n"
-"    - date: Date information. The date when the changeset was committed.\n"
-"    - desc: String. The text of the changeset description.\n"
-"    - diffstat: String. Statistics of changes with the following\n"
-"          format: \"modified files: +added/-removed lines\"\n"
-"    - files: List of strings. All files modified, added, or removed by\n"
-"          this changeset.\n"
-"    - file_adds: List of strings. Files added by this changeset.\n"
-"    - file_mods: List of strings. Files modified by this changeset.\n"
-"    - file_dels: List of strings. Files removed by this changeset.\n"
-"    - node: String. The changeset identification hash, as a\n"
-"          40-character hexadecimal string.\n"
-"    - parents: List of strings. The parents of the changeset.\n"
-"    - rev: Integer. The repository-local changeset revision number.\n"
-"    - tags: List of strings. Any tags associated with the changeset.\n"
+"    :author:    String. The unmodified author of the changeset.\n"
+"    :branches:  String. The name of the branch on which the changeset\n"
+"                was committed. Will be empty if the branch name was\n"
+"                default.\n"
+"    :date:      Date information. The date when the changeset was\n"
+"                committed.\n"
+"    :desc:      String. The text of the changeset description.\n"
+"    :diffstat:  String. Statistics of changes with the following\n"
+"                format: \"modified files: +added/-removed lines\"\n"
+"    :files:     List of strings. All files modified, added, or removed\n"
+"                by this changeset.\n"
+"    :file_adds: List of strings. Files added by this changeset.\n"
+"    :file_mods: List of strings. Files modified by this changeset.\n"
+"    :file_dels: List of strings. Files removed by this changeset.\n"
+"    :node:      String. The changeset identification hash, as a\n"
+"                40-character hexadecimal string.\n"
+"    :parents:   List of strings. The parents of the changeset.\n"
+"    :rev:       Integer. The repository-local changeset revision\n"
+"                number.\n"
+"    :tags:      List of strings. Any tags associated with the\n"
+"                changeset.\n"
 "\n"
 "    The \"date\" keyword does not produce human-readable output. If you\n"
 "    want to use a date in your output, you can use a filter to process\n"
 "    it. Filters are functions which return a string based on the input\n"
 "    variable. You can also use a chain of filters to get the desired\n"
-"    output:\n"
+"    output::\n"
 "\n"
 "       $ hg tip --template \"{date|isodate}\\n\"\n"
 "       2008-08-21 18:22 +0000\n"
 "\n"
 "    List of filters:\n"
 "\n"
-"    - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-"          every line except the last.\n"
-"    - age: Date. Returns a human-readable date/time difference between\n"
-"          the given date/time and the current date/time.\n"
-"    - basename: Any text. Treats the text as a path, and returns the\n"
-"          last component of the path after splitting by the path\n"
-"          separator (ignoring trailing separators). For example,\n"
-"          \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
-"\".\n"
-"    - stripdir: Treat the text as path and strip a directory level, if\n"
-"          possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
-"    - date: Date. Returns a date in a Unix date format, including\n"
-"          the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
-"    - domain: Any text. Finds the first string that looks like an\n"
-"          email address, and extracts just the domain component.\n"
-"          Example: 'User <[e-mail]>' becomes 'example.com'.\n"
-"    - email: Any text. Extracts the first string that looks like an\n"
-"          email address. Example: 'User <[e-mail]>' becomes\n"
-"          '[e-mail]'.\n"
-"    - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
-"          \"<\" and \">\" with XML entities.\n"
-"    - fill68: Any text. Wraps the text to fit in 68 columns.\n"
-"    - fill76: Any text. Wraps the text to fit in 76 columns.\n"
-"    - firstline: Any text. Returns the first line of text.\n"
-"    - nonempty: Any text. Returns '(none)' if the string is empty.\n"
-"    - hgdate: Date. Returns the date as a pair of numbers:\n"
-"          \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
-"    - isodate: Date. Returns the date in ISO 8601 format.\n"
-"    - localdate: Date. Converts a date to local date.\n"
-"    - obfuscate: Any text. Returns the input text rendered as a\n"
-"          sequence of XML entities.\n"
-"    - person: Any text. Returns the text before an email address.\n"
-"    - rfc822date: Date. Returns a date using the same format used\n"
-"          in email headers.\n"
-"    - short: Changeset hash. Returns the short form of a changeset\n"
-"          hash, i.e. a 12-byte hexadecimal string.\n"
-"    - shortdate: Date. Returns a date like \"2006-09-18\".\n"
-"    - strip: Any text. Strips all leading and trailing whitespace.\n"
-"    - tabindent: Any text. Returns the text, with every line except\n"
-"          the first starting with a tab character.\n"
-"    - urlescape: Any text. Escapes all \"special\" characters. For\n"
-"          example, \"foo bar\" becomes \"foo%20bar\".\n"
-"    - user: Any text. Returns the user portion of an email address.\n"
+"    :addbreaks:   Any text. Add an XHTML \"<br />\" tag before the end of\n"
+"                  every line except the last.\n"
+"    :age:         Date. Returns a human-readable date/time difference\n"
+"                  between the given date/time and the current\n"
+"                  date/time.\n"
+"    :basename:    Any text. Treats the text as a path, and returns the\n"
+"                  last component of the path after splitting by the\n"
+"                  path separator (ignoring trailing separators). For\n"
+"                  example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//"
+"\"\n"
+"                  becomes \"bar\".\n"
+"    :stripdir:    Treat the text as path and strip a directory level,\n"
+"                  if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
+"                  \"foo\".\n"
+"    :date:        Date. Returns a date in a Unix date format, including\n"
+"                  the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
+"    :domain:      Any text. Finds the first string that looks like an\n"
+"                  email address, and extracts just the domain\n"
+"                  component. Example: 'User <[e-mail]>' becomes\n"
+"                  'example.com'.\n"
+"    :email:       Any text. Extracts the first string that looks like\n"
+"                  an email address. Example: 'User <[e-mail]>'\n"
+"                  becomes '[e-mail]'.\n"
+"    :escape:      Any text. Replaces the special XML/XHTML characters\n"
+"                  \"&\", \"<\" and \">\" with XML entities.\n"
+"    :fill68:      Any text. Wraps the text to fit in 68 columns.\n"
+"    :fill76:      Any text. Wraps the text to fit in 76 columns.\n"
+"    :firstline:   Any text. Returns the first line of text.\n"
+"    :nonempty:    Any text. Returns '(none)' if the string is empty.\n"
+"    :hgdate:      Date. Returns the date as a pair of numbers:\n"
+"                  \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
+"    :isodate:     Date. Returns the date in ISO 8601 format:\n"
+"                  \"2009-08-18 13:00 +0200\".\n"
+"    :isodatesec:  Date. Returns the date in ISO 8601 format, including\n"
+"                  seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
+"                  rfc3339date filter.\n"
+"    :localdate:   Date. Converts a date to local date.\n"
+"    :obfuscate:   Any text. Returns the input text rendered as a\n"
+"                  sequence of XML entities.\n"
+"    :person:      Any text. Returns the text before an email address.\n"
+"    :rfc822date:  Date. Returns a date using the same format used in\n"
+"                  email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+"    :rfc3339date: Date. Returns a date using the Internet date format\n"
+"                  specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
+"    :short:       Changeset hash. Returns the short form of a changeset\n"
+"                  hash, i.e. a 12-byte hexadecimal string.\n"
+"    :shortdate:   Date. Returns a date like \"2006-09-18\".\n"
+"    :strip:       Any text. Strips all leading and trailing whitespace.\n"
+"    :tabindent:   Any text. Returns the text, with every line except\n"
+"                  the first starting with a tab character.\n"
+"    :urlescape:   Any text. Escapes all \"special\" characters. For\n"
+"                  example, \"foo bar\" becomes \"foo%20bar\".\n"
+"    :user:        Any text. Returns the user portion of an email\n"
+"                  address.\n"
 "    "
 msgstr ""
 
 msgid "URL Paths"
 msgstr "URL-Pfade"
 
-msgid ""
-"\n"
-"    Valid URLs are of the form:\n"
-"\n"
-"      local/filesystem/path (or file://local/filesystem/path)\n"
-"      http://[user[:pass]@]host[:port]/[path]\n"
-"      https://[user[:pass]@]host[:port]/[path]\n"
-"      ssh://[user[:pass]@]host[:port]/[path]\n"
+#, fuzzy
+msgid ""
+"\n"
+"    Valid URLs are of the form::\n"
+"\n"
+"      local/filesystem/path[#revision]\n"
+"      file://local/filesystem/path[#revision]\n"
+"      http://[user[:pass]@]host[:port]/[path][#revision]\n"
+"      https://[user[:pass]@]host[:port]/[path][#revision]\n"
+"      ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
 "\n"
 "    Paths in the local filesystem can either point to Mercurial\n"
-"    repositories or to bundle files (as created by 'hg bundle' or\n"
-"    'hg incoming --bundle').\n"
+"    repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
+"    incoming --bundle').\n"
 "\n"
 "    An optional identifier after # indicates a particular branch, tag,\n"
-"    or changeset to use from the remote repository.\n"
+"    or changeset to use from the remote repository. See also 'hg help\n"
+"    revisions'.\n"
 "\n"
 "    Some features, such as pushing to http:// and https:// URLs are\n"
 "    only possible if the feature is explicitly enabled on the remote\n"
 "    Mercurial server.\n"
 "\n"
 "    Some notes about using SSH with Mercurial:\n"
+"\n"
 "    - SSH requires an accessible shell account on the destination\n"
 "      machine and a copy of hg in the remote path or specified with as\n"
 "      remotecmd.\n"
 "    - path is relative to the remote user's home directory by default.\n"
-"      Use an extra slash at the start of a path to specify an absolute "
-"path:\n"
+"      Use an extra slash at the start of a path to specify an absolute\n"
+"      path::\n"
+"\n"
 "        ssh://example.com//tmp/repository\n"
+"\n"
 "    - Mercurial doesn't use its own compression via SSH; the right\n"
-"      thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
+"      thing to do is to configure it in your ~/.ssh/config, e.g.::\n"
+"\n"
 "        Host *.mylocalnetwork.example.com\n"
 "          Compression no\n"
 "        Host *\n"
 "          Compression yes\n"
+"\n"
 "      Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
 "      or with the --ssh command line option.\n"
 "\n"
 "    These URLs can all be stored in your hgrc with path aliases under\n"
-"    the [paths] section like so:\n"
-"    [paths]\n"
-"    alias1 = URL1\n"
-"    alias2 = URL2\n"
-"    ...\n"
+"    the [paths] section like so::\n"
+"\n"
+"      [paths]\n"
+"      alias1 = URL1\n"
+"      alias2 = URL2\n"
+"      ...\n"
 "\n"
 "    You can then use the alias for any command that uses a URL (for\n"
 "    example 'hg pull alias1' would pull from the 'alias1' path).\n"
@@ -8414,7 +9265,7 b' msgid ""'
 "    "
 msgstr ""
 "\n"
-"    Gültige URLs haben folgende Form:\n"
+"    Gültige URLs haben folgende Form::\n"
 "\n"
 "      lokales/dateisystem/pfad (oder file://lokales/dateisystem/pfad)\n"
 "      http://[nutzer[:pass]@]host[:port]/[pfad]\n"
@@ -8435,6 +9286,7 b' msgstr ""'
 "    Mercurial-Server aktiviert sind.\n"
 "\n"
 "    Einige Hinweise zur Nutzung von SSH mit Mercurial:\n"
+"\n"
 "    - SSH benötigt einen nutzbaren Shell-Zugang auf der Zielmaschine und\n"
 "      eine Kopie von hg im Pfad der entfernten Maschine oder in der "
 "Konfiguration\n"
@@ -8442,23 +9294,28 b' msgstr ""'
 "    - Der Pfad ist standardmäßig relativ vom Home-Verzeichnis des "
 "entfernten\n"
 "      Nutzer. Nutze einen zusätzlichen Schrägstrich um einen absoluen Pfad\n"
-"      anzugeben:\n"
+"      anzugeben::\n"
+"\n"
 "        ssh://example.com//tmp/repository\n"
+"\n"
 "    - Mercurial nutzt nicht eigene Kompressionsmechanismen über SSH:\n"
-"      Hier sollte man die Kompression über ~/.ssh/config aktivieren, z.B.:\n"
+"      Hier sollte man die Kompression über ~/.ssh/config aktivieren, z.B.::\n"
+"\n"
 "        Host *.mylocalnetwork.example.com\n"
 "          Compression no\n"
 "        Host *\n"
 "          Compression yes\n"
+"\n"
 "      Alternativ kann \"ssh -C\" als dein SSH-Befehl in der hgrc oder\n"
 "      mit der --ssh Befehlszeilenoption angegeben werden.\n"
 "\n"
 "    Diese URLs können alle in deiner hgrc als Aliase unter der Sektion\n"
-"    [paths] abgelegt werden:\n"
-"    [paths]\n"
-"    alias1 = URL1\n"
-"    alias2 = URL2\n"
-"    ...\n"
+"    [paths] abgelegt werden::\n"
+"\n"
+"      [paths]\n"
+"      alias1 = URL1\n"
+"      alias2 = URL2\n"
+"      ...\n"
 "\n"
 "    Diese Aliase können dann bei jedem Befehl genutzt werden der URLs nutzt\n"
 "    (beispielsweise 'hg pull alias1' würde vom 'alias1' Pfad "
@@ -8479,6 +9336,18 b' msgstr ""'
 "      diesen dem 'default'-Alias vor, wenn beide definiert sind.\n"
 "    "
 
+msgid "Using additional features"
+msgstr "Benutzung erweiterter Funktionen"
+
+msgid "can only share local repositories"
+msgstr ""
+
+msgid "destination already exists"
+msgstr "Ziel existiert bereits"
+
+msgid "updating working directory\n"
+msgstr "Aktualisiere Arbeitsverzeichnis\n"
+
 #, python-format
 msgid "destination directory: %s\n"
 msgstr "Zielverzeichnis: %s\n"
@@ -8501,9 +9370,6 b' msgstr ""'
 msgid "clone from remote to remote not supported"
 msgstr "Klonen von entferntem Archiv zu entferntem Archiv nicht möglich"
 
-msgid "updating working directory\n"
-msgstr "Aktualisiere Arbeitsverzeichnis\n"
-
 msgid "updated"
 msgstr "aktualisiert"
 
@@ -8532,7 +9398,7 b' msgstr ""'
 "'hg up --clean' um abzubrechen\n"
 
 msgid "(branch merge, don't forget to commit)\n"
-msgstr "(Zweig-Zusammenführung, vergesse nicht 'hg commit' auszuführen)\n"
+msgstr "(Zweig-Zusammenführung, vergiss nicht 'hg commit' auszuführen)\n"
 
 #, python-format
 msgid "error reading %s/.hg/hgrc: %s\n"
@@ -8675,12 +9541,12 b' msgid "cannot create new http repository'
 msgstr "Kann neues HTTP-Projektarchiv nicht erzeugen"
 
 #, python-format
-msgid "%s: ignoring invalid syntax '%s'\n"
-msgstr "%s: Ignoriere ungültige Syntax '%s'\n"
+msgid "ignoring invalid syntax '%s'"
+msgstr "Ignoriere ungültige Syntax '%s'"
 
 #, python-format
 msgid "skipping unreadable ignore file '%s': %s\n"
-msgstr "Überspringe nicht lesbares  ignore file '%s': %s\n"
+msgstr "Überspringe nicht lesbare ignore Datei '%s': %s\n"
 
 #, python-format
 msgid "repository %s not found"
@@ -8695,29 +9561,18 b' msgid "requirement \'%s\' not supported"'
 msgstr "Anforderung '%s' nicht unterstützt"
 
 #, python-format
+msgid ".hg/sharedpath points to nonexistent directory %s"
+msgstr ""
+
+#, python-format
 msgid "%r cannot be used in a tag name"
-msgstr "%r kann nicht als Name für tag genutzt werden"
+msgstr "%r kann nicht in einem Namen für Etiketten genutzt werden"
 
 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
 msgstr ""
 "Arbeitskopie von .hgtags wurde geändert (Bitte .hgtags manuell versionieren)"
 
 #, python-format
-msgid "%s, line %s: %s\n"
-msgstr "%s, Zeile %s: %s\n"
-
-msgid "cannot parse entry"
-msgstr "Kann Eintrag nicht parsen"
-
-#, python-format
-msgid "node '%s' is not well formed"
-msgstr "Knoten '%s' ist fehlerhaft"
-
-#, python-format
-msgid "tag '%s' refers to unknown node"
-msgstr "Tag '%s' verweist auf unbekannten Knoten"
-
-#, python-format
 msgid "working directory has unknown parent '%s'!"
 msgstr "Arbeitsverzeichnis hat unbekannte Vaterversion '%s'!"
 
@@ -8783,13 +9638,14 b' msgstr "Kein Treffer unterhalb des Verze'
 msgid "file not tracked!"
 msgstr "Datei wird nicht nachverfolgt!"
 
-msgid "nothing changed\n"
-msgstr "Keine Änderung\n"
-
 msgid "unresolved merge conflicts (see hg resolve)"
 msgstr "Ungelöster Zusammenführungs-Konflikt (siehe hg resolve)"
 
 #, python-format
+msgid "committing subrepository %s\n"
+msgstr "Übernehme Unterarchiv %s\n"
+
+#, python-format
 msgid "trouble committing %s!\n"
 msgstr "Problem bei Erstellen der neuen Version von %s!\n"
 
@@ -9047,17 +9903,6 b' msgstr ""'
 msgid "case-folding collision between %s and %s"
 msgstr ""
 
-msgid "resolving manifests\n"
-msgstr ""
-
-#, python-format
-msgid " overwrite %s partial %s\n"
-msgstr ""
-
-#, python-format
-msgid " ancestor %s local %s remote %s\n"
-msgstr ""
-
 #, python-format
 msgid ""
 " conflicting flags for %s\n"
@@ -9073,6 +9918,17 b' msgstr ""'
 msgid "Sym&link"
 msgstr ""
 
+msgid "resolving manifests\n"
+msgstr ""
+
+#, python-format
+msgid " overwrite %s partial %s\n"
+msgstr ""
+
+#, python-format
+msgid " ancestor %s local %s remote %s\n"
+msgstr ""
+
 #, python-format
 msgid ""
 " local changed %s which remote deleted\n"
@@ -9085,9 +9941,6 b' msgstr ""'
 msgid "&Delete"
 msgstr ""
 
-msgid "c"
-msgstr ""
-
 #, python-format
 msgid ""
 "remote changed %s which local deleted\n"
@@ -9223,10 +10076,18 b' msgid "patch command failed: %s"'
 msgstr ""
 
 #, python-format
+msgid "Unsupported line endings type: %s"
+msgstr "Nicht unterstützter Typ von Zeilenende: %s"
+
+#, python-format
 msgid "no valid hunks found; trying with %r instead\n"
 msgstr ""
 
 #, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr ""
+
+#, python-format
 msgid "exited with status %d"
 msgstr ""
 
@@ -9346,6 +10207,50 b' msgstr ""'
 msgid "sending %s (%d bytes)\n"
 msgstr ""
 
+#, python-format
+msgid ""
+" subrepository sources for %s differ\n"
+"use (l)ocal source (%s) or (r)emote source (%s)?"
+msgstr ""
+
+msgid "&Remote"
+msgstr ""
+
+#, python-format
+msgid ""
+" local changed subrepository %s which remote removed\n"
+"use (c)hanged version or (d)elete?"
+msgstr ""
+
+#, python-format
+msgid ""
+" remote changed subrepository %s which local removed\n"
+"use (c)hanged version or (d)elete?"
+msgstr ""
+
+#, python-format
+msgid "removing subrepo %s\n"
+msgstr "Entferne Unterarchiv %s\n"
+
+#, python-format
+msgid "pulling subrepo %s\n"
+msgstr "Hole Unterarchiv %s\n"
+
+#, python-format
+msgid "pushing subrepo %s\n"
+msgstr "Übertrage Unterarchiv %s\n"
+
+#, python-format
+msgid "%s, line %s: %s\n"
+msgstr "%s, Zeile %s: %s\n"
+
+msgid "cannot parse entry"
+msgstr "Kann Eintrag nicht parsen"
+
+#, python-format
+msgid "node '%s' is not well formed"
+msgstr "Knoten '%s' ist fehlerhaft"
+
 msgid "unmatched quotes"
 msgstr ""
 
@@ -9411,12 +10316,12 b' msgstr "Gib einen Benutzernamen an."'
 msgid "username %s contains a newline\n"
 msgstr "Benutzername %s enthält einen Zeilenumbruch\n"
 
+msgid "response expected"
+msgstr "Antwort erwartet"
+
 msgid "unrecognized response\n"
 msgstr "Unbekannte Antwort\n"
 
-msgid "response expected"
-msgstr "Antwort erwartet"
-
 msgid "password: "
 msgstr "Passwort: "
 
@@ -9650,8 +10555,8 b' msgid "empty or missing copy source revl'
 msgstr ""
 
 #, python-format
-msgid "warning: %s@%s: copy source revision is nullid %s:%s"
-msgstr ""
+msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
+msgstr "Warnung: %s@%s: Revision der Kopienquelle ist Null %s:%s\n"
 
 #, python-format
 msgid "checking rename of %s"

i18n/pt_BR.po

@@ -54,8 +54,12 b' msgstr "OP\xc3\x87\xc3\x95ES"'
 msgid "COMMANDS"
 msgstr "COMANDOS"
 
-msgid "    options:\n"
-msgstr "    opções:\n"
+msgid ""
+"    options:\n"
+"\n"
+msgstr ""
+"    opções:\n"
+"\n"
 
 #, python-format
 msgid ""
@@ -82,7 +86,7 b' msgid ""'
 "Nor is it safe if remote users share an account, because then there\n"
 "is no way to distinguish them.\n"
 "\n"
-"To use this hook, configure the acl extension in your hgrc like this:\n"
+"To use this hook, configure the acl extension in your hgrc like this::\n"
 "\n"
 "  [extensions]\n"
 "  hgext.acl =\n"
@@ -95,10 +99,10 b' msgid ""'
 "  # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
 "  sources = serve\n"
 "\n"
-"The allow and deny sections take a subtree pattern as key (with a\n"
-"glob syntax by default), and a comma separated list of users as\n"
-"the corresponding value. The deny list is checked before the allow\n"
-"list is.\n"
+"The allow and deny sections take a subtree pattern as key (with a glob\n"
+"syntax by default), and a comma separated list of users as the\n"
+"corresponding value. The deny list is checked before the allow list\n"
+"is. ::\n"
 "\n"
 "  [acl.allow]\n"
 "  # If acl.allow is not present, all users are allowed by default.\n"
@@ -128,7 +132,7 b' msgstr ""'
 "gancho. Também não é seguro se usuários remotos compartilharem uma\n"
 "conta local, pois não haverá maneira de distingüí-los.\n"
 "\n"
-"Para usar, configure a extensão acl em seu hgrc da seguinte forma:\n"
+"Para usar, configure a extensão acl em seu hgrc da seguinte forma::\n"
 "\n"
 "  [extensions]\n"
 "  hgext.acl =\n"
@@ -144,7 +148,7 b' msgstr ""'
 "As seções allow (permissões) e deny (restrições) usam um padrão de\n"
 "sub-árvore como chave (a sintaxe padrão é a glob), e uma lista de\n"
 "usuários separada por vírgulas como valor correspondente. A lista de\n"
-"restrições é verificada antes da lista de permissões.\n"
+"restrições é verificada antes da lista de permissões. ::\n"
 "\n"
 "  [acl.allow]\n"
 "  # Se acl.allow não estiver presente, todos os usuários são\n"
@@ -199,16 +203,16 b' msgid ""'
 "\n"
 "Bookmarks are local movable markers to changesets. Every bookmark\n"
 "points to a changeset identified by its hash. If you commit a\n"
-"changeset that is based on a changeset that has a bookmark on it,\n"
-"the bookmark shifts to the new changeset.\n"
-"\n"
-"It is possible to use bookmark names in every revision lookup\n"
-"(e.g. hg merge, hg update).\n"
+"changeset that is based on a changeset that has a bookmark on it, the\n"
+"bookmark shifts to the new changeset.\n"
+"\n"
+"It is possible to use bookmark names in every revision lookup (e.g. hg\n"
+"merge, hg update).\n"
 "\n"
 "By default, when several bookmarks point to the same changeset, they\n"
 "will all move forward together. It is possible to obtain a more\n"
 "git-like experience by adding the following configuration option to\n"
-"your .hgrc:\n"
+"your .hgrc::\n"
 "\n"
 "  [bookmarks]\n"
 "  track.current = True\n"
@@ -231,7 +235,7 b' msgstr ""'
 "Por padrão, quando vários marcadores apontam para o mesmo changeset,\n"
 "todos serão movidos para a frente juntos. É possível obter um\n"
 "funcionamento mais semelhante ao do sistema git com a adição das\n"
-"seguintes opções de configuração ao seu .hgrc:\n"
+"seguintes opções de configuração ao seu .hgrc::\n"
 "\n"
 "  [bookmarks]\n"
 "  track.current = True\n"
@@ -318,65 +322,86 b' msgid ""'
 "be run by Mercurial as the user pushing the change; you will need to\n"
 "ensure the Bugzilla install file permissions are set appropriately.\n"
 "\n"
-"Configuring the extension:\n"
-"\n"
-"    [bugzilla]\n"
-"\n"
-"    host       Hostname of the MySQL server holding the Bugzilla\n"
-"               database.\n"
-"    db         Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
-"    user       Username to use to access MySQL server. Default 'bugs'.\n"
-"    password   Password to use to access MySQL server.\n"
-"    timeout    Database connection timeout (seconds). Default 5.\n"
-"    version    Bugzilla version. Specify '3.0' for Bugzilla versions\n"
-"               3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
-"               and '2.16' for versions prior to 2.18.\n"
-"    bzuser     Fallback Bugzilla user name to record comments with, if\n"
-"               changeset committer cannot be found as a Bugzilla user.\n"
-"    bzdir      Bugzilla install directory. Used by default notify.\n"
-"               Default '/var/www/html/bugzilla'.\n"
-"    notify     The command to run to get Bugzilla to send bug change\n"
-"               notification emails. Substitutes from a map with 3\n"
-"               keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
-"               bugzilla email). Default depends on version; from 2.18\n"
-"               it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-"               %(id)s %(user)s\".\n"
-"    regexp     Regular expression to match bug IDs in changeset commit\n"
-"               message. Must contain one \"()\" group. The default\n"
-"               expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
-"               number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
-"               variations thereof. Matching is case insensitive.\n"
-"    style      The style file to use when formatting comments.\n"
-"    template   Template to use when formatting comments. Overrides\n"
-"               style if specified. In addition to the usual Mercurial\n"
-"               keywords, the extension specifies:\n"
-"                   {bug}       The Bugzilla bug ID.\n"
-"                   {root}      The full pathname of the Mercurial\n"
-"                               repository.\n"
-"                   {webroot}   Stripped pathname of the Mercurial\n"
-"                               repository.\n"
-"                   {hgweb}     Base URL for browsing Mercurial\n"
-"                               repositories.\n"
-"               Default 'changeset {node|short} in repo {root} refers '\n"
-"                       'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
-"    strip      The number of slashes to strip from the front of {root}\n"
-"               to produce {webroot}. Default 0.\n"
-"    usermap    Path of file containing Mercurial committer ID to\n"
-"               Bugzilla user ID mappings. If specified, the file\n"
-"               should contain one mapping per line,\n"
-"               \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
-"               section.\n"
-"\n"
-"    [usermap]\n"
-"    Any entries in this section specify mappings of Mercurial\n"
-"    committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-"    \"committer\"=\"Bugzilla user\"\n"
-"\n"
-"    [web]\n"
-"    baseurl    Base URL for browsing Mercurial repositories. Reference\n"
-"               from templates as {hgweb}.\n"
-"\n"
-"Activating the extension:\n"
+"The extension is configured through three different configuration\n"
+"sections. These keys are recognized in the [bugzilla] section:\n"
+"\n"
+"host\n"
+"  Hostname of the MySQL server holding the Bugzilla database.\n"
+"\n"
+"db\n"
+"  Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
+"\n"
+"user\n"
+"  Username to use to access MySQL server. Default 'bugs'.\n"
+"\n"
+"password\n"
+"  Password to use to access MySQL server.\n"
+"\n"
+"timeout\n"
+"  Database connection timeout (seconds). Default 5.\n"
+"\n"
+"version\n"
+"  Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
+"  '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
+"  to 2.18.\n"
+"\n"
+"bzuser\n"
+"  Fallback Bugzilla user name to record comments with, if changeset\n"
+"  committer cannot be found as a Bugzilla user.\n"
+"\n"
+"bzdir\n"
+"   Bugzilla install directory. Used by default notify. Default\n"
+"   '/var/www/html/bugzilla'.\n"
+"\n"
+"notify\n"
+"  The command to run to get Bugzilla to send bug change notification\n"
+"  emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
+"  and 'user' (committer bugzilla email). Default depends on version;\n"
+"  from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
+"  %(id)s %(user)s\".\n"
+"\n"
+"regexp\n"
+"  Regular expression to match bug IDs in changeset commit message.\n"
+"  Must contain one \"()\" group. The default expression matches 'Bug\n"
+"  1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
+"  1234 and 5678' and variations thereof. Matching is case insensitive.\n"
+"\n"
+"style\n"
+"  The style file to use when formatting comments.\n"
+"\n"
+"template\n"
+"  Template to use when formatting comments. Overrides style if\n"
+"  specified. In addition to the usual Mercurial keywords, the\n"
+"  extension specifies::\n"
+"\n"
+"    {bug}       The Bugzilla bug ID.\n"
+"    {root}      The full pathname of the Mercurial repository.\n"
+"    {webroot}   Stripped pathname of the Mercurial repository.\n"
+"    {hgweb}     Base URL for browsing Mercurial repositories.\n"
+"\n"
+"  Default 'changeset {node|short} in repo {root} refers '\n"
+"          'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
+"\n"
+"strip\n"
+"  The number of slashes to strip from the front of {root} to produce\n"
+"  {webroot}. Default 0.\n"
+"\n"
+"usermap\n"
+"  Path of file containing Mercurial committer ID to Bugzilla user ID\n"
+"  mappings. If specified, the file should contain one mapping per\n"
+"  line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
+"\n"
+"The [usermap] section is used to specify mappings of Mercurial\n"
+"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
+"\"committer\"=\"Bugzilla user\"\n"
+"\n"
+"Finally, the [web] section supports one entry:\n"
+"\n"
+"baseurl\n"
+"  Base URL for browsing Mercurial repositories. Reference from\n"
+"  templates as {hgweb}.\n"
+"\n"
+"Activating the extension::\n"
 "\n"
 "    [extensions]\n"
 "    hgext.bugzilla =\n"
@@ -389,7 +414,7 b' msgid ""'
 "\n"
 "This example configuration is for a collection of Mercurial\n"
 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2.\n"
+"installation in /opt/bugzilla-3.2. ::\n"
 "\n"
 "    [bugzilla]\n"
 "    host=localhost\n"
@@ -397,8 +422,9 b' msgid ""'
 "    version=3.0\n"
 "    bzuser=[e-mail]\n"
 "    bzdir=/opt/bugzilla-3.2\n"
-"    template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
-"rev/{node|short}\\n\\n{desc}\\n\n"
+"    template=Changeset {node|short} in {root|basename}.\n"
+"             {hgweb}/{webroot}/rev/{node|short}\\n\n"
+"             {desc}\\n\n"
 "    strip=5\n"
 "\n"
 "    [web]\n"
@@ -407,7 +433,7 b' msgid ""'
 "    [usermap]\n"
 "    [e-mail]=[e-mail]\n"
 "\n"
-"Commits add a comment to the Bugzilla bug record of the form:\n"
+"Commits add a comment to the Bugzilla bug record of the form::\n"
 "\n"
 "    Changeset 3b16791d6642 in repository-name.\n"
 "    http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
@@ -431,79 +457,98 b' msgstr ""'
 "você terá que assegurar que as permissões de arquivo da instalação\n"
 "do Bugzilla estejam configuradas apropriadamente.\n"
 "\n"
-"Configuração da extensão:\n"
-"\n"
-"    [bugzilla]\n"
-"\n"
-"    host       Nome do servidor do MySQL que contém o banco de dados\n"
-"               do Bugzilla.\n"
-"    db         Nome do banco de dados do Bugzilla no MySQL. O padrão\n"
-"               é 'bugs'.\n"
-"    user       Nome de usuário para acessar o servidor MySQL. O\n"
-"               padrão é 'bugs'.\n"
-"    password   Senha para acessar o servidor do MySQL.\n"
-"    timeout    Tempo de espera máximo para conexão com o banco de\n"
-"               dados (em segundos). O padrão é 5.\n"
-"    version    Versão do Bugzilla. Especifique '3.0' para versões do\n"
-"               Bugzilla 3.0 e posteriores, '2.18' para a versão 2.18\n"
-"               e '2.16' para versões anteriores à 2.18.\n"
-"    bzuser     Nome de usuário no Bugzilla utilizado para gravar os\n"
-"               comentários se o autor do changeset não for encontrado\n"
-"               como um usuário do Bugzilla.\n"
-"    bzdir      Diretório de instalação do Bugzilla. Usado pelo notify\n"
-"               padrão. Seu valor padrão é '/var/www/html/bugzilla'.\n"
-"    notify     O comando que deve ser executado para o Bugzilla\n"
-"               enviar o email de notificação de alterações.\n"
-"               Substituído de uma mapa com 3 entradas, 'bzdir', 'id'\n"
-"               (bug id) e 'user' (email do submetedor do bugzilla).\n"
-"               O padrão depende da versão; na 2.18 é\n"
-"               \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-"               %(id)s %(user)s\".\n"
-"    regexp     Expressão regular para encontrar os IDs dos bugs na\n"
-"               mensagem de consolidação do changeset. Deve conter um\n"
-"               grupo de \"()\". A expressão padrão encontra\n"
-"               'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n"
-"               'Bugs 1234,5678', 'Bug 1234 and 5678' e variações. A\n"
-"               equivalência não é sensível a maiúsculas e minúsculas.\n"
-"    style      O arquivo de estilo usado para formatar os\n"
-"               comentários.\n"
-"    template   O template usado para formatar os comentários.\n"
-"               Sobrepõe style se especificado. Além das palavras\n"
-"               chave do Mercurial, a extensão define:\n"
-"                   {bug}       O ID do bug no Bugzilla.\n"
-"                   {root}      O caminho completo do repositório do\n"
-"                               Mercurial.\n"
-"                   {webroot}   O caminho do repositório do Mercurial.\n"
-"                   {hgweb}     URL base para visualizar o repositório\n"
-"                               do Mercurial via http.\n"
-"               Padrão 'changeset {node|short} in repo {root} refers '\n"
-"                      'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
-"    strip      O número de barras que devem ser retiradas do início\n"
-"               do {root} para produzir o {webroot}. Padrão 0.\n"
-"    usermap    Caminho para o arquivo que contem o mapeamento do\n"
-"               consolidador do Mercurial para o ID do usuário do\n"
-"               Bugzilla. Se especificado, o arquivo deve conter um\n"
-"               mapeamento por linha, \"committer\"=\"Bugzilla user\".\n"
-"               Veja também a sessão [usermap].\n"
-"\n"
-"    [usermap]\n"
-"    Quaisquer entradas nessa sessão especificam mapeamentos de IDs\n"
-"    dos consolidadores do Mercurial para IDs de usuário do Bugzilla.\n"
-"    Veja também [bugzilla].usermap.\n"
-"    \"committer\"=\"Bugzilla user\"\n"
-"\n"
-"    [web]\n"
-"    baseurl    URL base para visualização de repositórios do\n"
-"               Mercurial. Usada em modelos como {hgweb}.\n"
-"\n"
-"Para ativar a extensão:\n"
+"Esta extensão é configurada através de três diferentes seções de\n"
+"configuração. As seguintes chaves são reconhecidas na seção\n"
+"[bugzilla]:\n"
+"\n"
+"host\n"
+"  Nome do servidor do MySQL que contém o banco de dados do Bugzilla.\n"
+"\n"
+"db\n"
+"  Nome do banco de dados do Bugzilla no MySQL. O padrão é 'bugs'.\n"
+"\n"
+"user\n"
+"  Nome de usuário para acessar o servidor MySQL. O padrão é 'bugs'.\n"
+"\n"
+"password\n"
+"  Senha para acessar o servidor do MySQL.\n"
+"\n"
+"timeout\n"
+"  Tempo de espera máximo para conexão com o banco de dados (em\n"
+"  segundos). O padrão é 5.\n"
+"\n"
+"version\n"
+"  Versão do Bugzilla. Especifique '3.0' para versões do Bugzilla 3.0\n"
+"  e posteriores, '2.18' para a versão 2.18 e '2.16' para versões\n"
+"  anteriores à 2.18.\n"
+"\n"
+"bzuser\n"
+"  Nome de usuário no Bugzilla utilizado para gravar os comentários\n"
+"  se o autor do changeset não for encontrado como um usuário do\n"
+"  Bugzilla.\n"
+"\n"
+"bzdir\n"
+"  Diretório de instalação do Bugzilla. Usado pelo notify padrão. Seu\n"
+"  valor padrão é '/var/www/html/bugzilla'.\n"
+"\n"
+"notify\n"
+"  O comando que deve ser executado para o Bugzilla enviar o email\n"
+"  de notificação de alterações. Substituído de uma mapa com 3\n"
+"  entradas, 'bzdir', 'id' (bug id) e 'user' (email do submetedor\n"
+"  do bugzilla). O padrão depende da versão; na 2.18 é\n"
+"  \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)s\".\n"
+"\n"
+"regexp\n"
+"  Expressão regular para encontrar os IDs dos bugs na mensagem de\n"
+"  consolidação do changeset. Deve conter um grupo de \"()\". A\n"
+"  expressão padrão encontra 'Bug 1234', 'Bug no. 1234', 'Bug number\n"
+"  1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' e variações. A\n"
+"  equivalência não é sensível a maiúsculas e minúsculas.\n"
+"\n"
+"style\n"
+"  O arquivo de estilo usado para formatar os comentários.\n"
+"\n"
+"template\n"
+"  O template usado para formatar os comentários. Sobrepõe style se\n"
+"  especificado. Além das palavras chave do Mercurial, a extensão\n"
+"  especifica::\n"
+"    {bug}       O ID do bug no Bugzilla.\n"
+"    {root}      O caminho completo do repositório do Mercurial.\n"
+"    {webroot}   O caminho do repositório do Mercurial.\n"
+"    {hgweb}     URL base para visualizar o repositório do Mercurial via "
+"http.\n"
+"\n"
+"  O valor padrão é 'changeset {node|short} in repo {root} refers '\n"
+"                   'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
+"\n"
+"strip\n"
+"  O número de barras que devem ser retiradas do início do {root} para\n"
+"  produzir o {webroot}. Padrão 0.\n"
+"\n"
+"usermap\n"
+"  Caminho para o arquivo que contem o mapeamento do consolidador do\n"
+"  Mercurial para o ID do usuário do Bugzilla. Se especificado, o\n"
+"  arquivo deve conter um mapeamento por linha,   \"committer\"=\"Bugzilla "
+"user\". Veja também a sessão [usermap].\n"
+"\n"
+"A seção [usermap]é usada para especificar mapeamentos de IDs dos\n"
+"consolidadores do Mercurial para IDs de usuário do Bugzilla. Veja\n"
+"também [bugzilla].usermap.\n"
+"\"committer\"=\"Bugzilla user\"\n"
+"\n"
+"Por fim, a seção [web] suporta uma entrada:\n"
+"\n"
+"baseurl\n"
+"  URL base para visualização de repositórios do Mercurial. Usada\n"
+"  em modelos como {hgweb}.\n"
+"\n"
+"Para ativar a extensão::\n"
 "\n"
 "    [extensions]\n"
 "    hgext.bugzilla =\n"
 "\n"
 "    [hooks]\n"
-"    # executa o gancho bugzilla a cada mudança trazida\n"
-"    # para cá\n"
+"    # executa o gancho bugzilla a cada mudança trazida para cá\n"
 "    incoming.bugzilla = python:hgext.bugzilla.hook\n"
 "\n"
 "Exemplo de configuração:\n"
@@ -518,8 +563,9 b' msgstr ""'
 "    version=3.0\n"
 "    bzuser=[e-mail]\n"
 "    bzdir=/opt/bugzilla-3.2\n"
-"    template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
-"rev/{node|short}\\n\\n{desc}\\n\n"
+"    template=Changeset {node|short} in {root|basename}.\n"
+"             {hgweb}/{webroot}/rev/{node|short}\\n\n"
+"             {desc}\\n\n"
 "    strip=5\n"
 "\n"
 "    [web]\n"
@@ -529,7 +575,7 b' msgstr ""'
 "    [e-mail]=[e-mail]\n"
 "\n"
 "Consolidações adicionam um comentário ao registro de bug do Bugzilla\n"
-"com a forma:\n"
+"com a forma::\n"
 "\n"
 "    Changeset 3b16791d6642 in repository-name.\n"
 "    http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
@@ -662,7 +708,7 b' msgid ""'
 "    alternatively the number of matching revisions if the\n"
 "    --changesets option is specified.\n"
 "\n"
-"    Examples:\n"
+"    Examples::\n"
 "\n"
 "      # display count of changed lines for every committer\n"
 "      hg churn -t '{author|email}'\n"
@@ -677,12 +723,12 b' msgid ""'
 "      hg churn -f '%Y' -s\n"
 "\n"
 "    It is possible to map alternate email addresses to a main address\n"
-"    by providing a file using the following format:\n"
-"\n"
-"    <alias email> <actual email>\n"
-"\n"
-"    Such a file may be specified with the --aliases option, otherwise a\n"
-"    .hgchurn file will be looked for in the working directory root.\n"
+"    by providing a file using the following format::\n"
+"\n"
+"      <alias email> <actual email>\n"
+"\n"
+"    Such a file may be specified with the --aliases option, otherwise\n"
+"    a .hgchurn file will be looked for in the working directory root.\n"
 "    "
 msgstr ""
 "histograma de mudanças do repositório\n"
@@ -697,7 +743,7 b' msgstr ""'
 "    alternativamente no número de revisões, se for usada a opção\n"
 "    --changesets.\n"
 "\n"
-"    Exemplos:\n"
+"    Exemplos::\n"
 "\n"
 "      # exibe a contagem de linhas modificadas para cada autor\n"
 "      hg churn -t '{author|email}'\n"
@@ -715,7 +761,7 b' msgstr ""'
 "    endereço principal provendo um arquivo usando o seguinte\n"
 "    formato:\n"
 "\n"
-"    <email alternativo> <email principal>\n"
+"      <email alternativo> <email principal>\n"
 "\n"
 "    Esse arquivo pode ser especificado com a opção --aliases; de\n"
 "    outro modo, será usado um arquivo .hgchurn no raiz do diretório\n"
@@ -767,33 +813,33 b' msgid ""'
 "function (aka ANSI escape codes). This module also provides the\n"
 "render_text function, which can be used to add effects to any text.\n"
 "\n"
-"Default effects may be overridden from the .hgrc file:\n"
-"\n"
-"[color]\n"
-"status.modified = blue bold underline red_background\n"
-"status.added = green bold\n"
-"status.removed = red bold blue_background\n"
-"status.deleted = cyan bold underline\n"
-"status.unknown = magenta bold underline\n"
-"status.ignored = black bold\n"
-"\n"
-"# 'none' turns off all effects\n"
-"status.clean = none\n"
-"status.copied = none\n"
-"\n"
-"qseries.applied = blue bold underline\n"
-"qseries.unapplied = black bold\n"
-"qseries.missing = red bold\n"
-"\n"
-"diff.diffline = bold\n"
-"diff.extended = cyan bold\n"
-"diff.file_a = red bold\n"
-"diff.file_b = green bold\n"
-"diff.hunk = magenta\n"
-"diff.deleted = red\n"
-"diff.inserted = green\n"
-"diff.changed = white\n"
-"diff.trailingwhitespace = bold red_background\n"
+"Default effects may be overridden from the .hgrc file::\n"
+"\n"
+"  [color]\n"
+"  status.modified = blue bold underline red_background\n"
+"  status.added = green bold\n"
+"  status.removed = red bold blue_background\n"
+"  status.deleted = cyan bold underline\n"
+"  status.unknown = magenta bold underline\n"
+"  status.ignored = black bold\n"
+"\n"
+"  # 'none' turns off all effects\n"
+"  status.clean = none\n"
+"  status.copied = none\n"
+"\n"
+"  qseries.applied = blue bold underline\n"
+"  qseries.unapplied = black bold\n"
+"  qseries.missing = red bold\n"
+"\n"
+"  diff.diffline = bold\n"
+"  diff.extended = cyan bold\n"
+"  diff.file_a = red bold\n"
+"  diff.file_b = green bold\n"
+"  diff.hunk = magenta\n"
+"  diff.deleted = red\n"
+"  diff.inserted = green\n"
+"  diff.changed = white\n"
+"  diff.trailingwhitespace = bold red_background\n"
 msgstr ""
 "colore a saída de alguns comandos\n"
 "\n"
@@ -810,33 +856,33 b' msgstr ""'
 "Esse modulo também provê a função render_text, que pode ser utilizada\n"
 "para adicionar efeitos a qualquer texto.\n"
 "\n"
-"Os efeitos padrão podem ser sobrepostos pelo arquivo .hgrc:\n"
-"\n"
-"[color]\n"
-"status.modified = blue bold underline red_background\n"
-"status.added = green bold\n"
-"status.removed = red bold blue_background\n"
-"status.deleted = cyan bold underline\n"
-"status.unknown = magenta bold underline\n"
-"status.ignored = black bold\n"
-"\n"
-"# 'none' desliga todos os efeitos\n"
-"status.clean = none\n"
-"status.copied = none\n"
-"\n"
-"qseries.applied = blue bold underline\n"
-"qseries.unapplied = black bold\n"
-"qseries.missing = red bold\n"
-"\n"
-"diff.diffline = bold\n"
-"diff.extended = cyan bold\n"
-"diff.file_a = red bold\n"
-"diff.file_b = green bold\n"
-"diff.hunk = magenta\n"
-"diff.deleted = red\n"
-"diff.inserted = green\n"
-"diff.changed = white\n"
-"diff.trailingwhitespace = bold red_background\n"
+"Os efeitos padrão podem ser sobrepostos pelo arquivo .hgrc::\n"
+"\n"
+"  [color]\n"
+"  status.modified = blue bold underline red_background\n"
+"  status.added = green bold\n"
+"  status.removed = red bold blue_background\n"
+"  status.deleted = cyan bold underline\n"
+"  status.unknown = magenta bold underline\n"
+"  status.ignored = black bold\n"
+"\n"
+"  # 'none' desliga todos os efeitos\n"
+"  status.clean = none\n"
+"  status.copied = none\n"
+"\n"
+"  qseries.applied = blue bold underline\n"
+"  qseries.unapplied = black bold\n"
+"  qseries.missing = red bold\n"
+"\n"
+"  diff.diffline = bold\n"
+"  diff.extended = cyan bold\n"
+"  diff.file_a = red bold\n"
+"  diff.file_b = green bold\n"
+"  diff.hunk = magenta\n"
+"  diff.deleted = red\n"
+"  diff.inserted = green\n"
+"  diff.changed = white\n"
+"  diff.trailingwhitespace = bold red_background\n"
 
 msgid "when to colorize (always, auto, or never)"
 msgstr ""
@@ -857,6 +903,7 b' msgid ""'
 "convert a foreign SCM repository to a Mercurial one.\n"
 "\n"
 "    Accepted source formats [identifiers]:\n"
+"\n"
 "    - Mercurial [hg]\n"
 "    - CVS [cvs]\n"
 "    - Darcs [darcs]\n"
@@ -868,6 +915,7 b' msgid ""'
 "    - Perforce [p4]\n"
 "\n"
 "    Accepted destination formats [identifiers]:\n"
+"\n"
 "    - Mercurial [hg]\n"
 "    - Subversion [svn] (history on branches is not preserved)\n"
 "\n"
@@ -879,23 +927,28 b' msgid ""'
 "    basename of the source with '-hg' appended. If the destination\n"
 "    repository doesn't exist, it will be created.\n"
 "\n"
-"    By default, all sources except Mercurial will use\n"
-"    --branchsort. Mercurial uses --sourcesort to preserve original\n"
-"    revision numbers order. Sort modes have the following effects:\n"
-"      --branchsort: convert from parent to child revision when\n"
-"        possible, which means branches are usually converted one after\n"
-"        the other. It generates more compact repositories.\n"
-"      --datesort: sort revisions by date. Converted repositories have\n"
-"        good-looking changelogs but are often an order of magnitude\n"
-"        larger than the same ones generated by --branchsort.\n"
-"      --sourcesort: try to preserve source revisions order, only\n"
-"        supported by Mercurial sources.\n"
+"    By default, all sources except Mercurial will use --branchsort.\n"
+"    Mercurial uses --sourcesort to preserve original revision numbers\n"
+"    order. Sort modes have the following effects:\n"
+"\n"
+"    --branchsort  convert from parent to child revision when possible,\n"
+"                  which means branches are usually converted one after\n"
+"                  the other. It generates more compact repositories.\n"
+"\n"
+"    --datesort    sort revisions by date. Converted repositories have\n"
+"                  good-looking changelogs but are often an order of\n"
+"                  magnitude larger than the same ones generated by\n"
+"                  --branchsort.\n"
+"\n"
+"    --sourcesort  try to preserve source revisions order, only\n"
+"                  supported by Mercurial sources.\n"
 "\n"
 "    If <REVMAP> isn't given, it will be put in a default location\n"
 "    (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
 "    that maps each source commit ID to the destination ID for that\n"
-"    revision, like so:\n"
-"    <source ID> <destination ID>\n"
+"    revision, like so::\n"
+"\n"
+"      <source ID> <destination ID>\n"
 "\n"
 "    If the file doesn't exist, it's automatically created. It's\n"
 "    updated on each commit copied, so convert-repo can be interrupted\n"
@@ -909,7 +962,7 b' msgid ""'
 "\n"
 "    The filemap is a file that allows filtering and remapping of files\n"
 "    and directories. Comment lines start with '#'. Each line can\n"
-"    contain one of the following directives:\n"
+"    contain one of the following directives::\n"
 "\n"
 "      include path/to/file\n"
 "\n"
@@ -919,11 +972,11 b' msgid ""'
 "\n"
 "    The 'include' directive causes a file, or all files under a\n"
 "    directory, to be included in the destination repository, and the\n"
-"    exclusion of all other files and directories not explicitly included.\n"
-"    The 'exclude' directive causes files or directories to be omitted.\n"
-"    The 'rename' directive renames a file or directory. To rename from\n"
-"    a subdirectory into the root of the repository, use '.' as the\n"
-"    path to rename to.\n"
+"    exclusion of all other files and directories not explicitly\n"
+"    included. The 'exclude' directive causes files or directories to\n"
+"    be omitted. The 'rename' directive renames a file or directory. To\n"
+"    rename from a subdirectory into the root of the repository, use\n"
+"    '.' as the path to rename to.\n"
 "\n"
 "    The splicemap is a file that allows insertion of synthetic\n"
 "    history, letting you specify the parents of a revision. This is\n"
@@ -948,7 +1001,7 b' msgid ""'
 "    in one repository from \"default\" to a named branch.\n"
 "\n"
 "    Mercurial Source\n"
-"    -----------------\n"
+"    ----------------\n"
 "\n"
 "    --config convert.hg.ignoreerrors=False    (boolean)\n"
 "        ignore integrity errors when reading. Use it to fix Mercurial\n"
@@ -976,36 +1029,38 b' msgid ""'
 "    Because CVS does not have changesets, it is necessary to collect\n"
 "    individual commits to CVS and merge them into changesets. CVS\n"
 "    source uses its internal changeset merging code by default but can\n"
-"    be configured to call the external 'cvsps' program by setting:\n"
-"        --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"    be configured to call the external 'cvsps' program by setting::\n"
+"\n"
+"      --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"\n"
 "    This option is deprecated and will be removed in Mercurial 1.4.\n"
 "\n"
 "    The options shown are the defaults.\n"
 "\n"
-"    Internal cvsps is selected by setting\n"
-"        --config convert.cvsps=builtin\n"
+"    Internal cvsps is selected by setting ::\n"
+"\n"
+"      --config convert.cvsps=builtin\n"
+"\n"
 "    and has a few more configurable options:\n"
-"        --config convert.cvsps.cache=True     (boolean)\n"
-"            Set to False to disable remote log caching, for testing and\n"
-"            debugging purposes.\n"
-"        --config convert.cvsps.fuzz=60        (integer)\n"
-"            Specify the maximum time (in seconds) that is allowed\n"
-"            between commits with identical user and log message in a\n"
-"            single changeset. When very large files were checked in as\n"
-"            part of a changeset then the default may not be long\n"
-"            enough.\n"
-"        --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
-"            Specify a regular expression to which commit log messages\n"
-"            are matched. If a match occurs, then the conversion\n"
-"            process will insert a dummy revision merging the branch on\n"
-"            which this log message occurs to the branch indicated in\n"
-"            the regex.\n"
-"        --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
-"            Specify a regular expression to which commit log messages\n"
-"            are matched. If a match occurs, then the conversion\n"
-"            process will add the most recent revision on the branch\n"
-"            indicated in the regex as the second parent of the\n"
-"            changeset.\n"
+"\n"
+"    --config convert.cvsps.cache=True         (boolean)\n"
+"        Set to False to disable remote log caching, for testing and\n"
+"        debugging purposes.\n"
+"    --config convert.cvsps.fuzz=60            (integer)\n"
+"        Specify the maximum time (in seconds) that is allowed between\n"
+"        commits with identical user and log message in a single\n"
+"        changeset. When very large files were checked in as part of a\n"
+"        changeset then the default may not be long enough.\n"
+"    --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
+"        Specify a regular expression to which commit log messages are\n"
+"        matched. If a match occurs, then the conversion process will\n"
+"        insert a dummy revision merging the branch on which this log\n"
+"        message occurs to the branch indicated in the regex.\n"
+"    --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
+"        Specify a regular expression to which commit log messages are\n"
+"        matched. If a match occurs, then the conversion process will\n"
+"        add the most recent revision on the branch indicated in the\n"
+"        regex as the second parent of the changeset.\n"
 "\n"
 "    The hgext/convert/cvsps wrapper script allows the builtin\n"
 "    changeset merging code to be run without doing a conversion. Its\n"
@@ -1055,7 +1110,6 b' msgid ""'
 "    --config convert.p4.startrev=0            (perforce changelist number)\n"
 "        specify initial Perforce revision.\n"
 "\n"
-"\n"
 "    Mercurial Destination\n"
 "    ---------------------\n"
 "\n"
@@ -1071,6 +1125,7 b' msgstr ""'
 "converte um repositório de um outro sistema em um do Mercurial.\n"
 "\n"
 "    Formatos de origem aceitos [identificadores]:\n"
+"\n"
 "    - Mercurial [hg]\n"
 "    - CVS [cvs]\n"
 "    - Darcs [darcs]\n"
@@ -1082,6 +1137,7 b' msgstr ""'
 "    - Perforce [p4]\n"
 "\n"
 "    Formatos de destino aceitos [identificadores]:\n"
+"\n"
 "    - Mercurial [hg]\n"
 "    - Subversion [svn] (histórico em ramos não é preservado)\n"
 "\n"
@@ -1097,22 +1153,25 b' msgstr ""'
 "    usará --branchsort. O Mercurial usa --sourcesort para preservar\n"
 "    a ordem de números de revisão original. Modos de ordenação têm\n"
 "    os seguintes efeitos:\n"
-"      --branchsort: converte de revisão pai para filha quando\n"
-"        possível, o que faz com que ramos sejam usualmente\n"
-"        convertidos um após o outro. Esta opção gera repositórios\n"
-"        mais compactos.\n"
-"      --datesort: ordena revisões por data. Os repositórios\n"
-"        convertidos tendem a ter changelogs de boa aparência, mas\n"
-"        algumas vezes são uma ordem de grandeza maiores que os\n"
-"        mesmos gerados por --branchsort.\n"
-"      --sourcesort: tenta preservar a ordem de revisões da origem,\n"
-"        suportada apenas pela origem Mercurial.\n"
+"    --branchsort  converte de revisão pai para filha quando possível,\n"
+"                  o que faz com que ramos sejam usualmente convertidos\n"
+"                  um após o outro. Esta opção gera repositórios mais\n"
+"                  compactos.\n"
+"\n"
+"    --datesort    ordena revisões por data. Os repositórios convertidos\n"
+"                  tendem a ter changelogs de boa aparência, mas algumas\n"
+"                  vezes são uma ordem de grandeza maiores que os mesmos\n"
+"                  gerados por --branchsort.\n"
+"\n"
+"    --sourcesort  tenta preservar a ordem de revisões da origem, opção\n"
+"                  suportada apenas pela origem Mercurial.\n"
 "\n"
 "    Se não for dado o <REVMAP>, ele será posto em um local padrão\n"
 "    (<destino>/.hg/shamap). O <REVMAP> é um simples arquivo texto\n"
 "    que mapeia cada ID de commit da origem para o ID de destino para\n"
-"    aquela revisão, da seguinte forma:\n"
-"    <ID origem> <ID destino>\n"
+"    aquela revisão, da seguinte forma::\n"
+"\n"
+"      <ID origem> <ID destino>\n"
 "\n"
 "    Se o arquivo não existir, será automaticamente criado. Ele é\n"
 "    atualizado a cada commit copiado, assim a conversão pode ser\n"
@@ -1137,7 +1196,7 b' msgstr ""'
 "\n"
 "    A diretiva 'include' faz com que um arquivo, ou todos os arquivos\n"
 "    em um diretório, sejam incluídos no repositório de destino, e\n"
-"    também exclui todos os outros arquivos e diretórios não incluídos\n"
+"    exclui todos os outros arquivos e diretórios não incluídos\n"
 "    explicitamente. A diretiva 'exclude' faz com que os arquivos e\n"
 "    diretórios sejam omitidos. A diretiva 'rename' renomeia um\n"
 "    arquivo ou diretório. Para renomear de um subdiretório para o\n"
@@ -1168,7 +1227,7 b' msgstr ""'
 "    para um ramo nomeado.\n"
 "\n"
 "    Origem Mercurial\n"
-"    -----------------\n"
+"    ----------------\n"
 "\n"
 "    --config convert.hg.ignoreerrors=False    (booleana)\n"
 "        ignora erros de integridade ao ler. Use-a para corrigir\n"
@@ -1196,36 +1255,41 b' msgstr ""'
 "    Como o CVS não possui changesets, é necessário coletar commits\n"
 "    individuais do CVS e mesclá-los em changesets. A origem CVS usa\n"
 "    seu código interno de mesclagem por padrão, mas pode ser\n"
-"    configurada para chamar o utilitário externo 'cvsps' definindo:\n"
-"        --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"    configurada para chamar o utilitário externo 'cvsps' definindo::\n"
+"\n"
+"      --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"\n"
 "    Esta opção é obsoleta e será removida no Mercurial 1.4.\n"
 "\n"
 "    As opções exibidas são os valores padrão.\n"
 "\n"
-"    O cvsps interno é selecionado com\n"
-"        --config convert.cvsps=builtin\n"
+"    O cvsps interno é selecionado com::\n"
+"\n"
+"      --config convert.cvsps=builtin\n"
+"\n"
 "    e possui algumas outras opções de configuração:\n"
-"        --config convert.cvsps.cache=True     (booleana)\n"
-"            Defina como False para desabilitar o cache do log\n"
-"            remoto, para teste ou depuração.\n"
-"        --config convert.cvsps.fuzz=60        (inteiro)\n"
-"            Especifica o tempo máximo (em segundos) permitido entre\n"
-"            commits com usuário e mensagem de log em um único\n"
-"            changeset. Se arquivos muito grandes forem armazenados\n"
-"            como parte de um changeset, o padrão pode não ser\n"
-"            suficiente.\n"
-"        --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
-"            Especifica uma expressão regular com a qual mensagens de\n"
-"            log de commit são verificadas. Se um casamento for\n"
-"            encontrado, a conversão inserirá uma revisão artificial\n"
-"            mesclando o ramo onde essa mensagem de log aparece ao\n"
-"            ramo indicado na expressão regular.\n"
-"        --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
-"            Especifica uma expressão regular com a qual mensagens de\n"
-"            log de commit são verificadas. Se um casamento for\n"
-"            encontrado, a conversão inserirá a revisão mais recente\n"
-"            do ramo indicado na expressão regular como segundo pai do\n"
-"            changeset.\n"
+"\n"
+"    --config convert.cvsps.cache=True         (booleana)\n"
+"        Defina como False para desabilitar o cache do log\n"
+"        remoto, para teste ou depuração.\n"
+"    --config convert.cvsps.fuzz=60            (inteiro)\n"
+"        Especifica o tempo máximo (em segundos) permitido entre\n"
+"        commits com usuário e mensagem de log em um único\n"
+"        changeset. Se arquivos muito grandes forem armazenados\n"
+"        como parte de um changeset, o padrão pode não ser\n"
+"        suficiente.\n"
+"    --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
+"        Especifica uma expressão regular com a qual mensagens de\n"
+"        log de commit são verificadas. Se um casamento for\n"
+"        encontrado, a conversão inserirá uma revisão artificial\n"
+"        mesclando o ramo onde essa mensagem de log aparece ao\n"
+"        ramo indicado na expressão regular.\n"
+"    --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
+"        Especifica uma expressão regular com a qual mensagens de\n"
+"        log de commit são verificadas. Se um casamento for\n"
+"        encontrado, a conversão inserirá a revisão mais recente\n"
+"        do ramo indicado na expressão regular como segundo pai do\n"
+"        changeset.\n"
 "\n"
 "    O script hgext/convert/cvsps permite que o código de mesclagem\n"
 "    interno seja executado fora do processo de conversão. Seus\n"
@@ -1277,7 +1341,6 b' msgstr ""'
 "    --config convert.p4.startrev=0            (número de changelist p4)\n"
 "        especifica a revisão inicial do Perforce.\n"
 "\n"
-"\n"
 "    Destino Mercurial\n"
 "    ---------------------\n"
 "\n"
@@ -1844,14 +1907,14 b' msgstr "XXX TAGS AINDA N\xc3\x83O IMPLEMENTADAS\\n"'
 msgid ""
 "command to allow external programs to compare revisions\n"
 "\n"
-"The `extdiff' Mercurial extension allows you to use external programs\n"
-"to compare revisions, or revision with working directory. The external diff\n"
-"programs are called with a configurable set of options and two\n"
+"The extdiff Mercurial extension allows you to use external programs\n"
+"to compare revisions, or revision with working directory. The external\n"
+"diff programs are called with a configurable set of options and two\n"
 "non-option arguments: paths to directories containing snapshots of\n"
 "files to compare.\n"
 "\n"
-"The `extdiff' extension also allows to configure new diff commands, so\n"
-"you do not need to type \"hg extdiff -p kdiff3\" always.\n"
+"The extdiff extension also allows to configure new diff commands, so\n"
+"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
 "\n"
 "  [extdiff]\n"
 "  # add new command that runs GNU diff(1) in 'context diff' mode\n"
@@ -1867,28 +1930,27 b' msgid ""'
 "  meld =\n"
 "\n"
 "  # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
-"  # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
-"  # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
-"in\n"
+"  # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
+"  # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
 "  # your .vimrc\n"
 "  vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
 "\n"
 "You can use -I/-X and list of file or directory names like normal \"hg\n"
-"diff\" command. The `extdiff' extension makes snapshots of only needed\n"
+"diff\" command. The extdiff extension makes snapshots of only needed\n"
 "files, so running the external diff program will actually be pretty\n"
 "fast (at least faster than having to compare the entire tree).\n"
 msgstr ""
 "comando que usa programas externos para comparar revisões\n"
 "\n"
-"A extensão `extdiff' do Mercurial permite o uso de programas externos\n"
+"A extensão extdiff do Mercurial permite o uso de programas externos\n"
 "para comparar revisões ou revisões e a cópia local. Os programas de\n"
 "diff externos são chamados com um conjunto configurável de opções e\n"
 "dois argumentos: caminhos para diretórios contendo cópias temporárias\n"
 "dos arquivos a serem comparados.\n"
 "\n"
-"A extensão `extdiff' também permite configurar novos comandos\n"
+"A extensão extdiff também permite configurar novos comandos\n"
 "de diff, de modo que você não precise sempre digitar\n"
-"\"hg extdiff -p kdiff3\".\n"
+"\"hg extdiff -p kdiff3\". ::\n"
 "\n"
 "  [extdiff]\n"
 "  # adiciona um novo comando que executa o GNU diff(1) em modo\n"
@@ -1913,7 +1975,7 b' msgstr ""'
 "  vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
 "\n"
 "Você pode usar -I/-X e uma lista de nomes de arquivos ou diretórios\n"
-"como no comando \"hg diff\" normal. A extensão `extdiff' faz cópias\n"
+"como no comando \"hg diff\" normal. A extensão extdiff faz cópias\n"
 "temporárias apenas dos arquivos necessários, de modo que a execução\n"
 "do diff externo seja rápida (ao menos mais rápida que comparar a\n"
 "árvore completa).\n"
@@ -1991,6 +2053,31 b' msgid "hg extdiff [OPT]... [FILE]..."'
 msgstr "hg extdiff [OPÇÃO]... [ARQUIVO]..."
 
 #, python-format
+msgid ""
+"use %(path)s to diff repository (or selected files)\n"
+"\n"
+"    Show differences between revisions for the specified files, using the\n"
+"    %(path)s program.\n"
+"\n"
+"    When two revision arguments are given, then changes are shown between\n"
+"    those revisions. If only one revision is specified then that revision "
+"is\n"
+"    compared to the working directory, and, when no revisions are "
+"specified,\n"
+"    the working directory files are compared to its parent."
+msgstr ""
+"usa %(path)s para exibir diffs do repositório ou arquivos\n"
+"\n"
+"    Mostra diferenças entre revisões para os arquivos especificados,\n"
+"    usando o programa %(path)s.\n"
+"\n"
+"    Quando dois argumentos de revisão forem dados, são exibidas as\n"
+"    mudanças entre essas revisões. Se apenas uma revisão for\n"
+"    especificada, tal revisão será comparada com o diretório de\n"
+"    trabalho, e se nenhuma revisão for especificada, os arquivos do\n"
+"    diretório de trabalho serão comparados com seu pai."
+
+#, python-format
 msgid "hg %s [OPTION]... [FILE]..."
 msgstr "hg %s [OPÇÃO]... [ARQUIVO]..."
 
@@ -2252,73 +2339,73 b' msgstr "hg glog [OP\xc3\x87\xc3\x83O]... [ARQUIVO]"'
 msgid ""
 "hooks for integrating with the CIA.vc notification service\n"
 "\n"
-"This is meant to be run as a changegroup or incoming hook.\n"
-"To configure it, set the following options in your hgrc:\n"
-"\n"
-"[cia]\n"
-"# your registered CIA user name\n"
-"user = foo\n"
-"# the name of the project in CIA\n"
-"project = foo\n"
-"# the module (subproject) (optional)\n"
-"#module = foo\n"
-"# Append a diffstat to the log message (optional)\n"
-"#diffstat = False\n"
-"# Template to use for log messages (optional)\n"
-"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
-"# Style to use (optional)\n"
-"#style = foo\n"
-"# The URL of the CIA notification service (optional)\n"
-"# You can use mailto: URLs to send by email, eg\n"
-"# mailto:[e-mail]\n"
-"# Make sure to set email.from if you do this.\n"
-"#url = http://cia.vc/\n"
-"# print message instead of sending it (optional)\n"
-"#test = False\n"
-"\n"
-"[hooks]\n"
-"# one of these:\n"
-"changegroup.cia = python:hgcia.hook\n"
-"#incoming.cia = python:hgcia.hook\n"
-"\n"
-"[web]\n"
-"# If you want hyperlinks (optional)\n"
-"baseurl = http://server/path/to/repo\n"
+"This is meant to be run as a changegroup or incoming hook. To\n"
+"configure it, set the following options in your hgrc::\n"
+"\n"
+"  [cia]\n"
+"  # your registered CIA user name\n"
+"  user = foo\n"
+"  # the name of the project in CIA\n"
+"  project = foo\n"
+"  # the module (subproject) (optional)\n"
+"  #module = foo\n"
+"  # Append a diffstat to the log message (optional)\n"
+"  #diffstat = False\n"
+"  # Template to use for log messages (optional)\n"
+"  #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+"  # Style to use (optional)\n"
+"  #style = foo\n"
+"  # The URL of the CIA notification service (optional)\n"
+"  # You can use mailto: URLs to send by email, eg\n"
+"  # mailto:[e-mail]\n"
+"  # Make sure to set email.from if you do this.\n"
+"  #url = http://cia.vc/\n"
+"  # print message instead of sending it (optional)\n"
+"  #test = False\n"
+"\n"
+"  [hooks]\n"
+"  # one of these:\n"
+"  changegroup.cia = python:hgcia.hook\n"
+"  #incoming.cia = python:hgcia.hook\n"
+"\n"
+"  [web]\n"
+"  # If you want hyperlinks (optional)\n"
+"  baseurl = http://server/path/to/repo\n"
 msgstr ""
 "ganchos para integração com o serviço de notificação CIA.vc\n"
 "\n"
 "Isto deve ser executado como um gancho changegroup ou incoming.\n"
-"Para configurá-lo, defina as seguintes opções em seu hgrc:\n"
-"\n"
-"[cia]\n"
-"# seu nome de usuário CIA registrado\n"
-"user = foo\n"
-"# o nome do projeto CIA\n"
-"project = foo\n"
-"# o módulo (subprojeto) (opcional)\n"
-"#module = foo\n"
-"# Anexa um diffstat à mensagem de log (opcional)\n"
-"#diffstat = False\n"
-"# Modelo a ser usado em mensagens de log (opcional)\n"
-"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
-"# Estilo a ser usado (opcional)\n"
-"#style = foo\n"
-"# A URL do serviço de notificação CIA (opcional)\n"
-"# Você pode usar URLs mailto: para enviar por e-mail, por exemplo\n"
-"# mailto:[e-mail]\n"
-"# Certifique-se de definir email.from se você fizer isso.\n"
-"#url = http://cia.vc/\n"
-"# imprime a mensagem ao invés de enviá-la (opcional)\n"
-"#test = False\n"
-"\n"
-"[hooks]\n"
-"# um destes:\n"
-"changegroup.cia = python:hgcia.hook\n"
-"#incoming.cia = python:hgcia.hook\n"
-"\n"
-"[web]\n"
-"# Se você desejar hyperlinks (opcional)\n"
-"baseurl = http://server/path/to/repo\n"
+"Para configurá-lo, defina as seguintes opções em seu hgrc::\n"
+"\n"
+"  [cia]\n"
+"  # seu nome de usuário CIA registrado\n"
+"  user = foo\n"
+"  # o nome do projeto CIA\n"
+"  project = foo\n"
+"  # o módulo (subprojeto) (opcional)\n"
+"  #module = foo\n"
+"  # Anexa um diffstat à mensagem de log (opcional)\n"
+"  #diffstat = False\n"
+"  # Modelo a ser usado em mensagens de log (opcional)\n"
+"  #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+"  # Estilo a ser usado (opcional)\n"
+"  #style = foo\n"
+"  # A URL do serviço de notificação CIA (opcional)\n"
+"  # Você pode usar URLs mailto: para enviar por e-mail, por exemplo\n"
+"  # mailto:[e-mail]\n"
+"  # Certifique-se de definir email.from se você fizer isso.\n"
+"  #url = http://cia.vc/\n"
+"  # imprime a mensagem ao invés de enviá-la (opcional)\n"
+"  #test = False\n"
+"\n"
+"  [hooks]\n"
+"  # use um destes:\n"
+"  changegroup.cia = python:hgcia.hook\n"
+"  #incoming.cia = python:hgcia.hook\n"
+"\n"
+"  [web]\n"
+"  # Se você desejar hyperlinks (opcional)\n"
+"  baseurl = http://server/path/to/repo\n"
 
 #, python-format
 msgid "hgcia: sending update to %s\n"
@@ -2348,19 +2435,19 b' msgid ""'
 "\n"
 "The hg view command will launch the hgk Tcl script. For this command\n"
 "to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file:\n"
+"the path to hgk in your .hgrc file::\n"
 "\n"
 "  [hgk]\n"
 "  path=/location/of/hgk\n"
 "\n"
 "hgk can make use of the extdiff extension to visualize revisions.\n"
-"Assuming you had already configured extdiff vdiff command, just add:\n"
+"Assuming you had already configured extdiff vdiff command, just add::\n"
 "\n"
 "  [hgk]\n"
 "  vdiff=vdiff\n"
 "\n"
 "Revisions context menu will now display additional entries to fire\n"
-"vdiff on hovered and selected revisions."
+"vdiff on hovered and selected revisions.\n"
 msgstr ""
 "visualiza o repositório em modo gráfico\n"
 "\n"
@@ -2376,20 +2463,20 b' msgstr ""'
 "\n"
 "O comando hg view irá lançar o script Tcl hgk. Para esse comando\n"
 "funcionar, hgk deve estar em seu caminho de busca. Alternativamente,\n"
-"você pode especificar o caminho para o hgk em seu arquivo .hgrc:\n"
+"você pode especificar o caminho para o hgk em seu arquivo .hgrc::\n"
 "\n"
 "  [hgk]\n"
 "  path=/localização/do/hgk\n"
 "\n"
 "O hgk pode usar a extensão extdiff para visualizar revisões.\n"
 "Assumindo que você já configurou o comando vdiff da extdiff, basta\n"
-"adicionar:\n"
+"adicionar::\n"
 "\n"
 "  [hgk]\n"
 "  vdiff=vdiff\n"
 "\n"
 "Os menus de contexto das revisões vão agora mostrar entradas\n"
-"adicionais para disparar o vdiff em revisões selecionadas."
+"adicionais para disparar o vdiff em revisões selecionadas.\n"
 
 msgid "diff trees from two commits"
 msgstr "calcula a diferença entre duas revisões"
@@ -2478,10 +2565,10 b' msgid ""'
 "It depends on the Pygments syntax highlighting library:\n"
 "http://pygments.org/\n"
 "\n"
-"There is a single configuration option:\n"
-"\n"
-"[web]\n"
-"pygments_style = <style>\n"
+"There is a single configuration option::\n"
+"\n"
+"  [web]\n"
+"  pygments_style = <style>\n"
 "\n"
 "The default is 'colorful'.\n"
 msgstr ""
@@ -2490,10 +2577,10 b' msgstr ""'
 "Esta extensão depende da biblioteca Pygments de realce de sintaxe:\n"
 "http://pygments.org/\n"
 "\n"
-"Há uma única opção de configuração:\n"
-"\n"
-"[web]\n"
-"pygments_style = <estilo>\n"
+"Há uma única opção de configuração::\n"
+"\n"
+"  [web]\n"
+"  pygments_style = <estilo>\n"
 "\n"
 "O padrão é 'colorful'.\n"
 
@@ -2610,10 +2697,6 b' msgid "watching directories under %r\\n"'
 msgstr "observando diretórios sobre %r\n"
 
 #, python-format
-msgid "status: %r dir(%d) -> %s\n"
-msgstr "situação: %r dir(%d) -> %s\n"
-
-#, python-format
 msgid "status: %r %s -> %s\n"
 msgstr "situação: %r %s -> %s\n"
 
@@ -2682,12 +2765,12 b' msgstr "setup encerrado\\n"'
 msgid ""
 "expand expressions into changelog and summaries\n"
 "\n"
-"This extension allows the use of a special syntax in summaries,\n"
-"which will be automatically expanded into links or any other\n"
-"arbitrary expression, much like InterWiki does.\n"
-"\n"
-"A few example patterns (link to bug tracking, etc.) that may\n"
-"be used in your hgrc:\n"
+"This extension allows the use of a special syntax in summaries, which\n"
+"will be automatically expanded into links or any other arbitrary\n"
+"expression, much like InterWiki does.\n"
+"\n"
+"A few example patterns (link to bug tracking, etc.) that may be used\n"
+"in your hgrc::\n"
 "\n"
 "  [interhg]\n"
 "  issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
@@ -2703,7 +2786,7 b' msgstr ""'
 "faz.\n"
 "\n"
 "Alguns exemplos de padrões (link para bug tracking, etc.) que podem\n"
-"ser usados em seu hgrc:\n"
+"ser usados em seu hgrc::\n"
 "\n"
 "  [interhg]\n"
 "  issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
@@ -2732,20 +2815,22 b' msgid ""'
 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
 "hgrc files.\n"
 "\n"
-"Example:\n"
+"Example::\n"
 "\n"
 "    [keyword]\n"
 "    # expand keywords in every python file except those matching \"x*\"\n"
 "    **.py =\n"
 "    x*    = ignore\n"
 "\n"
-"Note: the more specific you are in your filename patterns\n"
-"      the less you lose speed in huge repositories.\n"
+"NOTE: the more specific you are in your filename patterns the less you\n"
+"lose speed in huge repositories.\n"
 "\n"
 "For [keywordmaps] template mapping and expansion demonstration and\n"
-"control run \"hg kwdemo\".\n"
-"\n"
-"An additional date template filter {date|utcdate} is provided.\n"
+"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
+"available templates and filters.\n"
+"\n"
+"An additional date template filter {date|utcdate} is provided. It\n"
+"returns a date like \"2006/09/18 15:13:13\".\n"
 "\n"
 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
 "replaced with customized keywords and templates. Again, run \"hg\n"
@@ -2764,8 +2849,8 b' msgid ""'
 "have been checked in.\n"
 "\n"
 "Expansions spanning more than one line and incremental expansions,\n"
-"like CVS' $Log$, are not supported. A keyword template map\n"
-"\"Log = {desc}\" expands to the first line of the changeset description.\n"
+"like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
+"{desc}\" expands to the first line of the changeset description.\n"
 msgstr ""
 "expande palavras chave em arquivos rastreados\n"
 "\n"
@@ -2781,7 +2866,7 b' msgstr ""'
 "A configuração é feita nas seções [keyword] e [keywordmaps] de\n"
 "arquivos hgrc.\n"
 "\n"
-"Exemplo:\n"
+"Exemplo::\n"
 "\n"
 "    [keyword]\n"
 "    # expande palavras chave em todo arquivo python exceto\n"
@@ -2789,13 +2874,15 b' msgstr ""'
 "    **.py =\n"
 "    x*    = ignore\n"
 "\n"
-"Nota: quanto mais específico você for em seus padrões de arquivo\n"
-"      menos velocidade será perdida em repositórios muito grandes.\n"
+"NOTA: quanto mais específico você for em seus padrões de arquivo,\n"
+"menos velocidade será perdida em repositórios muito grandes.\n"
 "\n"
 "Para uma demonstração da expansão e do mapeamento de modelos em\n"
-"[keywordmaps] execute \"hg kwdemo\".\n"
-"\n"
-"É fornecido um filtro {date|utcdate} adicional para modelos.\n"
+"[keywordmaps] execute \"hg kwdemo\". Veja \"hg help templates\"\n"
+"para uma lista dos modelos e filtros disponíveis.\n"
+"\n"
+"É fornecido um filtro {date|utcdate} adicional para modelos. Ele\n"
+"devolve uma data semelhante a \"2006/09/18 15:13:13\".\n"
 "\n"
 "Os mapeamentos de modelo padrões (veja com \"hg kwdemo -d\") podem\n"
 "ser substituídos com palavras chave customizáveis e modelos.\n"
@@ -2840,10 +2927,12 b' msgid ""'
 "    Show current, custom, or default keyword template maps and their\n"
 "    expansions.\n"
 "\n"
-"    Extend current configuration by specifying maps as arguments and\n"
-"    optionally by reading from an additional hgrc file.\n"
-"\n"
-"    Override current keyword template maps with \"default\" option.\n"
+"    Extend the current configuration by specifying maps as arguments\n"
+"    and using -f/--rcfile to source an external hgrc file.\n"
+"\n"
+"    Use -d/--default to disable current configuration.\n"
+"\n"
+"    See \"hg help templates\" for information on templates and filters.\n"
 "    "
 msgstr ""
 "imprime a configuração [keywordmaps] e um exemplo de expansão\n"
@@ -2851,39 +2940,67 b' msgstr ""'
 "    Mostra os mapeamentos de modelo de palavras chave atual,\n"
 "    customizado ou padrão, e suas expansões.\n"
 "\n"
-"    Amplia a configuração atual com a especificação de mapas como\n"
-"    argumentos e opcionalmente lendo de um arquivo hgrc adicional.\n"
-"\n"
-"    Sobrepõe mapas de modelo de palavras chave atuais com opções\n"
-"    \"default\".\n"
+"    Você pode ampliar a configuração atual especificando mapas como\n"
+"    argumentos e usando -f/--rcfile para ler opções de um arquivo\n"
+"    hgrc externo adicional.\n"
+"\n"
+"    Use -d/--default para desabilitar a configuração atual.\n"
+"\n"
+"    Veja \"hg help templates\" para informações sobre modelos e\n"
+"    filtros.\n"
 "    "
 
 #, python-format
 msgid "creating temporary repository at %s\n"
 msgstr "criando repositório temporário em %s\n"
 
-#, python-format
-msgid ""
-"\n"
-"\tconfig using %s keyword template maps\n"
-msgstr ""
-
-#, python-format
-msgid ""
-"\n"
-"%s keywords written to %s:\n"
-msgstr ""
-"\n"
-"%s palavras chave escritas em %s:\n"
+msgid ""
+"\n"
+"\tconfiguration using custom keyword template maps\n"
+msgstr ""
+"\n"
+"\tconfiguração usando mapas de modelo de palavras chave customizados\n"
+
+msgid "\textending current template maps\n"
+msgstr "\texpandindo mapas de modelo atuais\n"
+
+msgid "\toverriding default template maps\n"
+msgstr "\tsobrepondo mapas de modelo padrão\n"
+
+msgid ""
+"\n"
+"\tconfiguration using default keyword template maps\n"
+msgstr ""
+"\n"
+"\tconfiguração usando mapas de modelo de palavras chave padrão\n"
+
+msgid "\tdisabling current template maps\n"
+msgstr "\tdesabilitando mapas de modelo atuais\n"
+
+msgid ""
+"\n"
+"\tconfiguration using current keyword template maps\n"
+msgstr ""
+"\n"
+"\tconfiguração usando mapas de modelo de palavras chave atuais\n"
+
+#, python-format
+msgid ""
+"\n"
+"keywords written to %s:\n"
+msgstr ""
+"\n"
+"palavras chave escritas em %s:\n"
 
 msgid "unhooked all commit hooks\n"
 msgstr "removidos os registros de todos os ganchos de consolidação\n"
 
-#, python-format
-msgid ""
-"\n"
-"\t%s keywords expanded%s\n"
-msgstr ""
+msgid ""
+"\n"
+"\tkeywords expanded\n"
+msgstr ""
+"\n"
+"\tpalavras chave expandidas\n"
 
 #, python-format
 msgid ""
@@ -2916,8 +3033,8 b' msgid ""'
 "    [keyword] configuration patterns.\n"
 "\n"
 "    Useful to prevent inadvertent keyword expansion and to speed up\n"
-"    execution by including only files that are actual candidates\n"
-"    for expansion.\n"
+"    execution by including only files that are actual candidates for\n"
+"    expansion.\n"
 "\n"
 "    See \"hg help keyword\" on how to construct patterns both for\n"
 "    inclusion and exclusion of files.\n"
@@ -2925,11 +3042,12 b' msgid ""'
 "    Use -u/--untracked to list untracked files as well.\n"
 "\n"
 "    With -a/--all and -v/--verbose the codes used to show the status\n"
-"    of files are:\n"
-"    K = keyword expansion candidate\n"
-"    k = keyword expansion candidate (untracked)\n"
-"    I = ignored\n"
-"    i = ignored (untracked)\n"
+"    of files are::\n"
+"\n"
+"      K = keyword expansion candidate\n"
+"      k = keyword expansion candidate (untracked)\n"
+"      I = ignored\n"
+"      i = ignored (untracked)\n"
 "    "
 msgstr ""
 "mostra arquivos configurados para expansão de palavras chave\n"
@@ -2947,11 +3065,12 b' msgstr ""'
 "    Use -u/--untracked para listar também arquivos não rastreados.\n"
 "\n"
 "    Com -a/--all e -v/--verbose os códigos usados para mostrar o\n"
-"    status dos arquivos são:\n"
-"    K = candidato à expansão de palavras chave\n"
-"    k = candidato à expansão de palavras chave (não rastreado)\n"
-"    I = ignorado\n"
-"    i = ignorado (não rastreado)\n"
+"    status dos arquivos são::\n"
+"\n"
+"      K = candidato à expansão de palavras chave\n"
+"      k = candidato à expansão de palavras chave (não rastreado)\n"
+"      I = ignorado\n"
+"      i = ignorado (não rastreado)\n"
 "    "
 
 msgid ""
@@ -3009,19 +3128,19 b' msgid ""'
 "Known patches are represented as patch files in the .hg/patches\n"
 "directory. Applied patches are both patch files and changesets.\n"
 "\n"
-"Common tasks (use \"hg help command\" for more details):\n"
-"\n"
-"prepare repository to work with patches   qinit\n"
-"create new patch                          qnew\n"
-"import existing patch                     qimport\n"
-"\n"
-"print patch series                        qseries\n"
-"print applied patches                     qapplied\n"
-"print name of top applied patch           qtop\n"
-"\n"
-"add known patch to applied stack          qpush\n"
-"remove patch from applied stack           qpop\n"
-"refresh contents of top applied patch     qrefresh\n"
+"Common tasks (use \"hg help command\" for more details)::\n"
+"\n"
+"  prepare repository to work with patches   qinit\n"
+"  create new patch                          qnew\n"
+"  import existing patch                     qimport\n"
+"\n"
+"  print patch series                        qseries\n"
+"  print applied patches                     qapplied\n"
+"  print name of top applied patch           qtop\n"
+"\n"
+"  add known patch to applied stack          qpush\n"
+"  remove patch from applied stack           qpop\n"
+"  refresh contents of top applied patch     qrefresh\n"
 msgstr ""
 "gerencia uma pilha de patches\n"
 "\n"
@@ -3034,19 +3153,19 b' msgstr ""'
 "diretório .hg/patches . Patches aplicados são tanto arquivos de\n"
 "patch como changesets.\n"
 "\n"
-"Tarefas comuns (use \"hg help comando\" para mais detalhes):\n"
-"\n"
-"prepara um repositório para trabalhar com patches  qinit\n"
-"cria um novo patch                                 qnew\n"
-"importa um patch existente                         qimport\n"
-"\n"
-"imprime a série de patches                         qseries\n"
-"imprime patches aplicados                          qapplied\n"
-"imprime o nome do patch aplicado do topo           qtop\n"
-"\n"
-"adiciona um patch conhecido à pilha de aplicados   qpush\n"
-"remove um patch da pilha de aplicados              qpop\n"
-"renova o conteúdo do patch aplicado do topo        qrefresh\n"
+"Tarefas comuns (use \"hg help comando\" para mais detalhes)::\n"
+"\n"
+"  prepara um repositório para trabalhar com patches  qinit\n"
+"  cria um novo patch                                 qnew\n"
+"  importa um patch existente                         qimport\n"
+"\n"
+"  imprime a série de patches                         qseries\n"
+"  imprime patches aplicados                          qapplied\n"
+"  imprime o nome do patch aplicado do topo           qtop\n"
+"\n"
+"  adiciona um patch conhecido à pilha de aplicados   qpush\n"
+"  remove um patch da pilha de aplicados              qpop\n"
+"  renova o conteúdo do patch aplicado do topo        qrefresh\n"
 
 #, python-format
 msgid "%s appears more than once in %s"
@@ -3280,6 +3399,10 b' msgstr "desempilhar removeria uma revis\xc3\xa3o n\xc3\xa3o gerenciada por esta fila de patches"'
 msgid "deletions found between repo revs"
 msgstr "remoções encontradas entre revisões do repositório"
 
+#, python-format
+msgid "popping %s\n"
+msgstr "desempilhando %s\n"
+
 msgid "patch queue now empty\n"
 msgstr "a fila de patches agora está vazia\n"
 
@@ -4145,16 +4268,18 b' msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOME] [PATCH | \xc3\x8dNDICE]"'
 msgid "refresh only files already in the patch and specified files"
 msgstr "renova apenas os arquivos especificados ou que já estão no patch"
 
-msgid "add/update \"From: <current user>\" in patch"
-msgstr "adiciona/atualiza \"From: <usuário atual>\" no patch"
-
-msgid "add/update \"From: <given user>\" in patch"
-msgstr "adiciona/atualiza \"From: <usuário fornecido>\" no patch"
-
-msgid "update \"Date: <current date>\" in patch (if present)"
-msgstr "atualiza \"Date: <data atual>\" no patch (se presente)"
-
-msgid "update \"Date: <given date>\" in patch (if present)"
+msgid "add/update author field in patch with current user"
+msgstr ""
+
+msgid "add/update author field in patch with given user"
+msgstr ""
+
+#, fuzzy
+msgid "add/update date field in patch with current date"
+msgstr "atualiza \"Date: <data fornecida>\" no patch (se presente)"
+
+#, fuzzy
+msgid "add/update date field in patch with given date"
 msgstr "atualiza \"Date: <data fornecida>\" no patch (se presente)"
 
 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
@@ -4235,73 +4360,74 b' msgstr "hg qfinish [-a] [REV]..."'
 msgid ""
 "hooks for sending email notifications at commit/push time\n"
 "\n"
-"Subscriptions can be managed through hgrc. Default mode is to print\n"
-"messages to stdout, for testing and configuring.\n"
-"\n"
-"To use, configure notify extension and enable in hgrc like this:\n"
-"\n"
-"   [extensions]\n"
-"   hgext.notify =\n"
-"\n"
-"   [hooks]\n"
-"   # one email for each incoming changeset\n"
-"   incoming.notify = python:hgext.notify.hook\n"
-"   # batch emails when many changesets incoming at one time\n"
-"   changegroup.notify = python:hgext.notify.hook\n"
-"\n"
-"   [notify]\n"
-"   # config items go in here\n"
-"\n"
-" config items:\n"
-"\n"
-" REQUIRED:\n"
-"   config = /path/to/file # file containing subscriptions\n"
-"\n"
-" OPTIONAL:\n"
-"   test = True            # print messages to stdout for testing\n"
-"   strip = 3              # number of slashes to strip for url paths\n"
-"   domain = example.com   # domain to use if committer missing domain\n"
-"   style = ...            # style file to use when formatting email\n"
-"   template = ...         # template to use when formatting email\n"
-"   incoming = ...         # template to use when run as incoming hook\n"
-"   changegroup = ...      # template when run as changegroup hook\n"
-"   maxdiff = 300          # max lines of diffs to include (0=none, -1=all)\n"
-"   maxsubject = 67        # truncate subject line longer than this\n"
-"   diffstat = True        # add a diffstat before the diff content\n"
-"   sources = serve        # notify if source of incoming changes in this "
+"Subscriptions can be managed through a hgrc file. Default mode is to\n"
+"print messages to stdout, for testing and configuring.\n"
+"\n"
+"To use, configure the notify extension and enable it in hgrc like\n"
+"this::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.notify =\n"
+"\n"
+"  [hooks]\n"
+"  # one email for each incoming changeset\n"
+"  incoming.notify = python:hgext.notify.hook\n"
+"  # batch emails when many changesets incoming at one time\n"
+"  changegroup.notify = python:hgext.notify.hook\n"
+"\n"
+"  [notify]\n"
+"  # config items go here\n"
+"\n"
+"Required configuration items::\n"
+"\n"
+"  config = /path/to/file # file containing subscriptions\n"
+"\n"
+"Optional configuration items::\n"
+"\n"
+"  test = True            # print messages to stdout for testing\n"
+"  strip = 3              # number of slashes to strip for url paths\n"
+"  domain = example.com   # domain to use if committer missing domain\n"
+"  style = ...            # style file to use when formatting email\n"
+"  template = ...         # template to use when formatting email\n"
+"  incoming = ...         # template to use when run as incoming hook\n"
+"  changegroup = ...      # template when run as changegroup hook\n"
+"  maxdiff = 300          # max lines of diffs to include (0=none, -1=all)\n"
+"  maxsubject = 67        # truncate subject line longer than this\n"
+"  diffstat = True        # add a diffstat before the diff content\n"
+"  sources = serve        # notify if source of incoming changes in this "
 "list\n"
-"                          # (serve == ssh or http, push, pull, bundle)\n"
-"   [email]\n"
-"   from = [e-mail]   # email address to send as if none given\n"
-"   [web]\n"
-"   baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
-"\n"
-" notify config file has same format as regular hgrc. it has two\n"
-" sections so you can express subscriptions in whatever way is handier\n"
-" for you.\n"
-"\n"
-"   [usersubs]\n"
-"   # key is subscriber email, value is \",\"-separated list of glob "
-"patterns\n"
-"   user@host = pattern\n"
-"\n"
-"   [reposubs]\n"
-"   # key is glob pattern, value is \",\"-separated list of subscriber "
-"emails\n"
-"   pattern = user@host\n"
-"\n"
-" glob patterns are matched against path to repository root.\n"
-"\n"
-" if you like, you can put notify config file in repository that users\n"
-" can push changes to, they can manage their own subscriptions."
+"                         # (serve == ssh or http, push, pull, bundle)\n"
+"  [email]\n"
+"  from = [e-mail]   # email address to send as if none given\n"
+"  [web]\n"
+"  baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
+"\n"
+"The notify config file has same format as a regular hgrc file. It has\n"
+"two sections so you can express subscriptions in whatever way is\n"
+"handier for you.\n"
+"\n"
+"::\n"
+"\n"
+"  [usersubs]\n"
+"  # key is subscriber email, value is \",\"-separated list of glob patterns\n"
+"  user@host = pattern\n"
+"\n"
+"  [reposubs]\n"
+"  # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
+"  pattern = user@host\n"
+"\n"
+"Glob patterns are matched against path to repository root.\n"
+"\n"
+"If you like, you can put notify config file in repository that users\n"
+"can push changes to, they can manage their own subscriptions.\n"
 msgstr ""
 "gancho para enviar notificações por e-mail em commit/push\n"
 "\n"
-"Assinantes podem ser gerenciados através de hgrc. O modo padrão é\n"
+"Assinantes podem ser gerenciados através do arquivo hgrc. O modo padrão é\n"
 "imprimir as mensagens para stdout, para testes e configuração.\n"
 "\n"
-"Para usar, configure e habilite a extensão notify no hgrc, dessa\n"
-"forma:\n"
+"Para usar, configure e habilite a extensão notify no hgrc da seguinte\n"
+"forma::\n"
 "\n"
 "   [extensions]\n"
 "   hgext.notify =\n"
@@ -4315,51 +4441,52 b' msgstr ""'
 "   [notify]\n"
 "   # ítens de configuração vão aqui\n"
 "\n"
-" itens de configuração:\n"
-"\n"
-" NECESSÁRIOS:\n"
-"   config = /caminho/arquivo # arquivo contendo assinantes\n"
-"\n"
-" OPCIONAIS:\n"
-"   test = True            # imprime mensagens para stdout para teste\n"
-"   strip = 3              # número de barras a remover de URLs\n"
-"   domain = example.com   # domínio a usar se autor não tiver domínio\n"
-"   style = ...            # arquivo de estilo para formatar o e-mail\n"
-"   template = ...         # modelo para formatar o e-mail\n"
-"   incoming = ...         # modelo ao rodar como gancho de entrada\n"
-"   changegroup = ...      # modelo ao rodar como gancho changegroup\n"
-"   maxdiff = 300          # no. máximo de linhas de diff incluídas\n"
-"                          # (0=nenhuma, -1=todas)\n"
-"   maxsubject = 67        # trunca linhas de assunto maiores que isso\n"
-"   diffstat = True        # adiciona um diffstat antes do diff\n"
-"   sources = serve        # notifica se a fonte de mudanças recebidas\n"
-"                          # estiver nessa lista\n"
-"                          # (serve == ssh ou http, push, pull, bundle)\n"
-"   [email]\n"
-"   from = [e-mail]   # endereço de e-mail de envio se não houver\n"
-"   [web]\n"
-"   baseurl = http://hgserver/... # raiz do web site hg para\n"
-"                                 # visualizar consolidações\n"
-"\n"
-" o arquivo de configuração do notify tem o mesmo formato que um\n"
-" hgrc comum. Possui duas seções, com isso você pode exprimir as\n"
-" assinaturas do modo mais conveniente para você.\n"
-"\n"
-"   [usersubs]\n"
-"   # a chave é o e-mail do assinante, o valor é uma lista separada\n"
-"   # por vírgulas de padrões glob\n"
-"   user@host = padrão,padrão\n"
-"\n"
-"   [reposubs]\n"
-"   # a chave é o padrão glob, o valor é uma lista separada por\n"
-"   # vírgulas de e-mails dos assinantes\n"
-"   padrão = user@host\n"
-"\n"
-" padrões glob são casados com o caminho da raiz do repositório.\n"
-"\n"
-" se você quiser, você pode colocar o arquivo de configuração do\n"
-" notify em um repositório com acesso de envio para os usuários,\n"
-" de modo que eles possam gerenciar suas próprias assinaturas."
+"Ítens de configuração necessários::\n"
+"\n"
+"  config = /caminho/arquivo # arquivo contendo assinantes\n"
+"\n"
+"Ítens de configuração opcionais::\n"
+"\n"
+"  test = True            # imprime mensagens para stdout para teste\n"
+"  strip = 3              # número de barras a remover de URLs\n"
+"  domain = example.com   # domínio a usar se autor não tiver domínio\n"
+"  style = ...            # arquivo de estilo para formatar o e-mail\n"
+"  template = ...         # modelo para formatar o e-mail\n"
+"  incoming = ...         # modelo ao rodar como gancho de entrada\n"
+"  changegroup = ...      # modelo ao rodar como gancho changegroup\n"
+"  maxdiff = 300          # no. máximo de linhas de diff incluídas\n"
+"                         # (0=nenhuma, -1=todas)\n"
+"  maxsubject = 67        # trunca linhas de assunto maiores que isso\n"
+"  diffstat = True        # adiciona um diffstat antes do diff\n"
+"  sources = serve        # notifica se a fonte de mudanças recebidas\n"
+"                         # estiver nessa lista\n"
+"                         # (serve == ssh ou http, push, pull, bundle)\n"
+"  [email]\n"
+"  from = [e-mail]   # endereço de e-mail de envio se não houver\n"
+"  [web]\n"
+"  baseurl = http://hgserver/... # raiz do web site hg para\n"
+"                                # visualizar consolidações\n"
+"O arquivo de configuração do notify tem o mesmo formato que um\n"
+"hgrc comum. Possui duas seções, com isso você pode exprimir as\n"
+"assinaturas do modo mais conveniente para você.\n"
+"\n"
+"::\n"
+"\n"
+"  [usersubs]\n"
+"  # a chave é o e-mail do assinante, o valor é uma lista separada\n"
+"  # por vírgulas de padrões glob\n"
+"  user@host = padrão,padrão\n"
+"\n"
+"  [reposubs]\n"
+"  # a chave é o padrão glob, o valor é uma lista separada por\n"
+"  # vírgulas de e-mails dos assinantes\n"
+"  padrão = user@host\n"
+"\n"
+"Padrões glob são casados com o caminho da raiz do repositório.\n"
+"\n"
+"Se você quiser, você pode colocar o arquivo de configuração do\n"
+"notify em um repositório com acesso de envio para os usuários,\n"
+"de modo que eles possam gerenciar suas próprias assinaturas.\n"
 
 #, python-format
 msgid "%s: %d new changesets"
@@ -4400,7 +4527,7 b' msgstr "notify: mudan\xc3\xa7as t\xc3\xaam origem \\"%s\\" - omitindo\\n"'
 msgid ""
 "browse command output with an external pager\n"
 "\n"
-"To set the pager that should be used, set the application variable:\n"
+"To set the pager that should be used, set the application variable::\n"
 "\n"
 "  [pager]\n"
 "  pager = LESS='FSRX' less\n"
@@ -4409,19 +4536,19 b' msgid ""'
 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
 "\n"
 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
-"setting:\n"
+"setting::\n"
 "\n"
 "  [pager]\n"
 "  quiet = True\n"
 "\n"
 "You can disable the pager for certain commands by adding them to the\n"
-"pager.ignore list:\n"
+"pager.ignore list::\n"
 "\n"
 "  [pager]\n"
 "  ignore = version, help, update\n"
 "\n"
 "You can also enable the pager only for certain commands using\n"
-"pager.attend:\n"
+"pager.attend::\n"
 "\n"
 "  [pager]\n"
 "  attend = log\n"
@@ -4433,7 +4560,7 b' msgid ""'
 msgstr ""
 "visualiza a saída do comando com um pager externo\n"
 "\n"
-"Para definir o pager a ser usado, defina a variável de aplicação:\n"
+"Para definir o pager a ser usado, defina a variável de aplicação::\n"
 "\n"
 "  [pager]\n"
 "  pager = LESS='FSRX' less\n"
@@ -4443,19 +4570,19 b' msgstr ""'
 "nenhum pager será usado.\n"
 "\n"
 "Se você notar mensagens de erro \"PIPE QUEBRADO\" (ou\n"
-"\"BROKEN PIPE\"), você pode desabilitá-las definindo:\n"
+"\"BROKEN PIPE\"), você pode desabilitá-las definindo::\n"
 "\n"
 "  [pager]\n"
 "  quiet = True\n"
 "\n"
 "Você pode desabilitar o pager para certos comandos adicionando-os\n"
-"à lista pager.ignore:\n"
+"à lista pager.ignore::\n"
 "\n"
 "  [pager]\n"
 "  ignore = version, help, update\n"
 "\n"
 "Você também pode habilitar o pager para apenas certos comandos\n"
-"usando pager.attend:\n"
+"usando pager.attend::\n"
 "\n"
 "  [pager]\n"
 "  attend = log\n"
@@ -4471,15 +4598,15 b' msgid ""'
 "This extension allows you to use git-style suffixes to refer to the\n"
 "ancestors of a specific revision.\n"
 "\n"
-"For example, if you can refer to a revision as \"foo\", then:\n"
-"\n"
-"- foo^N = Nth parent of foo\n"
+"For example, if you can refer to a revision as \"foo\", then::\n"
+"\n"
+"  foo^N = Nth parent of foo\n"
 "  foo^0 = foo\n"
 "  foo^1 = first parent of foo\n"
 "  foo^2 = second parent of foo\n"
 "  foo^  = foo^1\n"
 "\n"
-"- foo~N = Nth first grandparent of foo\n"
+"  foo~N = Nth first grandparent of foo\n"
 "  foo~0 = foo\n"
 "  foo~1 = foo^1 = foo^ = first parent of foo\n"
 "  foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
@@ -4490,15 +4617,15 b' msgstr ""'
 "aos ancestrais de uma revisão específica.\n"
 "\n"
 "Por exemplo, se você puder se referir a uma revisão com \"foo\",\n"
-"então:\n"
-"\n"
-"- foo^N = N-ésimo pai de foo\n"
+"então::\n"
+"\n"
+"  foo^N = N-ésimo pai de foo\n"
 "  foo^0 = foo\n"
 "  foo^1 = primeiro pai de foo\n"
 "  foo^2 = segundo pai de foo\n"
 "  foo^  = foo^1\n"
 "\n"
-"- foo~N = N-ésimo avô de foo\n"
+"  foo~N = N-ésimo avô de foo\n"
 "  foo~0 = foo\n"
 "  foo~1 = foo^1 = foo^ = primeiro pai de foo\n"
 "  foo~2 = foo^1^1 = foo^^ = primeiro pai do primeiro pai de foo\n"
@@ -4513,11 +4640,9 b' msgid ""'
 "first line of the changeset description as the subject text. The\n"
 "message contains two or three body parts:\n"
 "\n"
-"  The changeset description.\n"
-"\n"
-"  [Optional] The result of running diffstat on the patch.\n"
-"\n"
-"  The patch itself, as generated by \"hg export\".\n"
+"- The changeset description.\n"
+"- [Optional] The result of running diffstat on the patch.\n"
+"- The patch itself, as generated by \"hg export\".\n"
 "\n"
 "Each message refers to the first in the series using the In-Reply-To\n"
 "and References headers, so they will show up as a sequence in threaded\n"
@@ -4528,7 +4653,7 b' msgid ""'
 "you are sending the right changes.\n"
 "\n"
 "To configure other defaults, add a section like this to your hgrc\n"
-"file:\n"
+"file::\n"
 "\n"
 "  [email]\n"
 "  from = My Name <my@email>\n"
@@ -4551,13 +4676,13 b' msgid ""'
 "patchbomb message in a pager or sending the messages directly, it will\n"
 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
 "can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt:\n"
+"files, e.g. with mutt::\n"
 "\n"
 "  % mutt -R -f mbox\n"
 "\n"
-"When you are previewing the patchbomb messages, you can use `formail'\n"
+"When you are previewing the patchbomb messages, you can use ``formail``\n"
 "(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out:\n"
+"package), to send each message out::\n"
 "\n"
 "  % formail -s sendmail -bm -t < mbox\n"
 "\n"
@@ -4567,7 +4692,7 b' msgid ""'
 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
 "that the patchbomb extension can automatically send patchbombs\n"
 "directly from the commandline. See the [email] and [smtp] sections in\n"
-"hgrc(5) for details."
+"hgrc(5) for details.\n"
 msgstr ""
 "comando para enviar changesets como uma série de e-mails de patch\n"
 "\n"
@@ -4579,11 +4704,9 b' msgstr ""'
 "changeset como texto do assunto. A mensagem contém dois ou três\n"
 "corpos:\n"
 "\n"
-"  A descrição do changeset.\n"
-"\n"
-"  [Opcional] O resultado da execução de diffstat no patch.\n"
-"\n"
-"  O patch em si, como gerado por \"hg export\".\n"
+"- A descrição do changeset.\n"
+"- [Opcional] O resultado da execução de diffstat no patch.\n"
+"- O patch em si, como gerado por \"hg export\".\n"
 "\n"
 "Cada mensagem faz referência à primeira da série usando os cabeçalhos\n"
 "In-Reply-To e References, de modo que as mensagens aparecerão como\n"
@@ -4595,7 +4718,7 b' msgstr ""'
 "para que você tenha certeza de enviar as mudanças corretas.\n"
 "\n"
 "Para configurar outros padrões, adicione uma seção como esta em seu\n"
-"arquivo hgrc:\n"
+"arquivo hgrc::\n"
 "\n"
 "  [email]\n"
 "  from = Meu Nome <meu@email>\n"
@@ -4619,13 +4742,13 b' msgstr ""'
 "mensagens como texto ou enviá-las diretamente, o comando irá criar\n"
 "um arquivo de mailbox UNIX com os e-mails de patch. Este arquivo de\n"
 "mailbox pode ser visualizado com qualquer cliente de e-mails que\n"
-"suporte arquivos mbox UNIX, por exemplo o mutt:\n"
+"suporte arquivos mbox UNIX, por exemplo o mutt::\n"
 "\n"
 "  % mutt -R -f mbox\n"
 "\n"
-"Ao rever cada mensagem do patchbomb, você pode usar `formail' (um\n"
+"Ao rever cada mensagem do patchbomb, você pode usar ``formail`` (um\n"
 "utilitário comumente instalado como parte do pacote procmail) para\n"
-"enviar cada mensagem:\n"
+"enviar cada mensagem::\n"
 "\n"
 "  % formail -s sendmail -bm -t < mbox\n"
 "\n"
@@ -4636,7 +4759,7 b' msgstr ""'
 "como preencher a seção [smtp] para que a extensão patchbomb possa\n"
 "automaticamente enviar patchbombs diretamente da linha de comando.\n"
 "Veja as seções [email] e [smtp] na página de manual hgrc(5) para\n"
-"mais detalhes."
+"mais detalhes.\n"
 
 msgid "Please enter a valid value.\n"
 msgstr "Por favor, entre um valor válido.\n"
@@ -4675,23 +4798,24 b' msgid ""'
 "    single email containing a binary Mercurial bundle as an attachment\n"
 "    will be sent.\n"
 "\n"
-"    Examples:\n"
-"\n"
-"    hg email -r 3000          # send patch 3000 only\n"
-"    hg email -r 3000 -r 3001  # send patches 3000 and 3001\n"
-"    hg email -r 3000:3005     # send patches 3000 through 3005\n"
-"    hg email 3000             # send patch 3000 (deprecated)\n"
-"\n"
-"    hg email -o               # send all patches not in default\n"
-"    hg email -o DEST          # send all patches not in DEST\n"
-"    hg email -o -r 3000       # send all ancestors of 3000 not in default\n"
-"    hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST\n"
-"\n"
-"    hg email -b               # send bundle of all patches not in default\n"
-"    hg email -b DEST          # send bundle of all patches not in DEST\n"
-"    hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
+"    Examples::\n"
+"\n"
+"      hg email -r 3000          # send patch 3000 only\n"
+"      hg email -r 3000 -r 3001  # send patches 3000 and 3001\n"
+"      hg email -r 3000:3005     # send patches 3000 through 3005\n"
+"      hg email 3000             # send patch 3000 (deprecated)\n"
+"\n"
+"      hg email -o               # send all patches not in default\n"
+"      hg email -o DEST          # send all patches not in DEST\n"
+"      hg email -o -r 3000       # send all ancestors of 3000 not in default\n"
+"      hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST\n"
+"\n"
+"      hg email -b               # send bundle of all patches not in default\n"
+"      hg email -b DEST          # send bundle of all patches not in DEST\n"
+"      hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
 "default\n"
-"    hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST\n"
+"      hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in "
+"DEST\n"
 "\n"
 "    Before using this command, you will need to enable email in your\n"
 "    hgrc. See the [email] section in hgrc(5) for details.\n"
@@ -4727,28 +4851,28 b' msgstr ""'
 "\n"
 "    Exemplos:\n"
 "\n"
-"    hg email -r 3000          # envia apenas o patch\n"
-"    hg email -r 3000 -r 3001  # envia os patches 3000 e 3001\n"
-"    hg email -r 3000:3005     # envia os patches de 3000 até 3005\n"
-"    hg email 3000             # envia o patch 3000 (obsoleto)\n"
-"\n"
-"    hg email -o               # envia todos os patches não presentes\n"
-"                              # no destino padrão\n"
-"    hg email -o DEST          # envia todos os patches não presentes\n"
-"                              # em DEST\n"
-"    hg email -o -r 3000       # envia todos os ancestrais de 3000 não\n"
-"                              # presentes no destino padrão\n"
-"    hg email -o -r 3000 DEST  # envia todos os ancestrais de 3000 não\n"
-"                              # presentes em DEST\n"
-"\n"
-"    hg email -b               # envia um bundle de todos os patches\n"
-"                              # não presentes no destino padrão\n"
-"    hg email -b DEST          # envia um bundle de todos os patches\n"
-"                              # não presentes em DEST\n"
-"    hg email -b -r 3000       # um bundle de todos os ancestrais de\n"
-"                              # 3000 não presentes no destino padrão\n"
-"    hg email -b -r 3000 DEST  # um bundle de todos os ancestrais de\n"
-"                              # 3000 não presentes em DEST\n"
+"      hg email -r 3000          # envia apenas o patch\n"
+"      hg email -r 3000 -r 3001  # envia os patches 3000 e 3001\n"
+"      hg email -r 3000:3005     # envia os patches de 3000 até 3005\n"
+"      hg email 3000             # envia o patch 3000 (obsoleto)\n"
+"\n"
+"      hg email -o               # envia todos os patches não presentes\n"
+"                                # no destino padrão\n"
+"      hg email -o DEST          # envia todos os patches não presentes\n"
+"                                # em DEST\n"
+"      hg email -o -r 3000       # envia todos os ancestrais de 3000 não\n"
+"                                # presentes no destino padrão\n"
+"      hg email -o -r 3000 DEST  # envia todos os ancestrais de 3000 não\n"
+"                                # presentes em DEST\n"
+"\n"
+"      hg email -b               # envia um bundle de todos os patches\n"
+"                                # não presentes no destino padrão\n"
+"      hg email -b DEST          # envia um bundle de todos os patches\n"
+"                                # não presentes em DEST\n"
+"      hg email -b -r 3000       # um bundle de todos os ancestrais de\n"
+"                                # 3000 não presentes no destino padrão\n"
+"      hg email -b -r 3000 DEST  # um bundle de todos os ancestrais de\n"
+"                                # 3000 não presentes em DEST\n"
 "\n"
 "    Antes de usar este comando, você precisará habilitar e-mail em\n"
 "    seu hgrc. Veja a seção [email] em hgrc(5) para mais detalhes.\n"
@@ -4831,6 +4955,9 b' msgstr "assunto da primeira mensagem (introdu\xc3\xa7\xc3\xa3o ou \xc3\xbanico patch)"'
 msgid "message identifier to reply to"
 msgstr "identificador de mensagem para a qual responder"
 
+msgid "flags to add in subject prefixes"
+msgstr ""
+
 msgid "email addresses of recipients"
 msgstr "endereços de e-mail dos destinatários"
 
@@ -4871,13 +4998,16 b' msgid ""'
 "    and uncommitted changes in an otherwise-clean source tree.\n"
 "\n"
 "    This means that purge will delete:\n"
-"     - Unknown files: files marked with \"?\" by \"hg status\"\n"
-"     - Empty directories: in fact Mercurial ignores directories unless\n"
-"       they contain files under source control management\n"
+"\n"
+"    - Unknown files: files marked with \"?\" by \"hg status\"\n"
+"    - Empty directories: in fact Mercurial ignores directories unless\n"
+"      they contain files under source control management\n"
+"\n"
 "    But it will leave untouched:\n"
-"     - Modified and unmodified tracked files\n"
-"     - Ignored files (unless --all is specified)\n"
-"     - New files added to the repository (with \"hg add\")\n"
+"\n"
+"    - Modified and unmodified tracked files\n"
+"    - Ignored files (unless --all is specified)\n"
+"    - New files added to the repository (with \"hg add\")\n"
 "\n"
 "    If directories are given on the command line, only files in these\n"
 "    directories are considered.\n"
@@ -4895,14 +5025,17 b' msgstr ""'
 "    apenas essas mudanças.\n"
 "\n"
 "    Isto quer dizer que purge irá apagar:\n"
-"     - Arquivos não conhecidos: arquivos marcados com \"?\" em\n"
-"       \"hg status\"\n"
-"     - Diretórios vazios: de fato o Mercurial ignora diretórios a\n"
-"       não ser que eles contenham arquivos versionados\n"
+"\n"
+"    - Arquivos não conhecidos: arquivos marcados com \"?\" em\n"
+"      \"hg status\"\n"
+"    - Diretórios vazios: de fato o Mercurial ignora diretórios a\n"
+"      não ser que eles contenham arquivos versionados\n"
+"\n"
 "    Mas deixará como estão:\n"
-"     - Arquivos versionados, modificados ou não\n"
-"     - Arquivos ignorados (a não ser que --all seja especificado)\n"
-"     - Novos arquivos adicionados ao repositório (com \"hg add\")\n"
+"\n"
+"    - Arquivos versionados, modificados ou não\n"
+"    - Arquivos ignorados (a não ser que --all seja especificado)\n"
+"    - Novos arquivos adicionados ao repositório (com \"hg add\")\n"
 "\n"
 "    Se diretórios forem passados na linha de comando, apenas arquivos\n"
 "    nesses diretórios serão considerados.\n"
@@ -4951,7 +5084,7 b' msgid ""'
 "repository.\n"
 "\n"
 "For more information:\n"
-"http://mercurial.selenic.com/wiki/RebaseProject\n"
+"http://mercurial.selenic.com/wiki/RebaseExtension\n"
 msgstr ""
 "comando para mover conjuntos de revisões para um ancestral diferente\n"
 "\n"
@@ -4959,7 +5092,7 b' msgstr ""'
 "existente do Mercurial.\n"
 "\n"
 "Para mais informações:\n"
-"http://mercurial.selenic.com/wiki/RebaseProject\n"
+"http://mercurial.selenic.com/wiki/RebaseExtension\n"
 
 msgid "first revision, do not change ancestor\n"
 msgstr "primeira revisão, não mude o ancestral\n"
@@ -5181,30 +5314,9 b' msgstr "(&Q) encerra, sem gravar nenhuma mudan\xc3\xa7a"'
 msgid "&?"
 msgstr "&?"
 
-msgid "y"
-msgstr "y"
-
-msgid "?"
-msgstr "?"
-
 msgid "y - record this change"
 msgstr "y - grava esta mudança"
 
-msgid "s"
-msgstr "s"
-
-msgid "f"
-msgstr "f"
-
-msgid "d"
-msgstr "d"
-
-msgid "a"
-msgstr "a"
-
-msgid "q"
-msgstr "q"
-
 msgid "user quit"
 msgstr "usuário encerrou"
 
@@ -5215,6 +5327,9 b' msgstr "examinar mudan\xc3\xa7as em %s?"'
 msgid " and "
 msgstr " e "
 
+msgid "y"
+msgstr "y"
+
 #, python-format
 msgid "record this change to %r?"
 msgstr "gravar esta mudança em %r?"
@@ -5234,19 +5349,19 b' msgid ""'
 "    You will be prompted for whether to record changes to each\n"
 "    modified file, and for files with multiple changes, for each\n"
 "    change to use. For each query, the following responses are\n"
-"    possible:\n"
-"\n"
-"    y - record this change\n"
-"    n - skip this change\n"
-"\n"
-"    s - skip remaining changes to this file\n"
-"    f - record remaining changes to this file\n"
-"\n"
-"    d - done, skip remaining changes and files\n"
-"    a - record all changes to all remaining files\n"
-"    q - quit, recording no changes\n"
-"\n"
-"    ? - display help"
+"    possible::\n"
+"\n"
+"      y - record this change\n"
+"      n - skip this change\n"
+"\n"
+"      s - skip remaining changes to this file\n"
+"      f - record remaining changes to this file\n"
+"\n"
+"      d - done, skip remaining changes and files\n"
+"      a - record all changes to all remaining files\n"
+"      q - quit, recording no changes\n"
+"\n"
+"      ? - display help"
 msgstr ""
 "seleção interativa de alterações para consolidação\n"
 "\n"
@@ -5259,19 +5374,19 b' msgstr ""'
 "    Você poderá selecionar interativamente a gravação de cada\n"
 "    arquivo modificado, além de cada alteração dentro dos arquivos\n"
 "    (no caso de arquivos com mais de uma alteração). Para cada\n"
-"    consulta, as seguintes respostas são possíveis:\n"
-"\n"
-"    y - grava essa alteração\n"
-"    n - omite a alteração\n"
-"\n"
-"    s - omite as alterações restantes desse arquivo\n"
-"    f - grava as alterações restantes desse arquivo\n"
-"\n"
-"    d - omite alterações e arquivos restantes\n"
-"    a - grava todas as alterações em todos os arquivos restantes\n"
-"    q - aborta, sem gravar qualquer alteração\n"
-"\n"
-"    ? - exibe o texto de ajuda"
+"    consulta, as seguintes respostas são possíveis::\n"
+"\n"
+"      y - grava essa alteração\n"
+"      n - omite a alteração\n"
+"\n"
+"      s - omite as alterações restantes desse arquivo\n"
+"      f - grava as alterações restantes desse arquivo\n"
+"\n"
+"      d - omite alterações e arquivos restantes\n"
+"      a - grava todas as alterações em todos os arquivos restantes\n"
+"      q - aborta, sem gravar qualquer alteração\n"
+"\n"
+"      ? - exibe o texto de ajuda"
 
 msgid "'mq' extension not loaded"
 msgstr "extensão 'mq' não carregada"
@@ -5401,9 +5516,9 b' msgid ""'
 "\n"
 "    Selected changesets will be applied on top of the current working\n"
 "    directory with the log of the original changeset. If --log is\n"
-"    specified, log messages will have a comment appended of the form:\n"
-"\n"
-"    (transplanted from CHANGESETHASH)\n"
+"    specified, log messages will have a comment appended of the form::\n"
+"\n"
+"      (transplanted from CHANGESETHASH)\n"
 "\n"
 "    You can rewrite the changelog message with the --filter option.\n"
 "    Its argument will be invoked with the current changelog message as\n"
@@ -5438,9 +5553,9 b' msgstr ""'
 "    Os changesets selecionados serão aplicados sobre o diretório de\n"
 "    trabalho atual com o log do changeset original. Se --log for\n"
 "    especificado, mensagens de log terão anexado um comentário da\n"
-"    forma:\n"
-"\n"
-"    (transplanted from CHANGESETHASH)\n"
+"    forma::\n"
+"\n"
+"      (transplanted from CHANGESETHASH)\n"
 "\n"
 "    Você pode reescrever a mensagem de changelog com a opção\n"
 "    --filter . Seu argumento será chamado com a mensagem atual de\n"
@@ -5530,19 +5645,22 b' msgid ""'
 "operation.\n"
 "\n"
 "This extension is useful for:\n"
-" * Japanese Windows users using shift_jis encoding.\n"
-" * Chinese Windows users using big5 encoding.\n"
-" * All users who use a repository with one of problematic encodings on\n"
-"   case-insensitive file system.\n"
+"\n"
+"- Japanese Windows users using shift_jis encoding.\n"
+"- Chinese Windows users using big5 encoding.\n"
+"- All users who use a repository with one of problematic encodings on\n"
+"  case-insensitive file system.\n"
 "\n"
 "This extension is not needed for:\n"
-" * Any user who use only ASCII chars in path.\n"
-" * Any user who do not use any of problematic encodings.\n"
+"\n"
+"- Any user who use only ASCII chars in path.\n"
+"- Any user who do not use any of problematic encodings.\n"
 "\n"
 "Note that there are some limitations on using this extension:\n"
-" * You should use single encoding in one repository.\n"
-" * You should set same encoding for the repository by locale or\n"
-"   HGENCODING.\n"
+"\n"
+"- You should use single encoding in one repository.\n"
+"- You should set same encoding for the repository by locale or\n"
+"  HGENCODING.\n"
 "\n"
 "Path encoding conversion are done between Unicode and\n"
 "encoding.encoding which is decided by Mercurial from current locale\n"
@@ -5559,19 +5677,23 b' msgstr ""'
 "converter em strings Unicode antes das operações de caminho.\n"
 "\n"
 "Esta extensão é útil para:\n"
-" * usuários do Windows em japonês usando codificação shift_jis.\n"
-" * usuários do Windows em chinês usando codificação big5.\n"
-" * Qualquer usuário que usam um repositório com codificação\n"
-"   problemática em sistemas de arquivo insensíveis a\n"
-"   maiúsculas / minúsculas.\n"
+"\n"
+"- usuários do Windows em japonês usando codificação shift_jis.\n"
+"- usuários do Windows em chinês usando codificação big5.\n"
+"- Qualquer usuário que usam um repositório com codificação\n"
+"  problemática em sistemas de arquivo insensíveis a\n"
+"  maiúsculas / minúsculas.\n"
 "\n"
 "Esta extensão não é necessária para:\n"
-" * Qualquer usuário que use apenas caracteres ASCII em caminhos.\n"
-" * Qualquer usuário que não use uma codificação problemática.\n"
+"\n"
+"- Qualquer usuário que use apenas caracteres ASCII em caminhos.\n"
+"- Qualquer usuário que não use uma codificação problemática.\n"
 "\n"
 "Note que há algumas limitações no uso desta extensão:\n"
-" * Você deve usar uma única codificação em um repositório.\n"
-" * Você deve definir a mesma codificação com o locale ou HGENCODING.\n"
+"\n"
+"- Você deve usar uma única codificação em um repositório.\n"
+"- Você deve definir a mesma codificação para o repositório com o\n"
+"  locale ou HGENCODING.\n"
 "\n"
 "Conversões de codificação de caminhos são feitas entre Unicode e\n"
 "encoding.encoding que é decidida pelo Mercurial a partir de\n"
@@ -5591,59 +5713,59 b' msgstr "[win32mbcs] ativado com codifica\xc3\xa7\xc3\xa3o: %s\\n"'
 msgid ""
 "perform automatic newline conversion\n"
 "\n"
-"To perform automatic newline conversion, use:\n"
-"\n"
-"[extensions]\n"
-"hgext.win32text =\n"
-"[encode]\n"
-"** = cleverencode:\n"
-"# or ** = macencode:\n"
-"\n"
-"[decode]\n"
-"** = cleverdecode:\n"
-"# or ** = macdecode:\n"
+"To perform automatic newline conversion, use::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.win32text =\n"
+"  [encode]\n"
+"  ** = cleverencode:\n"
+"  # or ** = macencode:\n"
+"\n"
+"  [decode]\n"
+"  ** = cleverdecode:\n"
+"  # or ** = macdecode:\n"
 "\n"
 "If not doing conversion, to make sure you do not commit CRLF/CR by "
-"accident:\n"
-"\n"
-"[hooks]\n"
-"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
+"accident::\n"
+"\n"
+"  [hooks]\n"
+"  pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
+"  # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
 "\n"
 "To do the same check on a server to prevent CRLF/CR from being\n"
-"pushed or pulled:\n"
-"\n"
-"[hooks]\n"
-"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
+"pushed or pulled::\n"
+"\n"
+"  [hooks]\n"
+"  pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
+"  # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
 msgstr ""
 "faz conversão automática de tipo de quebras de linha\n"
 "\n"
-"Para fazer conversão automática de quebras de linha, use:\n"
-"\n"
-"[extensions]\n"
-"hgext.win32text =\n"
-"[encode]\n"
-"** = cleverencode:\n"
-"# or ** = macencode:\n"
-"\n"
-"[decode]\n"
-"** = cleverdecode:\n"
-"# or ** = macdecode:\n"
+"Para fazer conversão automática de quebras de linha, use::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.win32text =\n"
+"  [encode]\n"
+"  ** = cleverencode:\n"
+"  # or ** = macencode:\n"
+"\n"
+"  [decode]\n"
+"  ** = cleverdecode:\n"
+"  # or ** = macdecode:\n"
 "\n"
 "Se a conversão não estiver sendo feita, para garantir que você não\n"
-"consolide CRLF/CR acidentalmente:\n"
-"\n"
-"[hooks]\n"
-"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
+"consolide CRLF/CR acidentalmente::\n"
+"\n"
+"  [hooks]\n"
+"  pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
+"  # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
 "\n"
 "Para fazer a mesma verificação em um servidor para impedir que\n"
-"CRLF/CR sejam enviados ou trazidos:\n"
-"\n"
-"[hooks]\n"
-"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
+"CRLF/CR sejam enviados ou trazidos::\n"
+"\n"
+"  [hooks]\n"
+"  pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
+"  # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
 
 #, python-format
 msgid ""
@@ -5710,15 +5832,15 b' msgid ""'
 "without knowing their actual IP address.\n"
 "\n"
 "To allow other people to discover your repository using run \"hg serve\"\n"
-"in your repository.\n"
-"\n"
-" $ cd test\n"
-" $ hg serve\n"
-"\n"
-"You can discover zeroconf enabled repositories by running \"hg paths\".\n"
-"\n"
-" $ hg paths\n"
-" zc-test = http://example.com:8000/test\n"
+"in your repository::\n"
+"\n"
+"  $ cd test\n"
+"  $ hg serve\n"
+"\n"
+"You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
+"\n"
+"  $ hg paths\n"
+"  zc-test = http://example.com:8000/test\n"
 msgstr ""
 "descobre e anuncia repositórios na rede local\n"
 "\n"
@@ -5727,16 +5849,16 b' msgstr ""'
 "ser descobertos sem o conhecimento de seus respectivos endereços IP.\n"
 "\n"
 "Para permitir que outras pessoas encontrem seu repositório execute\n"
-"\"hg serve\" em seu repositório.\n"
-"\n"
-" $ cd test\n"
-" $ hg serve\n"
+"\"hg serve\" em seu repositório::\n"
+"\n"
+"  $ cd test\n"
+"  $ hg serve\n"
 "\n"
 "Você pode encontrar repositórios com zeroconf habilitado executando\n"
-"\"hg paths\".\n"
-"\n"
-" $ hg paths\n"
-" zc-test = http://example.com:8000/test\n"
+"\"hg paths\"::\n"
+"\n"
+"  $ hg paths\n"
+"  zc-test = http://example.com:8000/test\n"
 
 msgid "archive prefix contains illegal components"
 msgstr "prefixo de arquivo contém componentes ilegais"
@@ -6034,11 +6156,11 b' msgid ""'
 "    commit.\n"
 "\n"
 "    Use the -s/--similarity option to detect renamed files. With a\n"
-"    parameter > 0, this compares every removed file with every added\n"
-"    file and records those similar enough as renames. This option\n"
-"    takes a percentage between 0 (disabled) and 100 (files must be\n"
-"    identical) as its parameter. Detecting renamed files this way can\n"
-"    be expensive.\n"
+"    parameter greater than 0, this compares every removed file with\n"
+"    every added file and records those similar enough as renames. This\n"
+"    option takes a percentage between 0 (disabled) and 100 (files must\n"
+"    be identical) as its parameter. Detecting renamed files this way\n"
+"    can be expensive.\n"
 "    "
 msgstr ""
 "adiciona arquivos novos e remove arquivos faltando\n"
@@ -6051,7 +6173,7 b' msgstr ""'
 "    próxima consolidação.\n"
 "\n"
 "    Use a opção -s/--similarity para detectar arquivos renomeados.\n"
-"    Com um parâmetro > 0, compara cada arquivo removido com cada\n"
+"    Com um parâmetro maior do que 0, compara cada arquivo removido com cada\n"
 "    arquivo adicionado e grava como renomeações aqueles semelhantes o\n"
 "    bastante. Esta opção usa uma porcentagem entre 0 (desabilitada)\n"
 "    e 100 (arquivos devem ser idênticos) como parâmetro. Detectar\n"
@@ -6110,14 +6232,14 b' msgid ""'
 "    directory; use -r/--rev to specify a different revision.\n"
 "\n"
 "    To specify the type of archive to create, use -t/--type. Valid\n"
-"    types are:\n"
-"\n"
-"    \"files\" (default): a directory full of files\n"
-"    \"tar\": tar archive, uncompressed\n"
-"    \"tbz2\": tar archive, compressed using bzip2\n"
-"    \"tgz\": tar archive, compressed using gzip\n"
-"    \"uzip\": zip archive, uncompressed\n"
-"    \"zip\": zip archive, compressed using deflate\n"
+"    types are::\n"
+"\n"
+"      \"files\" (default): a directory full of files\n"
+"      \"tar\": tar archive, uncompressed\n"
+"      \"tbz2\": tar archive, compressed using bzip2\n"
+"      \"tgz\": tar archive, compressed using gzip\n"
+"      \"uzip\": zip archive, uncompressed\n"
+"      \"zip\": zip archive, compressed using deflate\n"
 "\n"
 "    The exact name of the destination archive or directory is given\n"
 "    using a format string; see 'hg help export' for details.\n"
@@ -6134,14 +6256,14 b' msgstr ""'
 "    -r/--rev para especificar uma outra revisão.\n"
 "\n"
 "    Para especificar o tipo de pacote a ser criado, use -t/--type.\n"
-"    Tipos válidos são:\n"
-"\n"
-"    \"files\" (padrão): um diretório cheio de arquivos\n"
-"    \"tar\": pacote tar, não comprimido\n"
-"    \"tbz2\": pacote tar, comprimido com bzip2\n"
-"    \"tgz\": pacote tar, comprimido com gzip\n"
-"    \"uzip\": pacote zip, não comprimido\n"
-"    \"zip\": pacote zip, comprimido com deflate\n"
+"    Tipos válidos são::\n"
+"\n"
+"      \"files\" (padrão): um diretório cheio de arquivos\n"
+"      \"tar\": pacote tar, não comprimido\n"
+"      \"tbz2\": pacote tar, comprimido com bzip2\n"
+"      \"tgz\": pacote tar, comprimido com gzip\n"
+"      \"uzip\": pacote zip, não comprimido\n"
+"      \"zip\": pacote zip, comprimido com deflate\n"
 "\n"
 "    O nome exato do pacote de destino ou diretório é dado por uma\n"
 "    string de formatação; veja 'hg help export' para detalhes.\n"
@@ -6324,8 +6446,8 b' msgid "Changeset %d:%s: %s\\n"'
 msgstr "Changeset %d:%s: %s\n"
 
 #, python-format
-msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
-msgstr "Testando o changeset %s:%s (%s changesets restando, ~%s testes)\n"
+msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
+msgstr "Testando o changeset %d:%s (%d changesets restando, ~%d testes)\n"
 
 msgid ""
 "set or show the current branch name\n"
@@ -6468,11 +6590,11 b' msgid ""'
 "\n"
 "    Output may be to a file, in which case the name of the file is\n"
 "    given using a format string. The formatting rules are the same as\n"
-"    for the export command, with the following additions:\n"
-"\n"
-"    %s   basename of file being printed\n"
-"    %d   dirname of file being printed, or '.' if in repository root\n"
-"    %p   root-relative path name of file being printed\n"
+"    for the export command, with the following additions::\n"
+"\n"
+"      %s   basename of file being printed\n"
+"      %d   dirname of file being printed, or '.' if in repository root\n"
+"      %p   root-relative path name of file being printed\n"
 "    "
 msgstr ""
 "mostra o conteúdo de um arquivo na revisão atual ou pedida\n"
@@ -6483,12 +6605,12 b' msgstr ""'
 "\n"
 "    A saída pode ser para um arquivo, e nesse caso o nome do arquivo é\n"
 "    dado através de uma string de formatação.As regras de formatação\n"
-"    são as mesmas que as do comando export, com as seguintes adições:\n"
-"\n"
-"    %s   nome base do arquivo impresso\n"
-"    %d   diretório do arquivo impresso, ou '.' se no raiz do\n"
-"         repositório\n"
-"    %p   caminho do arquivo impresso relativo à raiz\n"
+"    são as mesmas que as do comando export, com as seguintes adições::\n"
+"\n"
+"      %s   nome base do arquivo impresso\n"
+"      %d   diretório do arquivo impresso, ou '.' se no raiz do\n"
+"           repositório\n"
+"      %p   caminho do arquivo impresso relativo à raiz\n"
 "    "
 
 msgid ""
@@ -6526,7 +6648,7 b' msgid ""'
 "    avoid hardlinking.\n"
 "\n"
 "    In some cases, you can clone repositories and checked out files\n"
-"    using full hardlinks with\n"
+"    using full hardlinks with ::\n"
 "\n"
 "      $ cp -al REPO REPOCLONE\n"
 "\n"
@@ -6536,7 +6658,6 b' msgid ""'
 "    breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
 "    this is not compatible with certain extensions that place their\n"
 "    metadata under the .hg directory, such as mq.\n"
-"\n"
 "    "
 msgstr ""
 "cria uma cópia de um repositório existente\n"
@@ -6577,7 +6698,7 b' msgstr ""'
 "    hardlinks.\n"
 "\n"
 "    Em alguns casos, você pode clonar repositórios e arquivos da\n"
-"    cópia de trabalho usando hardlinks completos com\n"
+"    cópia de trabalho usando hardlinks completos com ::\n"
 "\n"
 "      $ cp -al REPO REPOCLONE\n"
 "\n"
@@ -6588,7 +6709,6 b' msgstr ""'
 "    utilitários do kernel Linux fazem isso). Além disso, esse modo de\n"
 "    criar um clone não é compatível com certas extensões que colocam\n"
 "    seus metadados sob o diretório hg, como a mq.\n"
-"\n"
 "    "
 
 msgid ""
@@ -6931,16 +7051,16 b' msgid ""'
 "    first parent only.\n"
 "\n"
 "    Output may be to a file, in which case the name of the file is\n"
-"    given using a format string. The formatting rules are as follows:\n"
-"\n"
-"    %%   literal \"%\" character\n"
-"    %H   changeset hash (40 bytes of hexadecimal)\n"
-"    %N   number of patches being generated\n"
-"    %R   changeset revision number\n"
-"    %b   basename of the exporting repository\n"
-"    %h   short-form changeset hash (12 bytes of hexadecimal)\n"
-"    %n   zero-padded sequence number, starting at 1\n"
-"    %r   zero-padded changeset revision number\n"
+"    given using a format string. The formatting rules are as follows::\n"
+"\n"
+"      %%   literal \"%\" character\n"
+"      %H   changeset hash (40 bytes of hexadecimal)\n"
+"      %N   number of patches being generated\n"
+"      %R   changeset revision number\n"
+"      %b   basename of the exporting repository\n"
+"      %h   short-form changeset hash (12 bytes of hexadecimal)\n"
+"      %n   zero-padded sequence number, starting at 1\n"
+"      %r   zero-padded changeset revision number\n"
 "\n"
 "    Without the -a/--text option, export will avoid generating diffs\n"
 "    of files it detects as binary. With -a, export will generate a\n"
@@ -6967,16 +7087,16 b' msgstr ""'
 "\n"
 "    A saída pode ser gerada em um arquivo, e nesse caso o nome do\n"
 "    arquivo é dado usando uma string de formato. As regras de\n"
-"    formatação são como segue:\n"
-"\n"
-"    %%   caractere \"%\" literal\n"
-"    %H   hash do changeset (40 bytes hexadecimais)\n"
-"    %N   número de patches gerados\n"
-"    %R   número de revisão do changeset\n"
-"    %b   nome base do repositório onde o export é realizado\n"
-"    %h   hash de forma curta do changeset (12 bytes hexadecimais)\n"
-"    %n   número seqüencial completado com zeros, começando em 1\n"
-"    %r   número de revisão do changeset completado com zeros\n"
+"    formatação são como segue::\n"
+"\n"
+"      %%   caractere \"%\" literal\n"
+"      %H   hash do changeset (40 bytes hexadecimais)\n"
+"      %N   número de patches gerados\n"
+"      %R   número de revisão do changeset\n"
+"      %b   nome base do repositório onde o export é realizado\n"
+"      %h   hash de forma curta do changeset (12 bytes hexadecimais)\n"
+"      %n   número seqüencial completado com zeros, começando em 1\n"
+"      %r   número de revisão do changeset completado com zeros\n"
 "\n"
 "    Sem a opção -a/--text, export evitará gerar diffs de arquivos\n"
 "    detectados como binários. Com -a, export gerará um diff de\n"
@@ -7073,47 +7193,50 b' msgid ""'
 "\n"
 "    With no arguments, show all repository head changesets.\n"
 "\n"
-"    Repository \"heads\" are changesets that don't have child\n"
-"    changesets. They are where development generally takes place and\n"
-"    are the usual targets for update and merge operations.\n"
+"    Repository \"heads\" are changesets with no child changesets. They are\n"
+"    where development generally takes place and are the usual targets\n"
+"    for update and merge operations.\n"
 "\n"
 "    If one or more REV is given, the \"branch heads\" will be shown for\n"
-"    the named branch associated with that revision. The name of the\n"
-"    branch is called the revision's branch tag.\n"
-"\n"
-"    Branch heads are revisions on a given named branch that do not have\n"
-"    any descendants on the same branch. A branch head could be a true head\n"
-"    or it could be the last changeset on a branch before a new branch\n"
-"    was created. If none of the branch heads are true heads, the branch\n"
-"    is considered inactive. If -c/--closed is specified, also show branch\n"
-"    heads marked closed (see hg commit --close-branch).\n"
-"\n"
-"    If STARTREV is specified only those heads (or branch heads) that\n"
-"    are descendants of STARTREV will be displayed.\n"
+"    the named branch associated with the specified changeset(s).\n"
+"\n"
+"    Branch heads are changesets on a named branch with no descendants on\n"
+"    the same branch. A branch head could be a \"true\" (repository) head,\n"
+"    or it could be the last changeset on that branch before it was\n"
+"    merged into another branch, or it could be the last changeset on the\n"
+"    branch before a new branch was created. If none of the branch heads\n"
+"    are true heads, the branch is considered inactive.\n"
+"\n"
+"    If -c/--closed is specified, also show branch heads marked closed\n"
+"    (see hg commit --close-branch).\n"
+"\n"
+"    If STARTREV is specified, only those heads that are descendants of\n"
+"    STARTREV will be displayed.\n"
 "    "
 msgstr ""
 "mostra as cabeças atuais do repositório ou cabeças de ramo\n"
 "\n"
 "    Sem argumentos, mostra todas as cabeças do repositório.\n"
 "\n"
-"    \"Cabeças\" do repositório são changesets que não têm nenhum\n"
-"    changeset filho. Elas são onde o desenvolvimento geralmente\n"
+"    \"Cabeças\" do repositório são revisões que não têm nenhuma\n"
+"    revisão filha. Elas são onde o desenvolvimento geralmente\n"
 "    acontece e são os alvos costumeiros para operações update e\n"
 "    merge.\n"
 "\n"
 "    Se um ou mais argumentos REV forem dados, as \"cabeças de ramo\"\n"
-"    serão mostradas para os ramos nomeados associados a tais\n"
-"    revisões. O nome do ramo é chamado de etiqueta de ramo da\n"
-"    revisão.\n"
+"    serão mostradas para os ramos nomeados associados às revisões\n"
+"    especificadas.\n"
 "\n"
 "    Cabeças de ramo são revisões em um determinado ramo nomeado que\n"
 "    não têm nenhum descendente nesse mesmo ramo. Uma cabeça de\n"
-"    ramo pode ser uma cabeça verdadeira ou pode ser o último\n"
-"    changeset em um ramo antes que um novo ramo nomeado fosse criado.\n"
-"    Se nenhuma das cabeças de ramo forem cabeças verdadeiras, o ramo\n"
-"    é considerado inativo. Se -c/--closed for especificado, mostra\n"
-"    também cabeças de ramos marcados como fechados (veja hg commit\n"
-"    --close-branch).\n"
+"    ramo pode ser uma cabeça \"verdadeira\" (do repositório), a\n"
+"    última revisão nesse ramo antes de uma mesclagem com outro ramo,\n"
+"    ou a última revisão nesse ramo antes de um novo ramo ter sido\n"
+"    criado. Se nenhuma das cabeças de ramo for uma cabeça verdadeira,\n"
+"    o ramo é considerado inativo.\n"
+"\n"
+"    Se -c/--closed for especificado, mostra também cabeças de ramos\n"
+"    marcados como fechados (veja hg commit --close-branch).\n"
 "\n"
 "    Se REVINICIAL for especificada, serão mostradas apenas cabeças\n"
 "    (ou cabeças de ramo) descendentes de REVINICIAL.\n"
@@ -7198,8 +7321,12 b' msgid "no help text available"'
 msgstr "texto de ajuda não disponível"
 
 #, python-format
-msgid "%s extension - %s\n"
-msgstr "extensão %s - %s\n"
+msgid ""
+"%s extension - %s\n"
+"\n"
+msgstr ""
+"extensão %s - %s\n"
+"\n"
 
 msgid "Mercurial Distributed SCM\n"
 msgstr "Sistema de controle de versão distribuído Mercurial\n"
@@ -7767,15 +7894,15 b' msgid ""'
 "\n"
 "    The following table details the behavior of remove for different\n"
 "    file states (columns) and option combinations (rows). The file\n"
-"    states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
-"    (as reported by hg status). The actions are Warn, Remove (from\n"
-"    branch) and Delete (from disk).\n"
-"\n"
-"           A  C  M  !\n"
-"    none   W  RD W  R\n"
-"    -f     R  RD RD R\n"
-"    -A     W  W  W  R\n"
-"    -Af    R  R  R  R\n"
+"    states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
+"    reported by hg status). The actions are Warn, Remove (from branch)\n"
+"    and Delete (from disk)::\n"
+"\n"
+"             A  C  M  !\n"
+"      none   W  RD W  R\n"
+"      -f     R  RD RD R\n"
+"      -A     W  W  W  R\n"
+"      -Af    R  R  R  R\n"
 "\n"
 "    This command schedules the files to be removed at the next commit.\n"
 "    To undo a remove before that, see hg revert.\n"
@@ -7797,13 +7924,13 b' msgstr ""'
 "    (linhas). Os estados dos arquivos são: adicionados [A],\n"
 "    limpos [C], modificados [M] ou faltando [!] (conforme informado\n"
 "    por hg status). As ações são W (aviso), R (remove do ramo) e D\n"
-"    (remove do diretório de trabalho).\n"
-"\n"
-"           A  C  M  !\n"
-"    nada   W  RD W  R\n"
-"    -f     R  RD RD R\n"
-"    -A     W  W  W  R\n"
-"    -Af    R  R  R  R\n"
+"    (remove do diretório de trabalho)::\n"
+"\n"
+"             A  C  M  !\n"
+"      nada   W  RD W  R\n"
+"      -f     R  RD RD R\n"
+"      -A     W  W  W  R\n"
+"      -Af    R  R  R  R\n"
 "\n"
 "    Este comando agenda os arquivos para serem removidos na próxima\n"
 "    consolidação. Para desfazer uma remoção antes disso, veja\n"
@@ -7871,9 +7998,10 b' msgid ""'
 "    indicating whether or not files are resolved. All files must be\n"
 "    marked as resolved before a commit is permitted.\n"
 "\n"
-"    The codes used to show the status of files are:\n"
-"    U = unresolved\n"
-"    R = resolved\n"
+"    The codes used to show the status of files are::\n"
+"\n"
+"      U = unresolved\n"
+"      R = resolved\n"
 "    "
 msgstr ""
 "tenta mesclar novamente arquivos em uma mesclagem ou atualização\n"
@@ -7893,9 +8021,10 b' msgstr ""'
 "    arquivos devem ser marcados como resolvidos para que a\n"
 "    consolidação seja aceita.\n"
 "\n"
-"    Os códigos usados para mostrar o estado dos arquivos são:\n"
-"    U = não resolvido\n"
-"    R = resolvido\n"
+"    Os códigos usados para mostrar o estado dos arquivos são::\n"
+"\n"
+"      U = não resolvido\n"
+"      R = resolvido\n"
 "    "
 
 msgid "too many options specified"
@@ -8023,7 +8152,7 b' msgid ""'
 "    Transactions are used to encapsulate the effects of all commands\n"
 "    that create new changesets or propagate existing changesets into a\n"
 "    repository. For example, the following commands are transactional,\n"
-"    and their effects can be rolled back:\n"
+"    and their effects can be rolled back::\n"
 "\n"
 "      commit\n"
 "      import\n"
@@ -8050,7 +8179,7 b' msgstr ""'
 "    Transações são usadas para encapsular os efeitos de todos os comandos\n"
 "    que criam novos changesets ou propagam changesets existentes para o\n"
 "    repositório. Por exemplo, os seguintes comandos são transacionais,\n"
-"    e seus efeitos podem ser revertidos com rollback:\n"
+"    e seus efeitos podem ser revertidos com rollback::\n"
 "\n"
 "      commit\n"
 "      import\n"
@@ -8122,15 +8251,16 b' msgid ""'
 "    If two revisions are given, the differences between them are\n"
 "    shown.\n"
 "\n"
-"    The codes used to show the status of files are:\n"
-"    M = modified\n"
-"    A = added\n"
-"    R = removed\n"
-"    C = clean\n"
-"    ! = missing (deleted by non-hg command, but still tracked)\n"
-"    ? = not tracked\n"
-"    I = ignored\n"
-"      = origin of the previous file listed as A (added)\n"
+"    The codes used to show the status of files are::\n"
+"\n"
+"      M = modified\n"
+"      A = added\n"
+"      R = removed\n"
+"      C = clean\n"
+"      ! = missing (deleted by non-hg command, but still tracked)\n"
+"      ? = not tracked\n"
+"      I = ignored\n"
+"        = origin of the previous file listed as A (added)\n"
 "    "
 msgstr ""
 "exibe arquivos alterados no diretório de trabalho\n"
@@ -8156,16 +8286,17 b' msgstr ""'
 "    Se uma revisão for dada, será usada como revisão base. Se duas\n"
 "    revisões forem dadas, serão mostradas as diferenças entre elas.\n"
 "\n"
-"    Os códigos usados para exibir o estado dos arquivos são:\n"
-"    M = modificado\n"
-"    A = adicionado\n"
-"    R = removido\n"
-"    C = limpo (sem modificações)\n"
-"    ! = faltando (removido por um outro programa, mas ainda\n"
-"        rastreado pelo Mercurial)\n"
-"    ? = não rastreado\n"
-"    I = ignorado\n"
-"      = origem do arquivo anterior listado como A (adicionado)\n"
+"    Os códigos usados para exibir o estado dos arquivos são::\n"
+"\n"
+"      M = modificado\n"
+"      A = adicionado\n"
+"      R = removido\n"
+"      C = limpo (sem modificações)\n"
+"      ! = faltando (removido por um outro programa, mas ainda\n"
+"          rastreado pelo Mercurial)\n"
+"      ? = não rastreado\n"
+"      I = ignorado\n"
+"        = origem do arquivo anterior listado como A (adicionado)\n"
 "    "
 
 msgid ""
@@ -8355,6 +8486,9 b' msgstr ""'
 "    -d/--date.\n"
 "    "
 
+msgid "cannot specify both -c/--check and -C/--clean"
+msgstr "não se pode especificar ao mesmo tempo -c/--check e -C/--clean"
+
 msgid "uncommitted local changes"
 msgstr "alterações locais pendentes"
 
@@ -9334,9 +9468,6 b' msgstr "&Local"'
 msgid "&Other"
 msgstr "&Outra"
 
-msgid "l"
-msgstr "l"
-
 #, python-format
 msgid "merging %s and %s to %s\n"
 msgstr "mesclando %s e %s para %s\n"
@@ -9366,9 +9497,6 b' msgstr "(&N) n\xc3\xa3o"'
 msgid "&Yes"
 msgstr "(&Y) sim"
 
-msgid "n"
-msgstr "n"
-
 #, python-format
 msgid "merging %s failed!\n"
 msgstr "mesclagem de %s falhou!\n"
@@ -9389,27 +9517,27 b' msgid ""'
 "    implement hooks.\n"
 "\n"
 "    Extensions are not loaded by default for a variety of reasons:\n"
-"    they can increase startup overhead; they may be meant for\n"
-"    advanced usage only; they may provide potentially dangerous\n"
-"    abilities (such as letting you destroy or modify history); they\n"
-"    might not be ready for prime time; or they may alter some\n"
-"    usual behaviors of stock Mercurial. It is thus up to the user to\n"
-"    activate extensions as needed.\n"
-"\n"
-"    To enable the \"foo\" extension, either shipped with Mercurial\n"
-"    or in the Python search path, create an entry for it in your\n"
-"    hgrc, like this:\n"
+"    they can increase startup overhead; they may be meant for advanced\n"
+"    usage only; they may provide potentially dangerous abilities (such\n"
+"    as letting you destroy or modify history); they might not be ready\n"
+"    for prime time; or they may alter some usual behaviors of stock\n"
+"    Mercurial. It is thus up to the user to activate extensions as\n"
+"    needed.\n"
+"\n"
+"    To enable the \"foo\" extension, either shipped with Mercurial or in\n"
+"    the Python search path, create an entry for it in your hgrc, like\n"
+"    this::\n"
 "\n"
 "      [extensions]\n"
 "      foo =\n"
 "\n"
-"    You may also specify the full path to an extension:\n"
+"    You may also specify the full path to an extension::\n"
 "\n"
 "      [extensions]\n"
 "      myfeature = ~/.hgext/myfeature.py\n"
 "\n"
 "    To explicitly disable an extension enabled in an hgrc of broader\n"
-"    scope, prepend its path with !:\n"
+"    scope, prepend its path with !::\n"
 "\n"
 "      [extensions]\n"
 "      # disabling extension bar residing in /path/to/extension/bar.py\n"
@@ -9434,19 +9562,19 b' msgstr ""'
 "\n"
 "    Para habilitar a extensão \"foo\", tanto se for distribuída com\n"
 "    o Mercurial como estiver no caminho de busca do Python, crie uma\n"
-"    entrada para ela em seu hgrc, da seguinte forma:\n"
+"    entrada para ela em seu hgrc, da seguinte forma::\n"
 "\n"
 "      [extensions]\n"
 "      foo =\n"
 "\n"
 "    Você também pode especificar o caminho completo para uma\n"
-"    extensão:\n"
+"    extensão::\n"
 "\n"
 "      [extensions]\n"
 "      myfeature = ~/.hgext/myfeature.py\n"
 "\n"
 "    Para desabilitar explicitamente uma extensão habilitada em um\n"
-"    hgrc de escopo mais amplo, prefixe seu caminho com !:\n"
+"    hgrc de escopo mais amplo, prefixe seu caminho com !::\n"
 "\n"
 "      [extensions]\n"
 "      # desabilita a extensão bar localizada em\n"
@@ -9466,80 +9594,81 b' msgstr "Formatos de datas"'
 msgid ""
 "\n"
 "    Some commands allow the user to specify a date, e.g.:\n"
-"    * backout, commit, import, tag: Specify the commit date.\n"
-"    * log, revert, update: Select revision(s) by date.\n"
-"\n"
-"    Many date formats are valid. Here are some examples:\n"
-"\n"
-"    \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-"    \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-"    \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-"    \"Dec 6\" (midnight)\n"
-"    \"13:18\" (today assumed)\n"
-"    \"3:39\" (3:39AM assumed)\n"
-"    \"3:39pm\" (15:39)\n"
-"    \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-"    \"2006-12-6 13:18\"\n"
-"    \"2006-12-6\"\n"
-"    \"12-6\"\n"
-"    \"12/6\"\n"
-"    \"12/6/6\" (Dec 6 2006)\n"
-"\n"
-"    Lastly, there is Mercurial's internal format:\n"
-"\n"
-"    \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
+"\n"
+"    - backout, commit, import, tag: Specify the commit date.\n"
+"    - log, revert, update: Select revision(s) by date.\n"
+"\n"
+"    Many date formats are valid. Here are some examples::\n"
+"\n"
+"      \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
+"      \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
+"      \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
+"      \"Dec 6\" (midnight)\n"
+"      \"13:18\" (today assumed)\n"
+"      \"3:39\" (3:39AM assumed)\n"
+"      \"3:39pm\" (15:39)\n"
+"      \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+"      \"2006-12-6 13:18\"\n"
+"      \"2006-12-6\"\n"
+"      \"12-6\"\n"
+"      \"12/6\"\n"
+"      \"12/6/6\" (Dec 6 2006)\n"
+"\n"
+"    Lastly, there is Mercurial's internal format::\n"
+"\n"
+"      \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
 "\n"
 "    This is the internal representation format for dates. unixtime is\n"
 "    the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
 "    offset is the offset of the local timezone, in seconds west of UTC\n"
 "    (negative if the timezone is east of UTC).\n"
 "\n"
-"    The log command also accepts date ranges:\n"
-"\n"
-"    \"<{datetime}\" - at or before a given date/time\n"
-"    \">{datetime}\" - on or after a given date/time\n"
-"    \"{datetime} to {datetime}\" - a date range, inclusive\n"
-"    \"-{days}\" - within a given number of days of today\n"
-"    "
-msgstr ""
-"\n"
-"    Alguns comandos permitem ao usuário especificar uma data:\n"
-"    * backout, commit, import, tag: a data de consolidação.\n"
-"    * log, revert, update: Selecionar revisões por data.\n"
-"\n"
-"    Muitos formatos de data são válidos. Eis alguns exemplos:\n"
-"\n"
-"    \"Wed Dec 6 13:18:29 2006\" (assumido fuso horário local)\n"
-"    \"Dec 6 13:18 -0600\" (ano atual, defasagem de horário local\n"
-"    fornecida)\n"
-"    \"Dec 6 13:18 UTC\" (UTC e GMT são apelidos para +0000)\n"
-"    \"Dec 6\" (meia noite)\n"
-"    \"13:18\" (data corrente assumida)\n"
-"    \"3:39\" (hora assumida 3:39AM)\n"
-"    \"3:39pm\" (15:39)\n"
-"    \"2006-12-06 13:18:29\" (formato ISO 8601)\n"
-"    \"2006-12-6 13:18\"\n"
-"    \"2006-12-6\"\n"
-"    \"12-6\"\n"
-"    \"12/6\"\n"
-"    \"12/6/6\" (Dec 6 2006)\n"
-"\n"
-"    E por fim, há um formato interno do Mercurial:\n"
-"\n"
-"    \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
+"    The log command also accepts date ranges::\n"
+"\n"
+"      \"<{datetime}\" - at or before a given date/time\n"
+"      \">{datetime}\" - on or after a given date/time\n"
+"      \"{datetime} to {datetime}\" - a date range, inclusive\n"
+"      \"-{days}\" - within a given number of days of today\n"
+"    "
+msgstr ""
+"\n"
+"    Alguns comandos permitem ao usuário especificar uma data, como:\n"
+"\n"
+"    - backout, commit, import, tag: Especificar a data de consolidação.\n"
+"    - log, revert, update: Selecionar revisões por data.\n"
+"\n"
+"    Muitos formatos de data são válidos. Eis alguns exemplos::\n"
+"\n"
+"      \"Wed Dec 6 13:18:29 2006\" (assumido fuso horário local)\n"
+"      \"Dec 6 13:18 -0600\" (ano atual, defasagem de horário local\n"
+"      fornecida)\n"
+"      \"Dec 6 13:18 UTC\" (UTC e GMT são apelidos para +0000)\n"
+"      \"Dec 6\" (meia noite)\n"
+"      \"13:18\" (data corrente assumida)\n"
+"      \"3:39\" (hora assumida 3:39AM)\n"
+"      \"3:39pm\" (15:39)\n"
+"      \"2006-12-06 13:18:29\" (formato ISO 8601)\n"
+"      \"2006-12-6 13:18\"\n"
+"      \"2006-12-6\"\n"
+"      \"12-6\"\n"
+"      \"12/6\"\n"
+"      \"12/6/6\" (Dec 6 2006)\n"
+"\n"
+"    E por fim, há um formato interno do Mercurial::\n"
+"\n"
+"      \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
 "\n"
 "    Este é o formato interno de representação de datas. unixtime é\n"
 "    o número de segundos desde a epoch (1970-01-01 00:00 UTC). offset\n"
 "    é a defasagem do fuso horário local, em segundos a oeste de UTC\n"
 "    (negativo para fusos horários a leste de UTC).\n"
 "\n"
-"    O comando log também aceita intervalos de data:\n"
-"\n"
-"    \"<{date}\" - na data fornecida, ou anterior\n"
-"    \">{date}\" - na data fornecida, ou posterior\n"
-"    \"{date} to {date}\" - um intervalo de data, incluindo os\n"
-"                           extremos\n"
-"    \"-{days}\" - dentro de um certo número de dias contados de hoje\n"
+"    O comando log também aceita intervalos de data::\n"
+"\n"
+"      \"<{date}\" - na data fornecida, ou anterior\n"
+"      \">{date}\" - na data fornecida, ou posterior\n"
+"      \"{date} to {date}\" - um intervalo de data, incluindo os extremos\n"
+"      \"-{days}\" - dentro de um certo número de dias contados de hoje\n"
 "    "
 
 msgid "File Name Patterns"
@@ -9560,34 +9689,34 b' msgid ""'
 "    the current repository root.\n"
 "\n"
 "    To use an extended glob, start a name with \"glob:\". Globs are\n"
-"    rooted at the current directory; a glob such as \"*.c\" will only\n"
-"    match files in the current directory ending with \".c\".\n"
-"\n"
-"    The supported glob syntax extensions are \"**\" to match any string\n"
-"    across path separators and \"{a,b}\" to mean \"a or b\".\n"
+"    rooted at the current directory; a glob such as \"``*.c``\" will\n"
+"    only match files in the current directory ending with \".c\".\n"
+"\n"
+"    The supported glob syntax extensions are \"``**``\" to match any\n"
+"    string across path separators and \"{a,b}\" to mean \"a or b\".\n"
 "\n"
 "    To use a Perl/Python regular expression, start a name with \"re:\".\n"
 "    Regexp pattern matching is anchored at the root of the repository.\n"
 "\n"
-"    Plain examples:\n"
-"\n"
-"    path:foo/bar   a name bar in a directory named foo in the root of\n"
-"                   the repository\n"
-"    path:path:name a file or directory named \"path:name\"\n"
-"\n"
-"    Glob examples:\n"
-"\n"
-"    glob:*.c       any name ending in \".c\" in the current directory\n"
-"    *.c            any name ending in \".c\" in the current directory\n"
-"    **.c           any name ending in \".c\" in any subdirectory of the\n"
-"                   current directory including itself.\n"
-"    foo/*.c        any name ending in \".c\" in the directory foo\n"
-"    foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
-"                   including itself.\n"
-"\n"
-"    Regexp examples:\n"
-"\n"
-"    re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
+"    Plain examples::\n"
+"\n"
+"      path:foo/bar   a name bar in a directory named foo in the root\n"
+"                     of the repository\n"
+"      path:path:name a file or directory named \"path:name\"\n"
+"\n"
+"    Glob examples::\n"
+"\n"
+"      glob:*.c       any name ending in \".c\" in the current directory\n"
+"      *.c            any name ending in \".c\" in the current directory\n"
+"      **.c           any name ending in \".c\" in any subdirectory of the\n"
+"                     current directory including itself.\n"
+"      foo/*.c        any name ending in \".c\" in the directory foo\n"
+"      foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
+"                     including itself.\n"
+"\n"
+"    Regexp examples::\n"
+"\n"
+"      re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
 "\n"
 "    "
 msgstr ""
@@ -9607,10 +9736,10 b' msgstr ""'
 "    atual.\n"
 "\n"
 "    Para usar um glob estendido, comece um nome com \"glob:\". Globs\n"
-"    têm como raiz o diretório corrente; um glob como \"*.c\" baterá\n"
+"    têm como raiz o diretório corrente; um glob como \"``*.c``\" baterá\n"
 "    com arquivos terminados em \".c\" apenas no diretório corrente.\n"
 "\n"
-"    As sintaxes de extensão do glob suportadas são \"**\" para bater\n"
+"    As sintaxes de extensão do glob suportadas são \"``**``\" para bater\n"
 "    com qualquer string incluindo separadores de caminho, e \"{a,b}\"\n"
 "    para significar \"a ou b\".\n"
 "\n"
@@ -9618,29 +9747,29 b' msgstr ""'
 "    \"re:\". O casamento de padrões por expressão regular é feito a\n"
 "    partir do raiz do repositório.\n"
 "\n"
-"    Exemplos simples:\n"
-"\n"
-"    path:foo/bar   o nome bar em um diretório chamado foo no raiz do\n"
-"                   repositório\n"
-"    path:path:name um arquivo ou diretório chamado \"path:name\"\n"
-"\n"
-"    Exemplos de glob:\n"
-"\n"
-"    glob:*.c       qualquer nome terminado por \".c\" no diretório\n"
-"                   atual\n"
-"    *.c            qualquer nome terminado por \".c\" no diretório\n"
-"                   atual\n"
-"    **.c           qualquer nome terminado por \".c\" no diretório\n"
-"                   atual ou em qualquer subdiretório\n"
-"    foo/*.c        qualquer nome terminado por \".c\" no diretório\n"
-"                   foo\n"
-"    foo/**.c       qualquer nome terminado por \".c\" no diretório\n"
-"                   foo ou em qualquer subdiretório\n"
-"\n"
-"    Exemplos de regexp:\n"
-"\n"
-"    re:.*\\.c$     qualquer nome terminado por \".c\", em qualquer\n"
-"                   lugar no repositório\n"
+"    Exemplos simples::\n"
+"\n"
+"      path:foo/bar   o nome bar em um diretório chamado foo no raiz do\n"
+"                     repositório\n"
+"      path:path:name um arquivo ou diretório chamado \"path:name\"\n"
+"\n"
+"    Exemplos de glob::\n"
+"\n"
+"      glob:*.c       qualquer nome terminado por \".c\" no diretório\n"
+"                     atual\n"
+"      *.c            qualquer nome terminado por \".c\" no diretório\n"
+"                     atual\n"
+"      **.c           qualquer nome terminado por \".c\" no diretório\n"
+"                     atual ou em qualquer subdiretório\n"
+"      foo/*.c        qualquer nome terminado por \".c\" no diretório\n"
+"                     foo\n"
+"      foo/**.c       qualquer nome terminado por \".c\" no diretório\n"
+"                     foo ou em qualquer subdiretório\n"
+"\n"
+"    Exemplos de expressão regular::\n"
+"\n"
+"      re:.*\\.c$      qualquer nome terminado por \".c\", em qualquer\n"
+"                     lugar no repositório\n"
 "\n"
 "    "
 
@@ -9649,25 +9778,25 b' msgstr "Vari\xc3\xa1veis de ambiente"'
 
 msgid ""
 "\n"
-"HG::\n"
+"HG\n"
 "    Path to the 'hg' executable, automatically passed when running\n"
 "    hooks, extensions or external tools. If unset or empty, this is\n"
 "    the hg executable's name if it's frozen, or an executable named\n"
 "    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
 "    Windows) is searched.\n"
 "\n"
-"HGEDITOR::\n"
+"HGEDITOR\n"
 "    This is the name of the editor to run when committing. See EDITOR.\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
-"HGENCODING::\n"
+"HGENCODING\n"
 "    This overrides the default locale setting detected by Mercurial.\n"
 "    This setting is used to convert data including usernames,\n"
 "    changeset descriptions, tag names, and branches. This setting can\n"
 "    be overridden with the --encoding command-line option.\n"
 "\n"
-"HGENCODINGMODE::\n"
+"HGENCODINGMODE\n"
 "    This sets Mercurial's behavior for handling unknown characters\n"
 "    while transcoding user input. The default is \"strict\", which\n"
 "    causes Mercurial to abort if it can't map a character. Other\n"
@@ -9675,45 +9804,46 b' msgid ""'
 "    \"ignore\", which drops them. This setting can be overridden with\n"
 "    the --encodingmode command-line option.\n"
 "\n"
-"HGMERGE::\n"
+"HGMERGE\n"
 "    An executable to use for resolving merge conflicts. The program\n"
 "    will be executed with three arguments: local file, remote file,\n"
 "    ancestor file.\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
-"HGRCPATH::\n"
+"HGRCPATH\n"
 "    A list of files or directories to search for hgrc files. Item\n"
 "    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
 "    platform default search path is used. If empty, only the .hg/hgrc\n"
 "    from the current repository is read.\n"
 "\n"
 "    For each element in HGRCPATH:\n"
-"    * if it's a directory, all files ending with .rc are added\n"
-"    * otherwise, the file itself will be added\n"
-"\n"
-"HGUSER::\n"
+"\n"
+"    - if it's a directory, all files ending with .rc are added\n"
+"    - otherwise, the file itself will be added\n"
+"\n"
+"HGUSER\n"
 "    This is the string used as the author of a commit. If not set,\n"
 "    available values will be considered in this order:\n"
 "\n"
-"    * HGUSER (deprecated)\n"
-"    * hgrc files from the HGRCPATH\n"
-"    * EMAIL\n"
-"    * interactive prompt\n"
-"    * LOGNAME (with '@hostname' appended)\n"
+"    - HGUSER (deprecated)\n"
+"    - hgrc files from the HGRCPATH\n"
+"    - EMAIL\n"
+"    - interactive prompt\n"
+"    - LOGNAME (with '@hostname' appended)\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
-"EMAIL::\n"
+"EMAIL\n"
 "    May be used as the author of a commit; see HGUSER.\n"
 "\n"
-"LOGNAME::\n"
+"LOGNAME\n"
 "    May be used as the author of a commit; see HGUSER.\n"
 "\n"
-"VISUAL::\n"
+"VISUAL\n"
 "    This is the name of the editor to use when committing. See EDITOR.\n"
 "\n"
-"EDITOR::\n"
+"EDITOR\n"
 "    Sometimes Mercurial needs to open a text file in an editor for a\n"
 "    user to modify, for example when writing commit messages. The\n"
 "    editor it uses is determined by looking at the environment\n"
@@ -9721,31 +9851,31 b' msgid ""'
 "    non-empty one is chosen. If all of them are empty, the editor\n"
 "    defaults to 'vi'.\n"
 "\n"
-"PYTHONPATH::\n"
+"PYTHONPATH\n"
 "    This is used by Python to find imported modules and may need to be\n"
 "    set appropriately if this Mercurial is not installed system-wide.\n"
 "    "
 msgstr ""
 "\n"
-"HG::\n"
+"HG\n"
 "    Caminho para o executável 'hg', automaticamente passado na\n"
 "    execução de ganchos, extensões ou ferramentas externas. Se não\n"
 "    definido ou vazio, um executável chamado 'hg' (com a extensão\n"
 "    com/exe/bat/cmd no Windows) é procurado.\n"
 "\n"
-"HGEDITOR::\n"
+"HGEDITOR\n"
 "    Este é o nome do editor usado em consolidações. Veja EDITOR.\n"
 "\n"
 "    (obsoleto, use .hgrc)\n"
 "\n"
-"HGENCODING::\n"
+"HGENCODING\n"
 "    É usado no lugar da configuração padrão de locale detectada\n"
 "    pelo Mercurial. Essa configuração é usada para converter dados\n"
 "    como nomes de usuário, descrições de changesets, nomes de\n"
 "    etiqueta e ramos. Essa configuração pode ser sobreposta com a\n"
 "    opção --encoding na linha de comando.\n"
 "\n"
-"HGENCODINGMODE::\n"
+"HGENCODINGMODE\n"
 "    Essa configuração ajusta o comportamento do Mercurial no\n"
 "    tratamento de caracteres desconhecidos, ao codificar entradas do\n"
 "    usuário. O padrão é \"strict\", o que faz com que o Mercurial\n"
@@ -9754,43 +9884,50 b' msgstr ""'
 "    \"ignore\", que os descarta. Essa configuração pode ser\n"
 "    sobreposta com a opção --encodingmode na linha de comando.\n"
 "\n"
-"HGMERGE::\n"
+"HGMERGE\n"
 "    Um executável a ser usado para solucionar conflitos de mesclagem.\n"
 "    O programa será executado com três argumentos: arquivo local,\n"
 "    arquivo remoto, arquivo ancestral.\n"
 "\n"
 "    (obsoleta, use .hgrc)\n"
 "\n"
-"HGRCPATH::\n"
+"HGRCPATH\n"
 "    Uma lista de arquivos ou diretórios onde procurar arquivos hgrc.\n"
 "    O separador de itens é \":\" em Unix, \";\" no Windows. Se\n"
 "    HGRCPATH não estiver definido, o caminho de busca padrão da\n"
 "    plataforma será usado. Se vazio, será lido apenas .hg/hgrc no\n"
 "    repositório atual.\n"
 "\n"
-"    Para cada elemento no path que for um diretório, todas as\n"
-"    entradas no diretório terminadas por \".rc\" serão adicionadas\n"
-"    ao path. Caso contrário, o próprio elemento será adicionado ao\n"
-"    path.\n"
-"\n"
-"HGUSER::\n"
+"    Para cada elemento em HGRCPATH:\n"
+"\n"
+"    - se for um diretório, todos os arquivos nesse diretório\n"
+"    terminados por \".rc\" serão adicionados\n"
+"    - caso contrário, o próprio arquivo será adicionado\n"
+"\n"
+"HGUSER\n"
 "    Esta é a string usada para o autor de uma consolidação.\n"
+"    Se não for definida, valores disponíveis serão considerados na\n"
+"    seguinte ordem:\n"
+"\n"
+"    - HGUSER (obsoleto)\n"
+"    - arquivos hgrc no HGRCPATH\n"
+"    - EMAIL\n"
+"    - consulta interativa\n"
+"    - LOGNAME (com '@hostname' anexado)\n"
 "\n"
 "    (obsoleto, use .hgrc)\n"
 "\n"
-"EMAIL::\n"
-"    Se HGUSER não estiver definido, este valor será usado como autor\n"
-"    para consolidações.\n"
-"\n"
-"LOGNAME::\n"
-"    Se nem HGUSER nem EMAIL estiverem definidos, LOGNAME será usado\n"
-"    (com '@hostname' anexado) como o autor de uma consolidação.\n"
-"\n"
-"VISUAL::\n"
+"EMAIL\n"
+"    Pode ser usado como autor de consolidações; veja HGUSER.\n"
+"\n"
+"LOGNAME\n"
+"    Pode ser usado como autor de consolidações; veja HGUSER.\n"
+"\n"
+"VISUAL\n"
 "    Este é o nome do editor a ser usado em consolidações. Veja\n"
 "    EDITOR.\n"
 "\n"
-"EDITOR::\n"
+"EDITOR\n"
 "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
 "    texto para ser modificado por um usuário, por exemplo ao escrever\n"
 "    mensagens de consolidação. O editor usado é determinado pela\n"
@@ -9798,7 +9935,7 b' msgstr ""'
 "    nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n"
 "    estiverem vazios, o editor será o 'vi'.\n"
 "\n"
-"PYTHONPATH::\n"
+"PYTHONPATH\n"
 "    Isto é usado pelo Python para localizar módulos importados, e\n"
 "    pode precisar ser ajustado apropriadamente se o Mercurial não\n"
 "    estiver instalado para o sistema todo.\n"
@@ -9929,10 +10066,10 b' msgid ""'
 "    While this standard format is often enough, it does not encode the\n"
 "    following information:\n"
 "\n"
-"     - executable status and other permission bits\n"
-"     - copy or rename information\n"
-"     - changes in binary files\n"
-"     - creation or deletion of empty files\n"
+"    - executable status and other permission bits\n"
+"    - copy or rename information\n"
+"    - changes in binary files\n"
+"    - creation or deletion of empty files\n"
 "\n"
 "    Mercurial also supports the extended diff format from the git VCS\n"
 "    which addresses these limitations. The git diff format is not\n"
@@ -9963,10 +10100,10 b' msgstr ""'
 "    Apesar de esse formato padrão ser muitas vezes suficiente, ele\n"
 "    não codifica as seguintes informações:\n"
 "\n"
-"     - bits de execução e permissão\n"
-"     - informação de cópia ou renomeação\n"
-"     - mudanças em arquivos binários\n"
-"     - criação ou remoção de arquivos vazios\n"
+"    - bits de execução e permissão\n"
+"    - informação de cópia ou renomeação\n"
+"    - mudanças em arquivos binários\n"
+"    - criação ou remoção de arquivos vazios\n"
 "\n"
 "    O Mercurial também suporta o formato diff estendido do VCS git\n"
 "    que trata dessas limitações. O formato git diff não é\n"
@@ -9992,6 +10129,7 b' msgstr ""'
 msgid "Template Usage"
 msgstr "Uso de modelos"
 
+#, fuzzy
 msgid ""
 "\n"
 "    Mercurial allows you to customize output of commands through\n"
@@ -10004,12 +10142,12 b' msgid ""'
 "\n"
 "    Three styles are packaged with Mercurial: default (the style used\n"
 "    when no explicit preference is passed), compact and changelog.\n"
-"    Usage:\n"
+"    Usage::\n"
 "\n"
 "        $ hg log -r1 --style changelog\n"
 "\n"
 "    A template is a piece of text, with markup to invoke variable\n"
-"    expansion:\n"
+"    expansion::\n"
 "\n"
 "        $ hg log -r1 --template \"{node}\\n\"\n"
 "        b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
@@ -10018,84 +10156,92 b' msgid ""'
 "    keywords depends on the exact context of the templater. These\n"
 "    keywords are usually available for templating a log-like command:\n"
 "\n"
-"    - author: String. The unmodified author of the changeset.\n"
-"    - branches: String. The name of the branch on which the changeset\n"
-"          was committed. Will be empty if the branch name was default.\n"
-"    - date: Date information. The date when the changeset was committed.\n"
-"    - desc: String. The text of the changeset description.\n"
-"    - diffstat: String. Statistics of changes with the following\n"
-"          format: \"modified files: +added/-removed lines\"\n"
-"    - files: List of strings. All files modified, added, or removed by\n"
-"          this changeset.\n"
-"    - file_adds: List of strings. Files added by this changeset.\n"
-"    - file_mods: List of strings. Files modified by this changeset.\n"
-"    - file_dels: List of strings. Files removed by this changeset.\n"
-"    - node: String. The changeset identification hash, as a\n"
-"          40-character hexadecimal string.\n"
-"    - parents: List of strings. The parents of the changeset.\n"
-"    - rev: Integer. The repository-local changeset revision number.\n"
-"    - tags: List of strings. Any tags associated with the changeset.\n"
+"    :author:    String. The unmodified author of the changeset.\n"
+"    :branches:  String. The name of the branch on which the changeset\n"
+"                was committed. Will be empty if the branch name was\n"
+"                default.\n"
+"    :date:      Date information. The date when the changeset was\n"
+"                committed.\n"
+"    :desc:      String. The text of the changeset description.\n"
+"    :diffstat:  String. Statistics of changes with the following\n"
+"                format: \"modified files: +added/-removed lines\"\n"
+"    :files:     List of strings. All files modified, added, or removed\n"
+"                by this changeset.\n"
+"    :file_adds: List of strings. Files added by this changeset.\n"
+"    :file_mods: List of strings. Files modified by this changeset.\n"
+"    :file_dels: List of strings. Files removed by this changeset.\n"
+"    :node:      String. The changeset identification hash, as a\n"
+"                40-character hexadecimal string.\n"
+"    :parents:   List of strings. The parents of the changeset.\n"
+"    :rev:       Integer. The repository-local changeset revision\n"
+"                number.\n"
+"    :tags:      List of strings. Any tags associated with the\n"
+"                changeset.\n"
 "\n"
 "    The \"date\" keyword does not produce human-readable output. If you\n"
 "    want to use a date in your output, you can use a filter to process\n"
 "    it. Filters are functions which return a string based on the input\n"
 "    variable. You can also use a chain of filters to get the desired\n"
-"    output:\n"
+"    output::\n"
 "\n"
 "       $ hg tip --template \"{date|isodate}\\n\"\n"
 "       2008-08-21 18:22 +0000\n"
 "\n"
 "    List of filters:\n"
 "\n"
-"    - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-"          every line except the last.\n"
-"    - age: Date. Returns a human-readable date/time difference between\n"
-"          the given date/time and the current date/time.\n"
-"    - basename: Any text. Treats the text as a path, and returns the\n"
-"          last component of the path after splitting by the path\n"
-"          separator (ignoring trailing separators). For example,\n"
-"          \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
-"\".\n"
-"    - stripdir: Treat the text as path and strip a directory level, if\n"
-"          possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
-"    - date: Date. Returns a date in a Unix date format, including\n"
-"          the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
-"    - domain: Any text. Finds the first string that looks like an\n"
-"          email address, and extracts just the domain component.\n"
-"          Example: 'User <[e-mail]>' becomes 'example.com'.\n"
-"    - email: Any text. Extracts the first string that looks like an\n"
-"          email address. Example: 'User <[e-mail]>' becomes\n"
-"          '[e-mail]'.\n"
-"    - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
-"          \"<\" and \">\" with XML entities.\n"
-"    - fill68: Any text. Wraps the text to fit in 68 columns.\n"
-"    - fill76: Any text. Wraps the text to fit in 76 columns.\n"
-"    - firstline: Any text. Returns the first line of text.\n"
-"    - nonempty: Any text. Returns '(none)' if the string is empty.\n"
-"    - hgdate: Date. Returns the date as a pair of numbers:\n"
-"          \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
-"    - isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18\n"
-"          13:00 +0200\".\n"
-"    - isodatesec: Date. Returns the date in ISO 8601 format, including\n"
-"          seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
-"          rfc3339date filter.\n"
-"    - localdate: Date. Converts a date to local date.\n"
-"    - obfuscate: Any text. Returns the input text rendered as a\n"
-"          sequence of XML entities.\n"
-"    - person: Any text. Returns the text before an email address.\n"
-"    - rfc822date: Date. Returns a date using the same format used\n"
-"          in email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
-"    - rfc3339date: Date. Returns a date using the Internet date format\n"
-"          specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
-"    - short: Changeset hash. Returns the short form of a changeset\n"
-"          hash, i.e. a 12-byte hexadecimal string.\n"
-"    - shortdate: Date. Returns a date like \"2006-09-18\".\n"
-"    - strip: Any text. Strips all leading and trailing whitespace.\n"
-"    - tabindent: Any text. Returns the text, with every line except\n"
-"          the first starting with a tab character.\n"
-"    - urlescape: Any text. Escapes all \"special\" characters. For\n"
-"          example, \"foo bar\" becomes \"foo%20bar\".\n"
-"    - user: Any text. Returns the user portion of an email address.\n"
+"    :addbreaks:  Any text. Add an XHTML \"<br />\" tag before the end of\n"
+"                 every line except the last.\n"
+"    :age:        Date. Returns a human-readable date/time difference\n"
+"                 between the given date/time and the current\n"
+"                 date/time.\n"
+"    :basename:   Any text. Treats the text as a path, and returns the\n"
+"                 last component of the path after splitting by the\n"
+"                 path separator (ignoring trailing separators). For\n"
+"                 example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
+"                 becomes \"bar\".\n"
+"    :stripdir:   Treat the text as path and strip a directory level,\n"
+"                 if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
+"                 \"foo\".\n"
+"    :date:       Date. Returns a date in a Unix date format, including\n"
+"                 the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
+"    :domain:     Any text. Finds the first string that looks like an\n"
+"                 email address, and extracts just the domain\n"
+"                 component. Example: 'User <[e-mail]>' becomes\n"
+"                 'example.com'.\n"
+"    :email:      Any text. Extracts the first string that looks like\n"
+"                 an email address. Example: 'User <[e-mail]>'\n"
+"                 becomes '[e-mail]'.\n"
+"    :escape:     Any text. Replaces the special XML/XHTML characters\n"
+"                 \"&\", \"<\" and \">\" with XML entities.\n"
+"    :fill68:     Any text. Wraps the text to fit in 68 columns.\n"
+"    :fill76:     Any text. Wraps the text to fit in 76 columns.\n"
+"    :firstline:  Any text. Returns the first line of text.\n"
+"    :nonempty:   Any text. Returns '(none)' if the string is empty.\n"
+"    :hgdate:     Date. Returns the date as a pair of numbers:\n"
+"                 \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
+"    :isodate:    Date. Returns the date in ISO 8601 format:\n"
+"                 \"2009-08-18 13:00 +0200\".\n"
+"    :isodatesec: Date. Returns the date in ISO 8601 format, including\n"
+"                 seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
+"                 rfc3339date filter.\n"
+"    :localdate:  Date. Converts a date to local date.\n"
+"    :obfuscate:  Any text. Returns the input text rendered as a\n"
+"                 sequence of XML entities.\n"
+"    :person:     Any text. Returns the text before an email address.\n"
+"    :rfc822date: Date. Returns a date using the same format used in\n"
+"                 email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+"    :rfc3339date: Date. Returns a date using the Internet date format\n"
+"                  specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
+"    :short:      Changeset hash. Returns the short form of a changeset\n"
+"                 hash, i.e. a 12-byte hexadecimal string.\n"
+"    :shortdate:  Date. Returns a date like \"2006-09-18\".\n"
+"    :strip:      Any text. Strips all leading and trailing whitespace.\n"
+"    :tabindent:  Any text. Returns the text, with every line except\n"
+"                 the first starting with a tab character.\n"
+"    :urlescape:  Any text. Escapes all \"special\" characters. For\n"
+"                 example, \"foo bar\" becomes \"foo%20bar\".\n"
+"    :user:       Any text. Returns the user portion of an email\n"
+"                 address.\n"
 "    "
 msgstr ""
 "\n"
@@ -10109,12 +10255,12 b' msgstr ""'
 "\n"
 "    Três estilos são incluídos na distribuição do Mercurial: default\n"
 "    (o estilo usado quando nenhuma preferência for passada), compact\n"
-"    e changelog. Uso:\n"
+"    e changelog. Uso::\n"
 "\n"
 "        $ hg log -r1 --style changelog\n"
 "\n"
 "    Um modelo é um texto com marcações que invocam expansão de\n"
-"    variáveis:\n"
+"    variáveis::\n"
 "\n"
 "        $ hg log -r1 --template \"{node}\\n\"\n"
 "        b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
@@ -10124,96 +10270,97 b' msgstr ""'
 "    modelador. Estas palavras chave estão comumente disponíveis para\n"
 "    modelar comandos semelhantes ao log:\n"
 "\n"
-"    - author: String. O autor do changeset, sem modificações.\n"
-"    - branches: String. O nome do ramo no qual o changeset foi\n"
-"          consolidado. Será vazio se o nome do ramo for default.\n"
-"    - date: Informação de data. A data de consolidação do changeset.\n"
-"    - desc: String. O texto da descrição do changeset.\n"
-"    - diffstat: String. Estatísticas de mudanças no seguinte\n"
-"          formato: \"modified files: +added/-removed lines\"\n"
-"    - files: Lista de strings. Todos os arquivos modificados,\n"
-"          adicionados ou removidos por este changeset.\n"
-"    - file_adds: Lista de strings. Arquivos adicionados por este\n"
-"          changeset.\n"
-"    - file_mods: Lista de strings. Arquivos modificados por este\n"
-"          changeset.\n"
-"    - file_dels: Lista de strings. Arquivos removidos por este\n"
-"          changeset.\n"
-"    - node: String. O hash de identificação do changeset, como uma\n"
-"          string hexadecimal de 40 caracteres.\n"
-"    - parents: Lista de strings. Os pais do changeset.\n"
-"    - rev: Inteiro. O número de revisão do changeset no\n"
-"          repositório local.\n"
-"    - tags: Lista de strings. Quaisquer etiquetas associadas ao\n"
-"          changeset.\n"
+"    :author:    String. O autor do changeset, sem modificações.\n"
+"    :branches:  String. O nome do ramo no qual o changeset foi\n"
+"                consolidado. Será vazio se o nome do ramo for default.\n"
+"    :date:      Informação de data. A data de consolidação do changeset.\n"
+"    :desc:      String. O texto da descrição do changeset.\n"
+"    :diffstat:  String. Estatísticas de mudanças no seguinte\n"
+"                formato: \"modified files: +added/-removed lines\"\n"
+"    :files:     Lista de strings. Todos os arquivos modificados,\n"
+"                adicionados ou removidos por este changeset.\n"
+"    :file_adds: Lista de strings. Arquivos adicionados por este\n"
+"                changeset.\n"
+"    :file_mods: Lista de strings. Arquivos modificados por este\n"
+"                changeset.\n"
+"    :file_dels: Lista de strings. Arquivos removidos por este\n"
+"                changeset.\n"
+"    :node:      String. O hash de identificação do changeset, como uma\n"
+"                string hexadecimal de 40 caracteres.\n"
+"    :parents:   Lista de strings. Os pais do changeset.\n"
+"    :rev:       Inteiro. O número de revisão do changeset no\n"
+"                repositório local.\n"
+"    :tags:      Lista de strings. Quaisquer etiquetas associadas ao\n"
+"                changeset.\n"
 "\n"
 "    A palavra chave \"date\" não produz saída legível para humanos.\n"
 "    Se você quiser usar uma data em sua saída, você pode usar um\n"
 "    filtro para processá-la. Filtros são funções que devolvem uma\n"
 "    string baseada na variável de entrada. Você também pode encadear\n"
-"    filtros para obter a saída desejada:\n"
+"    filtros para obter a saída desejada::\n"
 "\n"
 "       $ hg tip --template \"{date|isodate}\\n\"\n"
 "       2008-08-21 18:22 +0000\n"
 "\n"
 "    Lista de filtros:\n"
 "\n"
-"    - addbreaks: Qualquer texto. Adiciona uma tag XHTML \"<br />\"\n"
-"          antes do fim de cada linha, exceto a última.\n"
-"    - age: Data. Devolve uma diferença de data/tempo legível entre\n"
-"          a data/hora dada e a data/hora atual.\n"
-"    - basename: Qualquer texto. Trata o texto como um caminho, e\n"
-"          devolve o último componente do caminho após quebrá-lo\n"
-"          usando o separador de caminhos (ignorando separadores à\n"
-"          direita). Por exemple, \"foo/bar/baz\" se torna \"baz\"\n"
-"          e \"foo/bar//\" se torna \"bar\".\n"
-"    - date: Data. Devolve uma data em um formato de data Unix,\n"
-"          incluindo a diferença de fuso horário:\n"
-"          \"Mon Sep 04 15:13:13 2006 0700\".\n"
-"    - stripdir: Trata o texto como um caminho e remove um nível\n"
-"          de diretório, se possível. Por exemplo, \"foo\" e\n"
-"          \"foo/bar\" se tornam \"foo\".\n"
-"    - domain: Qualquer texto. Encontra a primeira string que se\n"
-"          pareça com um endereço de e-mail, e extrai apenas a parte\n"
-"          do domínio. Por exemplo:\n"
-"          'User <[e-mail]>' se torna 'example.com'.\n"
-"    - email: Qualquer texto. Extrai a primeira string que se pareça\n"
-"          com um endereço de e-mail. Por exemplo:\n"
-"          'User <[e-mail]>' se torna '[e-mail]'.\n"
-"    - escape: Qualquer texto. Substitui os caracteres especiais\n"
-"          XML/XHTML \"&\", \"<\" e \">\" por entidades XML.\n"
-"    - fill68: Qualquer texto. Quebra o texto para caber em 68\n"
-"          colunas.\n"
-"    - fill76: Qualquer texto. Quebra o texto para caber em 76\n"
-"          colunas.\n"
-"    - firstline: Qualquer texto. Devolve a primeira linha do texto.\n"
-"    - nonempty: Qualquer texto. Devolve (none) se o texto for vazio.\n"
-"    - hgdate: Data. Devolve a data como um par de números:\n"
-"          \"1157407993 25200\" (timestamp Unix, defasagem de fuso)\n"
-"    - isodate: Data. Devolve a data em formato ISO 8601: \"2009-08-18\n"
-"          13:00 +0200\".\n"
-"    - localdate: Data. Converte para data local.\n"
-"    - obfuscate: Qualquer texto. Devolve o texto de entrada\n"
-"          renderizado como uma seqüência de entidades XML.\n"
-"    - person: Qualquer texto. Devolve o texto antes de um endereço\n"
-"          de e-mail.\n"
-"    - rfc822date: Data. Devolve uma data usando o mesmo formato utilizado\n"
-"          em cabeçalhos de e-mail: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
-"    - rfc3339date: Data. Devolve uma data usando o formato de data da\n"
-"          Internet especificado na RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
-"    - short: Hash do changeset. Devolve a forma curta do hash de\n"
-"          um changeset, ou seja, uma string hexadecimal de 12 bytes.\n"
-"    - shortdate: Data. Devolve uma data como \"2006-09-18\".\n"
-"    - strip: Qualquer texto. Remove todos os espaços em branco no\n"
-"          início e no final do texto.\n"
-"    - tabindent: Qualquer texto. Devolve o texto todo, com a adição\n"
-"          de um caractere de tabulação ao início de cada linha,\n"
-"          exceto da primeira.\n"
-"    - urlescape: Qualquer texto. Codifica todos os caracteres\n"
-"          \"especiais\". Por exemplo, \"foo bar\" se torna\n"
-"          \"foo%20bar\".\n"
-"    - user: Qualquer texto. Devolve a parte do usuário de um\n"
-"          endereço de e-mail.\n"
+"    :addbreaks:  Qualquer texto. Adiciona uma tag XHTML \"<br />\"\n"
+"                 antes do fim de cada linha, exceto a última.\n"
+"    :age:        Data. Devolve uma diferença de data/tempo legível entre\n"
+"                 a data/hora dada e a data/hora atual.\n"
+"    :basename:   Qualquer texto. Trata o texto como um caminho, e\n"
+"                 devolve o último componente do caminho após quebrá-lo\n"
+"                 usando o separador de caminhos (ignorando separadores à\n"
+"                 direita). Por exemple, \"foo/bar/baz\" se torna \"baz\"\n"
+"                 e \"foo/bar//\" se torna \"bar\".\n"
+"    :date:       Data. Devolve uma data em um formato de data Unix,\n"
+"                 incluindo a diferença de fuso horário:\n"
+"                 \"Mon Sep 04 15:13:13 2006 0700\".\n"
+"    :stripdir:   Trata o texto como um caminho e remove um nível\n"
+"                 de diretório, se possível. Por exemplo, \"foo\" e\n"
+"                 \"foo/bar\" se tornam \"foo\".\n"
+"    :domain:     Qualquer texto. Encontra a primeira string que se\n"
+"                 pareça com um endereço de e-mail, e extrai apenas a parte\n"
+"                 do domínio. Por exemplo:\n"
+"                 'User <[e-mail]>' se torna 'example.com'.\n"
+"    :email:      Qualquer texto. Extrai a primeira string que se pareça\n"
+"                 com um endereço de e-mail. Por exemplo:\n"
+"                 'User <[e-mail]>' se torna '[e-mail]'.\n"
+"    :escape:     Qualquer texto. Substitui os caracteres especiais\n"
+"                 XML/XHTML \"&\", \"<\" e \">\" por entidades XML.\n"
+"    :fill68:     Qualquer texto. Quebra o texto para caber em 68\n"
+"                 colunas.\n"
+"    :fill76:     Qualquer texto. Quebra o texto para caber em 76\n"
+"                 colunas.\n"
+"    :firstline:  Qualquer texto. Devolve a primeira linha do texto.\n"
+"    :nonempty:   Qualquer texto. Devolve (none) se o texto for vazio.\n"
+"    :hgdate:     Data. Devolve a data como um par de números:\n"
+"                 \"1157407993 25200\" (timestamp Unix, defasagem de fuso)\n"
+"    :isodate:    Data. Devolve a data em formato ISO 8601: \"2009-08-18\n"
+"                 13:00 +0200\".\n"
+"    :localdate:  Data. Converte para data local.\n"
+"    :obfuscate:  Qualquer texto. Devolve o texto de entrada\n"
+"                 renderizado como uma seqüência de entidades XML.\n"
+"    :person:     Qualquer texto. Devolve o texto antes de um endereço\n"
+"                 de e-mail.\n"
+"    :rfc822date: Data. Devolve uma data usando o mesmo formato utilizado\n"
+"                 em cabeçalhos de e-mail: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+"    :rfc3339date: Data. Devolve uma data usando o formato de data da Internet\n"
+"                  especificado na RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
+"    :short:      Hash do changeset. Devolve a forma curta do hash de\n"
+
+"                 um changeset, ou seja, uma string hexadecimal de 12 bytes.\n"
+"    :shortdate:  Data. Devolve uma data como \"2006-09-18\".\n"
+"    :strip:      Qualquer texto. Remove todos os espaços em branco no\n"
+"                 início e no final do texto.\n"
+"    :tabindent:  Qualquer texto. Devolve o texto todo, com a adição\n"
+"                 de um caractere de tabulação ao início de cada linha,\n"
+"                 exceto da primeira.\n"
+"    :urlescape:  Qualquer texto. Codifica todos os caracteres\n"
+"                 \"especiais\". Por exemplo, \"foo bar\" se torna\n"
+"                 \"foo%20bar\".\n"
+"    :user:       Qualquer texto. Devolve a parte do usuário de um\n"
+"                 endereço de e-mail.\n"
 "    "
 
 msgid "URL Paths"
@@ -10221,7 +10368,7 b' msgstr "Caminhos URL"'
 
 msgid ""
 "\n"
-"    Valid URLs are of the form:\n"
+"    Valid URLs are of the form::\n"
 "\n"
 "      local/filesystem/path[#revision]\n"
 "      file://local/filesystem/path[#revision]\n"
@@ -10230,8 +10377,8 b' msgid ""'
 "      ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
 "\n"
 "    Paths in the local filesystem can either point to Mercurial\n"
-"    repositories or to bundle files (as created by 'hg bundle' or\n"
-"    'hg incoming --bundle').\n"
+"    repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
+"    incoming --bundle').\n"
 "\n"
 "    An optional identifier after # indicates a particular branch, tag,\n"
 "    or changeset to use from the remote repository. See also 'hg help\n"
@@ -10242,28 +10389,34 b' msgid ""'
 "    Mercurial server.\n"
 "\n"
 "    Some notes about using SSH with Mercurial:\n"
+"\n"
 "    - SSH requires an accessible shell account on the destination\n"
 "      machine and a copy of hg in the remote path or specified with as\n"
 "      remotecmd.\n"
 "    - path is relative to the remote user's home directory by default.\n"
-"      Use an extra slash at the start of a path to specify an absolute "
-"path:\n"
+"      Use an extra slash at the start of a path to specify an absolute\n"
+"      path::\n"
+"\n"
 "        ssh://example.com//tmp/repository\n"
+"\n"
 "    - Mercurial doesn't use its own compression via SSH; the right\n"
-"      thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
+"      thing to do is to configure it in your ~/.ssh/config, e.g.::\n"
+"\n"
 "        Host *.mylocalnetwork.example.com\n"
 "          Compression no\n"
 "        Host *\n"
 "          Compression yes\n"
+"\n"
 "      Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
 "      or with the --ssh command line option.\n"
 "\n"
 "    These URLs can all be stored in your hgrc with path aliases under\n"
-"    the [paths] section like so:\n"
-"    [paths]\n"
-"    alias1 = URL1\n"
-"    alias2 = URL2\n"
-"    ...\n"
+"    the [paths] section like so::\n"
+"\n"
+"      [paths]\n"
+"      alias1 = URL1\n"
+"      alias2 = URL2\n"
+"      ...\n"
 "\n"
 "    You can then use the alias for any command that uses a URL (for\n"
 "    example 'hg pull alias1' would pull from the 'alias1' path).\n"
@@ -10284,7 +10437,7 b' msgid ""'
 "    "
 msgstr ""
 "\n"
-"    URLs válidas são da forma:\n"
+"    URLs válidas são da forma::\n"
 "\n"
 "      caminho/no/sistema/de/arquivos/local[#revisão]\n"
 "      file://caminho/no/sistema/de/arquivos/local[#revisão]\n"
@@ -10305,29 +10458,35 b' msgstr ""'
 "    servidor remoto do Mercurial.\n"
 "\n"
 "    Algumas notas sobre o uso de SSH com o Mercurial:\n"
+"\n"
 "    - o SSH necessita de uma conta shell acessível na máquina de\n"
 "      destino e uma cópia do hg no caminho de execução remoto ou\n"
 "      especificado em remotecmd.\n"
 "    - o caminho é por padrão relativo ao diretório home do usuário\n"
 "      remoto.\n"
 "      Use uma barra extra no início de um caminho para especificar um\n"
-"      caminho absoluto:\n"
+"      caminho absoluto::\n"
+"\n"
 "        ssh://exemplo.com//tmp/repositorio\n"
+"\n"
 "    - o Mercurial não usa sua própria compressão via SSH; a coisa\n"
-"      certa a fazer é configurá-la em seu ~/.ssh/config, por exemplo:\n"
+"      certa a fazer é configurá-la em seu ~/.ssh/config, por exemplo::\n"
+"\n"
 "        Host *.minharedelocal.exemplo.com\n"
 "          Compression no\n"
 "        Host *\n"
 "          Compression yes\n"
+"\n"
 "      Alternativamente especifique \"ssh -C\" como seu comando ssh\n"
 "      em seu hgrc ou pela opção de linha de comando --ssh .\n"
 "\n"
 "    Estas URLs podem ser todas armazenadas em seu hgrc com apelidos\n"
-"    de caminho na seção [paths] , da seguinte forma:\n"
-"    [paths]\n"
-"    apelido1 = URL1\n"
-"    apelido2 = URL2\n"
-"    ...\n"
+"    de caminho na seção [paths] , da seguinte forma::\n"
+"\n"
+"      [paths]\n"
+"      apelido1 = URL1\n"
+"      apelido2 = URL2\n"
+"      ...\n"
 "\n"
 "    Você pode então usar o apelido em qualquer comando que receba uma\n"
 "    URL (por exemplo 'hg pull apelido1' iria trazer revisões do\n"
@@ -10552,8 +10711,8 b' msgid "cannot create new http repository'
 msgstr "impossível criar novo repositório http"
 
 #, python-format
-msgid "%s: ignoring invalid syntax '%s'\n"
-msgstr "%s: ignorando sintaxe inválida '%s'\n"
+msgid "ignoring invalid syntax '%s'"
+msgstr "ignorando sintaxe inválida '%s'"
 
 #, python-format
 msgid "skipping unreadable ignore file '%s': %s\n"
@@ -10585,17 +10744,6 b' msgstr ""'
 "manualmente)"
 
 #, python-format
-msgid "%s, line %s: %s\n"
-msgstr "%s, linha %s: %s\n"
-
-msgid "cannot parse entry"
-msgstr "não é possível decodificar entrada"
-
-#, python-format
-msgid "node '%s' is not well formed"
-msgstr "nó '%s' não é bem formado"
-
-#, python-format
 msgid "working directory has unknown parent '%s'!"
 msgstr "diretório de trabalho tem pai desconhecido '%s'!"
 
@@ -10967,9 +11115,6 b' msgstr "(&C) alterada"'
 msgid "&Delete"
 msgstr "(&D) apagar"
 
-msgid "c"
-msgstr "c"
-
 #, python-format
 msgid ""
 "remote changed %s which local deleted\n"
@@ -11115,6 +11260,10 b' msgid "no valid hunks found; trying with'
 msgstr "nenhum trecho válido encontrado; tentando com %r\n"
 
 #, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr "%d arquivos modificados, %d inserções(+), %d remoções(-)\n"
+
+#, python-format
 msgid "exited with status %d"
 msgstr "terminou com o código %d"
 
@@ -11245,9 +11394,6 b' msgstr ""'
 msgid "&Remote"
 msgstr "&Remoto"
 
-msgid "r"
-msgstr "r"
-
 #, python-format
 msgid ""
 " local changed subrepository %s which remote removed\n"
@@ -11276,6 +11422,17 b' msgstr "trazendo sub-reposit\xc3\xb3rio %s\\n"'
 msgid "pushing subrepo %s\n"
 msgstr "enviando sub-repositório %s\n"
 
+#, python-format
+msgid "%s, line %s: %s\n"
+msgstr "%s, linha %s: %s\n"
+
+msgid "cannot parse entry"
+msgstr "não é possível decodificar entrada"
+
+#, python-format
+msgid "node '%s' is not well formed"
+msgstr "nó '%s' não é bem formado"
+
 msgid "unmatched quotes"
 msgstr "aspas não combinam"
 
@@ -11341,12 +11498,12 b' msgstr "Por favor, especifique um nome de usu\xc3\xa1rio."'
 msgid "username %s contains a newline\n"
 msgstr "nome de usuário %s contém quebra de linha\n"
 
+msgid "response expected"
+msgstr "resposta esperada"
+
 msgid "unrecognized response\n"
 msgstr "resposta desconhecida\n"
 
-msgid "response expected"
-msgstr "resposta esperada"
-
 msgid "password: "
 msgstr "senha: "