--- a/Makefile Fri Oct 16 11:18:38 2009 +0200
+++ b/Makefile Fri Oct 16 11:19:39 2009 +0200
@@ -79,16 +79,16 @@
update-pot: i18n/hg.pot
-i18n/hg.pot: $(PYTHON_FILES)
+i18n/hg.pot: $(PYTHON_FILES) help/*.txt
$(PYTHON) i18n/hggettext mercurial/commands.py \
- hgext/*.py hgext/*/__init__.py > i18n/hg.pot
+ hgext/*.py hgext/*/__init__.py help/*.txt > i18n/hg.pot
# All strings marked for translation in Mercurial contain
# ASCII characters only. But some files contain string
# literals like this '\037\213'. xgettext thinks it has to
# parse them even though they are not marked for translation.
# Extracting with an explicit encoding of ISO-8859-1 will make
# xgettext "parse" and ignore them.
- echo $^ | xargs \
+ echo $(PYTHON_FILES) | xargs \
xgettext --package-name "Mercurial" \
--msgid-bugs-address "<mercurial-devel@selenic.com>" \
--copyright-holder "Matt Mackall <mpm@selenic.com> and others" \
--- a/contrib/bash_completion Fri Oct 16 11:18:38 2009 +0200
+++ b/contrib/bash_completion Fri Oct 16 11:19:39 2009 +0200
@@ -546,3 +546,20 @@
return
}
+# shelve
+_hg_shelves()
+{
+ local shelves="$("$hg" unshelve -l . 2>/dev/null)"
+ local IFS=$'\n'
+ COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$shelves' -- "$cur"))
+}
+
+_hg_cmd_shelve()
+{
+ _hg_status "mard"
+}
+
+_hg_cmd_unshelve()
+{
+ _hg_shelves
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/shrink-revlog.py Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,218 @@
+#!/usr/bin/env python
+
+"""\
+Reorder a revlog (by default the the manifest file in the current
+repository) to save space. Specifically, this topologically sorts the
+revisions in the revlog so that revisions on the same branch are adjacent
+as much as possible. This is a workaround for the fact that Mercurial
+computes deltas relative to the previous revision rather than relative to a
+parent revision. This is *not* safe to run on a changelog.
+"""
+
+# Originally written by Benoit Boissinot <benoit.boissinot at ens-lyon.org>
+# as a patch to rewrite-log. Cleaned up, refactored, documented, and
+# renamed by Greg Ward <greg at gerg.ca>.
+
+# XXX would be nice to have a way to verify the repository after shrinking,
+# e.g. by comparing "before" and "after" states of random changesets
+# (maybe: export before, shrink, export after, diff).
+
+import sys, os, tempfile
+import optparse
+from mercurial import ui as ui_, hg, revlog, transaction, node, util
+
+def toposort(rl):
+ write = sys.stdout.write
+
+ children = {}
+ root = []
+ # build children and roots
+ write('reading %d revs ' % len(rl))
+ try:
+ for i in rl:
+ children[i] = []
+ parents = [p for p in rl.parentrevs(i) if p != node.nullrev]
+ # in case of duplicate parents
+ if len(parents) == 2 and parents[0] == parents[1]:
+ del parents[1]
+ for p in parents:
+ assert p in children
+ children[p].append(i)
+
+ if len(parents) == 0:
+ root.append(i)
+
+ if i % 1000 == 0:
+ write('.')
+ finally:
+ write('\n')
+
+ # XXX this is a reimplementation of the 'branchsort' topo sort
+ # algorithm in hgext.convert.convcmd... would be nice not to duplicate
+ # the algorithm
+ write('sorting ...')
+ visit = root
+ ret = []
+ while visit:
+ i = visit.pop(0)
+ ret.append(i)
+ if i not in children:
+ # This only happens if some node's p1 == p2, which can
+ # happen in the manifest in certain circumstances.
+ continue
+ next = []
+ for c in children.pop(i):
+ parents_unseen = [p for p in rl.parentrevs(c)
+ if p != node.nullrev and p in children]
+ if len(parents_unseen) == 0:
+ next.append(c)
+ visit = next + visit
+ write('\n')
+ return ret
+
+def writerevs(r1, r2, order, tr):
+ write = sys.stdout.write
+ write('writing %d revs ' % len(order))
+ try:
+ count = 0
+ for rev in order:
+ n = r1.node(rev)
+ p1, p2 = r1.parents(n)
+ l = r1.linkrev(rev)
+ t = r1.revision(n)
+ n2 = r2.addrevision(t, tr, l, p1, p2)
+
+ if count % 1000 == 0:
+ write('.')
+ count += 1
+ finally:
+ write('\n')
+
+def report(olddatafn, newdatafn):
+ oldsize = float(os.stat(olddatafn).st_size)
+ newsize = float(os.stat(newdatafn).st_size)
+
+ # argh: have to pass an int to %d, because a float >= 2^32
+ # blows up under Python 2.5 or earlier
+ sys.stdout.write('old file size: %12d bytes (%6.1f MiB)\n'
+ % (int(oldsize), oldsize/1024/1024))
+ sys.stdout.write('new file size: %12d bytes (%6.1f MiB)\n'
+ % (int(newsize), newsize/1024/1024))
+
+ shrink_percent = (oldsize - newsize) / oldsize * 100
+ shrink_factor = oldsize / newsize
+ sys.stdout.write('shrinkage: %.1f%% (%.1fx)\n'
+ % (shrink_percent, shrink_factor))
+
+def main():
+
+ # Unbuffer stdout for nice progress output.
+ sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
+ write = sys.stdout.write
+
+ parser = optparse.OptionParser(description=__doc__)
+ parser.add_option('-R', '--repository',
+ default=os.path.curdir,
+ metavar='REPO',
+ help='repository root directory [default: current dir]')
+ parser.add_option('--revlog',
+ metavar='FILE',
+ help='shrink FILE [default: REPO/hg/store/00manifest.i]')
+ (options, args) = parser.parse_args()
+ if args:
+ parser.error('too many arguments')
+
+ # Open the specified repository.
+ ui = ui_.ui()
+ repo = hg.repository(ui, options.repository)
+ if not repo.local():
+ parser.error('not a local repository: %s' % options.repository)
+
+ if options.revlog is None:
+ indexfn = repo.sjoin('00manifest.i')
+ else:
+ if not options.revlog.endswith('.i'):
+ parser.error('--revlog option must specify the revlog index file '
+ '(*.i), not %s' % options.revlog)
+
+ indexfn = os.path.realpath(options.revlog)
+ store = repo.sjoin('')
+ if not indexfn.startswith(store):
+ parser.error('--revlog option must specify a revlog in %s, not %s'
+ % (store, indexfn))
+
+ datafn = indexfn[:-2] + '.d'
+ if not os.path.exists(indexfn):
+ parser.error('no such file: %s' % indexfn)
+ if '00changelog' in indexfn:
+ parser.error('shrinking the changelog will corrupt your repository')
+ if not os.path.exists(datafn):
+ # This is just a lazy shortcut because I can't be bothered to
+ # handle all the special cases that entail from no .d file.
+ parser.error('%s does not exist: revlog not big enough '
+ 'to be worth shrinking' % datafn)
+
+ oldindexfn = indexfn + '.old'
+ olddatafn = datafn + '.old'
+ if os.path.exists(oldindexfn) or os.path.exists(olddatafn):
+ parser.error('one or both of\n'
+ ' %s\n'
+ ' %s\n'
+ 'exists from a previous run; please clean up before '
+ 'running again'
+ % (oldindexfn, olddatafn))
+
+ write('shrinking %s\n' % indexfn)
+ prefix = os.path.basename(indexfn)[:-1]
+ (tmpfd, tmpindexfn) = tempfile.mkstemp(dir=os.path.dirname(indexfn),
+ prefix=prefix,
+ suffix='.i')
+ tmpdatafn = tmpindexfn[:-2] + '.d'
+ os.close(tmpfd)
+
+ r1 = revlog.revlog(util.opener(os.getcwd(), audit=False), indexfn)
+ r2 = revlog.revlog(util.opener(os.getcwd(), audit=False), tmpindexfn)
+
+ # Don't use repo.transaction(), because then things get hairy with
+ # paths: some need to be relative to .hg, and some need to be
+ # absolute. Doing it this way keeps things simple: everything is an
+ # absolute path.
+ lock = repo.lock(wait=False)
+ tr = transaction.transaction(sys.stderr.write,
+ open,
+ repo.sjoin('journal'))
+
+ try:
+ try:
+ order = toposort(r1)
+ writerevs(r1, r2, order, tr)
+ report(datafn, tmpdatafn)
+ tr.close()
+ except:
+ # Abort transaction first, so we truncate the files before
+ # deleting them.
+ tr.abort()
+ if os.path.exists(tmpindexfn):
+ os.unlink(tmpindexfn)
+ if os.path.exists(tmpdatafn):
+ os.unlink(tmpdatafn)
+ raise
+ finally:
+ lock.release()
+
+ os.link(indexfn, oldindexfn)
+ os.link(datafn, olddatafn)
+ os.rename(tmpindexfn, indexfn)
+ os.rename(tmpdatafn, datafn)
+ write('note: old revlog saved in:\n'
+ ' %s\n'
+ ' %s\n'
+ '(You can delete those files when you are satisfied that your\n'
+ 'repository is still sane. '
+ 'Running \'hg verify\' is strongly recommended.)\n'
+ % (oldindexfn, olddatafn))
+
+try:
+ main()
+except KeyboardInterrupt:
+ sys.exit("interrupted")
--- a/doc/gendoc.py Fri Oct 16 11:18:38 2009 +0200
+++ b/doc/gendoc.py Fri Oct 16 11:19:39 2009 +0200
@@ -1,9 +1,10 @@
-import os, sys, textwrap
+import os, sys
# import from the live mercurial repo
sys.path.insert(0, "..")
# fall back to pure modules if required C extensions are not available
sys.path.append(os.path.join('..', 'mercurial', 'pure'))
from mercurial import demandimport; demandimport.enable()
+from mercurial import encoding
from mercurial.commands import table, globalopts
from mercurial.i18n import _
from mercurial.help import helptable
@@ -55,9 +56,9 @@
def show_doc(ui):
def section(s):
- ui.write("%s\n%s\n\n" % (s, "-" * len(s)))
+ ui.write("%s\n%s\n\n" % (s, "-" * encoding.colwidth(s)))
def subsection(s):
- ui.write("%s\n%s\n\n" % (s, '"' * len(s)))
+ ui.write("%s\n%s\n\n" % (s, '"' * encoding.colwidth(s)))
# print options
section(_("OPTIONS"))
@@ -92,9 +93,7 @@
s = "%-*s %s" % (opts_len, optstr, desc)
else:
s = optstr
- s = textwrap.fill(s, initial_indent=4 * " ",
- subsequent_indent=(6 + opts_len) * " ")
- ui.write("%s\n" % s)
+ ui.write(" %s\n" % s)
ui.write("\n")
# aliases
if d['aliases']:
--- a/doc/hg.1.txt Fri Oct 16 11:18:38 2009 +0200
+++ b/doc/hg.1.txt Fri Oct 16 11:19:39 2009 +0200
@@ -95,6 +95,6 @@
-------
Copyright \(C) 2005-2009 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
-Public License (GPL).
+Public License version 2.
.. include:: common.txt
--- a/doc/hgignore.5.txt Fri Oct 16 11:18:38 2009 +0200
+++ b/doc/hgignore.5.txt Fri Oct 16 11:19:39 2009 +0200
@@ -106,6 +106,6 @@
This manual page is copyright 2006 Vadim Gelfer.
Mercurial is copyright 2005-2009 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
-Public License (GPL).
+Public License version 2.
.. include:: common.txt
--- a/doc/hgrc.5.txt Fri Oct 16 11:18:38 2009 +0200
+++ b/doc/hgrc.5.txt Fri Oct 16 11:19:39 2009 +0200
@@ -946,6 +946,6 @@
This manual page is copyright 2005 Bryan O'Sullivan.
Mercurial is copyright 2005-2009 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
-Public License (GPL).
+Public License version 2.
.. include:: common.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/dates.txt Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,36 @@
+Some commands allow the user to specify a date, e.g.:
+
+- backout, commit, import, tag: Specify the commit date.
+- log, revert, update: Select revision(s) by date.
+
+Many date formats are valid. Here are some examples::
+
+ "Wed Dec 6 13:18:29 2006" (local timezone assumed)
+ "Dec 6 13:18 -0600" (year assumed, time offset provided)
+ "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
+ "Dec 6" (midnight)
+ "13:18" (today assumed)
+ "3:39" (3:39AM assumed)
+ "3:39pm" (15:39)
+ "2006-12-06 13:18:29" (ISO 8601 format)
+ "2006-12-6 13:18"
+ "2006-12-6"
+ "12-6"
+ "12/6"
+ "12/6/6" (Dec 6 2006)
+
+Lastly, there is Mercurial's internal format::
+
+ "1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)
+
+This is the internal representation format for dates. unixtime is the
+number of seconds since the epoch (1970-01-01 00:00 UTC). offset is
+the offset of the local timezone, in seconds west of UTC (negative if
+the timezone is east of UTC).
+
+The log command also accepts date ranges::
+
+ "<{datetime}" - at or before a given date/time
+ ">{datetime}" - on or after a given date/time
+ "{datetime} to {datetime}" - a date range, inclusive
+ "-{days}" - within a given number of days of today
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/diffs.txt Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,29 @@
+Mercurial's default format for showing changes between two versions of
+a file is compatible with the unified format of GNU diff, which can be
+used by GNU patch and many other standard tools.
+
+While this standard format is often enough, it does not encode the
+following information:
+
+- executable status and other permission bits
+- copy or rename information
+- changes in binary files
+- creation or deletion of empty files
+
+Mercurial also supports the extended diff format from the git VCS
+which addresses these limitations. The git diff format is not produced
+by default because a few widespread tools still do not understand this
+format.
+
+This means that when generating diffs from a Mercurial repository
+(e.g. with "hg export"), you should be careful about things like file
+copies and renames or other things mentioned above, because when
+applying a standard diff to a different repository, this extra
+information is lost. Mercurial's internal operations (like push and
+pull) are not affected by this, because they use an internal binary
+format for communicating changes.
+
+To make Mercurial produce the git extended diff format, use the --git
+option available for many commands, or set 'git = True' in the [diff]
+section of your hgrc. You do not need to set this option when
+importing diffs in this format or using them in the mq extension.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/environment.txt Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,76 @@
+HG
+ Path to the 'hg' executable, automatically passed when running
+ hooks, extensions or external tools. If unset or empty, this is
+ the hg executable's name if it's frozen, or an executable named
+ 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
+ Windows) is searched.
+
+HGEDITOR
+ This is the name of the editor to run when committing. See EDITOR.
+
+ (deprecated, use .hgrc)
+
+HGENCODING
+ This overrides the default locale setting detected by Mercurial.
+ This setting is used to convert data including usernames,
+ changeset descriptions, tag names, and branches. This setting can
+ be overridden with the --encoding command-line option.
+
+HGENCODINGMODE
+ This sets Mercurial's behavior for handling unknown characters
+ while transcoding user input. The default is "strict", which
+ causes Mercurial to abort if it can't map a character. Other
+ settings include "replace", which replaces unknown characters, and
+ "ignore", which drops them. This setting can be overridden with
+ the --encodingmode command-line option.
+
+HGMERGE
+ An executable to use for resolving merge conflicts. The program
+ will be executed with three arguments: local file, remote file,
+ ancestor file.
+
+ (deprecated, use .hgrc)
+
+HGRCPATH
+ A list of files or directories to search for hgrc files. Item
+ separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set,
+ platform default search path is used. If empty, only the .hg/hgrc
+ from the current repository is read.
+
+ For each element in HGRCPATH:
+
+ - if it's a directory, all files ending with .rc are added
+ - otherwise, the file itself will be added
+
+HGUSER
+ This is the string used as the author of a commit. If not set,
+ available values will be considered in this order:
+
+ - HGUSER (deprecated)
+ - hgrc files from the HGRCPATH
+ - EMAIL
+ - interactive prompt
+ - LOGNAME (with '@hostname' appended)
+
+ (deprecated, use .hgrc)
+
+EMAIL
+ May be used as the author of a commit; see HGUSER.
+
+LOGNAME
+ May be used as the author of a commit; see HGUSER.
+
+VISUAL
+ This is the name of the editor to use when committing. See EDITOR.
+
+EDITOR
+ Sometimes Mercurial needs to open a text file in an editor for a
+ user to modify, for example when writing commit messages. The
+ editor it uses is determined by looking at the environment
+ variables HGEDITOR, VISUAL and EDITOR, in that order. The first
+ non-empty one is chosen. If all of them are empty, the editor
+ defaults to 'vi'.
+
+PYTHONPATH
+ This is used by Python to find imported modules and may need to be
+ set appropriately if this Mercurial is not installed system-wide.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/extensions.txt Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,33 @@
+Mercurial has the ability to add new features through the use of
+extensions. Extensions may add new commands, add options to
+existing commands, change the default behavior of commands, or
+implement hooks.
+
+Extensions are not loaded by default for a variety of reasons:
+they can increase startup overhead; they may be meant for advanced
+usage only; they may provide potentially dangerous abilities (such
+as letting you destroy or modify history); they might not be ready
+for prime time; or they may alter some usual behaviors of stock
+Mercurial. It is thus up to the user to activate extensions as
+needed.
+
+To enable the "foo" extension, either shipped with Mercurial or in
+the Python search path, create an entry for it in your hgrc, like
+this::
+
+ [extensions]
+ foo =
+
+You may also specify the full path to an extension::
+
+ [extensions]
+ myfeature = ~/.hgext/myfeature.py
+
+To explicitly disable an extension enabled in an hgrc of broader
+scope, prepend its path with !::
+
+ [extensions]
+ # disabling extension bar residing in /path/to/extension/bar.py
+ hgext.bar = !/path/to/extension/bar.py
+ # ditto, but no path was supplied for extension baz
+ hgext.baz = !
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/multirevs.txt Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,13 @@
+When Mercurial accepts more than one revision, they may be specified
+individually, or provided as a topologically continuous range,
+separated by the ":" character.
+
+The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
+revision identifiers. Both BEGIN and END are optional. If BEGIN is not
+specified, it defaults to revision number 0. If END is not specified,
+it defaults to the tip. The range ":" thus means "all revisions".
+
+If BEGIN is greater than END, revisions are treated in reverse order.
+
+A range acts as a closed interval. This means that a range of 3:5
+gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/patterns.txt Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,41 @@
+Mercurial accepts several notations for identifying one or more files
+at a time.
+
+By default, Mercurial treats filenames as shell-style extended glob
+patterns.
+
+Alternate pattern notations must be specified explicitly.
+
+To use a plain path name without any pattern matching, start it with
+"path:". These path names must completely match starting at the
+current repository root.
+
+To use an extended glob, start a name with "glob:". Globs are rooted
+at the current directory; a glob such as "``*.c``" will only match
+files in the current directory ending with ".c".
+
+The supported glob syntax extensions are "``**``" to match any string
+across path separators and "{a,b}" to mean "a or b".
+
+To use a Perl/Python regular expression, start a name with "re:".
+Regexp pattern matching is anchored at the root of the repository.
+
+Plain examples::
+
+ path:foo/bar a name bar in a directory named foo in the root
+ of the repository
+ path:path:name a file or directory named "path:name"
+
+Glob examples::
+
+ glob:*.c any name ending in ".c" in the current directory
+ *.c any name ending in ".c" in the current directory
+ **.c any name ending in ".c" in any subdirectory of the
+ current directory including itself.
+ foo/*.c any name ending in ".c" in the directory foo
+ foo/**.c any name ending in ".c" in any subdirectory of foo
+ including itself.
+
+Regexp examples::
+
+ re:.*\.c$ any name ending in ".c", anywhere in the repository
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/revisions.txt Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,29 @@
+Mercurial supports several ways to specify individual revisions.
+
+A plain integer is treated as a revision number. Negative integers are
+treated as sequential offsets from the tip, with -1 denoting the tip,
+-2 denoting the revision prior to the tip, and so forth.
+
+A 40-digit hexadecimal string is treated as a unique revision
+identifier.
+
+A hexadecimal string less than 40 characters long is treated as a
+unique revision identifier and is referred to as a short-form
+identifier. A short-form identifier is only valid if it is the prefix
+of exactly one full-length identifier.
+
+Any other string is treated as a tag or branch name. A tag name is a
+symbolic name associated with a revision identifier. A branch name
+denotes the tipmost revision of that branch. Tag and branch names must
+not contain the ":" character.
+
+The reserved name "tip" is a special tag that always identifies the
+most recent revision.
+
+The reserved name "null" indicates the null revision. This is the
+revision of an empty repository, and the parent of revision 0.
+
+The reserved name "." indicates the working directory parent. If no
+working directory is checked out, it is equivalent to null. If an
+uncommitted merge is in progress, "." is the revision of the first
+parent.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/templates.txt Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,113 @@
+Mercurial allows you to customize output of commands through
+templates. You can either pass in a template from the command
+line, via the --template option, or select an existing
+template-style (--style).
+
+You can customize output for any "log-like" command: log,
+outgoing, incoming, tip, parents, heads and glog.
+
+Three styles are packaged with Mercurial: default (the style used
+when no explicit preference is passed), compact and changelog.
+Usage::
+
+ $ hg log -r1 --style changelog
+
+A template is a piece of text, with markup to invoke variable
+expansion::
+
+ $ hg log -r1 --template "{node}\n"
+ b56ce7b07c52de7d5fd79fb89701ea538af65746
+
+Strings in curly braces are called keywords. The availability of
+keywords depends on the exact context of the templater. These
+keywords are usually available for templating a log-like command:
+
+:author: String. The unmodified author of the changeset.
+:branches: String. The name of the branch on which the changeset
+ was committed. Will be empty if the branch name was
+ default.
+:date: Date information. The date when the changeset was
+ committed.
+:desc: String. The text of the changeset description.
+:diffstat: String. Statistics of changes with the following
+ format: "modified files: +added/-removed lines"
+:files: List of strings. All files modified, added, or removed
+ by this changeset.
+:file_adds: List of strings. Files added by this changeset.
+:file_mods: List of strings. Files modified by this changeset.
+:file_dels: List of strings. Files removed by this changeset.
+:node: String. The changeset identification hash, as a
+ 40-character hexadecimal string.
+:parents: List of strings. The parents of the changeset.
+:rev: Integer. The repository-local changeset revision
+ number.
+:tags: List of strings. Any tags associated with the
+ changeset.
+:latesttag: String. Most recent global tag in the ancestors of this
+ changeset.
+:latesttagdistance: Integer. Longest path to the latest tag.
+
+The "date" keyword does not produce human-readable output. If you
+want to use a date in your output, you can use a filter to process
+it. Filters are functions which return a string based on the input
+variable. You can also use a chain of filters to get the desired
+output::
+
+ $ hg tip --template "{date|isodate}\n"
+ 2008-08-21 18:22 +0000
+
+List of filters:
+
+:addbreaks: Any text. Add an XHTML "<br />" tag before the end of
+ every line except the last.
+:age: Date. Returns a human-readable date/time difference
+ between the given date/time and the current
+ date/time.
+:basename: Any text. Treats the text as a path, and returns the
+ last component of the path after splitting by the
+ path separator (ignoring trailing separators). For
+ example, "foo/bar/baz" becomes "baz" and "foo/bar//"
+ becomes "bar".
+:stripdir: Treat the text as path and strip a directory level,
+ if possible. For example, "foo" and "foo/bar" becomes
+ "foo".
+:date: Date. Returns a date in a Unix date format, including
+ the timezone: "Mon Sep 04 15:13:13 2006 0700".
+:domain: Any text. Finds the first string that looks like an
+ email address, and extracts just the domain
+ component. Example: 'User <user@example.com>' becomes
+ 'example.com'.
+:email: Any text. Extracts the first string that looks like
+ an email address. Example: 'User <user@example.com>'
+ becomes 'user@example.com'.
+:escape: Any text. Replaces the special XML/XHTML characters
+ "&", "<" and ">" with XML entities.
+:fill68: Any text. Wraps the text to fit in 68 columns.
+:fill76: Any text. Wraps the text to fit in 76 columns.
+:firstline: Any text. Returns the first line of text.
+:nonempty: Any text. Returns '(none)' if the string is empty.
+:hgdate: Date. Returns the date as a pair of numbers:
+ "1157407993 25200" (Unix timestamp, timezone offset).
+:isodate: Date. Returns the date in ISO 8601 format:
+ "2009-08-18 13:00 +0200".
+:isodatesec: Date. Returns the date in ISO 8601 format, including
+ seconds: "2009-08-18 13:00:13 +0200". See also the
+ rfc3339date filter.
+:localdate: Date. Converts a date to local date.
+:obfuscate: Any text. Returns the input text rendered as a
+ sequence of XML entities.
+:person: Any text. Returns the text before an email address.
+:rfc822date: Date. Returns a date using the same format used in
+ email headers: "Tue, 18 Aug 2009 13:00:13 +0200".
+:rfc3339date: Date. Returns a date using the Internet date format
+ specified in RFC 3339: "2009-08-18T13:00:13+02:00".
+:short: Changeset hash. Returns the short form of a changeset
+ hash, i.e. a 12-byte hexadecimal string.
+:shortdate: Date. Returns a date like "2006-09-18".
+:strip: Any text. Strips all leading and trailing whitespace.
+:tabindent: Any text. Returns the text, with every line except
+ the first starting with a tab character.
+:urlescape: Any text. Escapes all "special" characters. For
+ example, "foo bar" becomes "foo%20bar".
+:user: Any text. Returns the user portion of an email
+ address.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/urls.txt Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,63 @@
+Valid URLs are of the form::
+
+ local/filesystem/path[#revision]
+ file://local/filesystem/path[#revision]
+ http://[user[:pass]@]host[:port]/[path][#revision]
+ https://[user[:pass]@]host[:port]/[path][#revision]
+ ssh://[user[:pass]@]host[:port]/[path][#revision]
+
+Paths in the local filesystem can either point to Mercurial
+repositories or to bundle files (as created by 'hg bundle' or 'hg
+incoming --bundle').
+
+An optional identifier after # indicates a particular branch, tag, or
+changeset to use from the remote repository. See also 'hg help
+revisions'.
+
+Some features, such as pushing to http:// and https:// URLs are only
+possible if the feature is explicitly enabled on the remote Mercurial
+server.
+
+Some notes about using SSH with Mercurial:
+
+- SSH requires an accessible shell account on the destination machine
+ and a copy of hg in the remote path or specified with as remotecmd.
+- path is relative to the remote user's home directory by default. Use
+ an extra slash at the start of a path to specify an absolute path::
+
+ ssh://example.com//tmp/repository
+
+- Mercurial doesn't use its own compression via SSH; the right thing
+ to do is to configure it in your ~/.ssh/config, e.g.::
+
+ Host *.mylocalnetwork.example.com
+ Compression no
+ Host *
+ Compression yes
+
+ Alternatively specify "ssh -C" as your ssh command in your hgrc or
+ with the --ssh command line option.
+
+These URLs can all be stored in your hgrc with path aliases under the
+[paths] section like so::
+
+ [paths]
+ alias1 = URL1
+ alias2 = URL2
+ ...
+
+You can then use the alias for any command that uses a URL (for
+example 'hg pull alias1' would pull from the 'alias1' path).
+
+Two path aliases are special because they are used as defaults when
+you do not provide the URL to a command:
+
+default:
+ When you create a repository with hg clone, the clone command saves
+ the location of the source repository as the new repository's
+ 'default' path. This is then used when you omit path from push- and
+ pull-like commands (including incoming and outgoing).
+
+default-push:
+ The push command will look for a path named 'default-push', and
+ prefer it over 'default' if both are defined.
--- a/hgext/acl.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/acl.py Fri Oct 16 11:19:39 2009 +0200
@@ -60,12 +60,12 @@
def buildmatch(ui, repo, user, key):
'''return tuple of (match function, list enabled).'''
if not ui.has_section(key):
- ui.debug(_('acl: %s not enabled\n') % key)
+ ui.debug('acl: %s not enabled\n' % key)
return None
pats = [pat for pat, users in ui.configitems(key)
if user in users.replace(',', ' ').split()]
- ui.debug(_('acl: %s enabled, %d entries for user %s\n') %
+ ui.debug('acl: %s enabled, %d entries for user %s\n' %
(key, len(pats), user))
if pats:
return match.match(repo.root, '', pats)
@@ -77,7 +77,7 @@
raise util.Abort(_('config error - hook type "%s" cannot stop '
'incoming changesets') % hooktype)
if source not in ui.config('acl', 'sources', 'serve').split():
- ui.debug(_('acl: changes have source "%s" - skipping\n') % source)
+ ui.debug('acl: changes have source "%s" - skipping\n' % source)
return
user = None
@@ -99,9 +99,9 @@
ctx = repo[rev]
for f in ctx.files():
if deny and deny(f):
- ui.debug(_('acl: user %s denied on %s\n') % (user, f))
+ ui.debug('acl: user %s denied on %s\n' % (user, f))
raise util.Abort(_('acl: access denied for changeset %s') % ctx)
if allow and not allow(f):
- ui.debug(_('acl: user %s not allowed on %s\n') % (user, f))
+ ui.debug('acl: user %s not allowed on %s\n' % (user, f))
raise util.Abort(_('acl: access denied for changeset %s') % ctx)
- ui.debug(_('acl: allowing changeset %s\n') % ctx)
+ ui.debug('acl: allowing changeset %s\n' % ctx)
--- a/hgext/churn.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/churn.py Fri Oct 16 11:19:39 2009 +0200
@@ -153,7 +153,7 @@
maxname = max(len(k) for k, v in rate)
ttywidth = util.termwidth()
- ui.debug(_("assuming %i character terminal\n") % ttywidth)
+ ui.debug("assuming %i character terminal\n" % ttywidth)
width = ttywidth - maxname - 2 - 6 - 2 - 2
for date, count in rate:
--- a/hgext/color.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/color.py Fri Oct 16 11:19:39 2009 +0200
@@ -160,25 +160,26 @@
return retval
_patch_effects = { 'applied': ['blue', 'bold', 'underline'],
- 'missing': ['red', 'bold'],
- 'unapplied': ['black', 'bold'], }
-
-def colorwrap(orig, s):
+ 'missing': ['red', 'bold'],
+ 'unapplied': ['black', 'bold'], }
+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'''
@@ -235,6 +236,13 @@
# 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):
@@ -256,7 +264,7 @@
entry = extensions.wrapcommand(table, cmd, nocolor)
entry[1].extend([
('', 'color', 'auto', _("when to colorize (always, auto, or never)")),
- ('', 'no-color', None, _("don't colorize output")),
+ ('', 'no-color', None, _("don't colorize output (DEPRECATED)")),
])
for status in effectsmap:
--- a/hgext/convert/__init__.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/convert/__init__.py Fri Oct 16 11:19:39 2009 +0200
@@ -142,23 +142,8 @@
converted, and that any directory reorganization in the CVS
sandbox is ignored.
- Because CVS does not have changesets, it is necessary to collect
- individual commits to CVS and merge them into changesets. CVS
- source uses its internal changeset merging code by default but can
- be configured to call the external 'cvsps' program by setting::
-
- --config convert.cvsps='cvsps -A -u --cvs-direct -q'
-
- This option is deprecated and will be removed in Mercurial 1.4.
-
The options shown are the defaults.
- Internal cvsps is selected by setting ::
-
- --config convert.cvsps=builtin
-
- and has a few more configurable options:
-
--config convert.cvsps.cache=True (boolean)
Set to False to disable remote log caching, for testing and
debugging purposes.
@@ -178,9 +163,10 @@
add the most recent revision on the branch indicated in the
regex as the second parent of the changeset.
- The hgext/convert/cvsps wrapper script allows the builtin
+ An additional "debugcvsps" Mercurial command allows the builtin
changeset merging code to be run without doing a conversion. Its
- parameters and output are similar to that of cvsps 2.1.
+ parameters and output are similar to that of cvsps 2.1. Please see
+ the command help for more details.
Subversion Source
-----------------
--- a/hgext/convert/common.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/convert/common.py Fri Oct 16 11:19:39 2009 +0200
@@ -266,7 +266,7 @@
def _run(self, cmd, *args, **kwargs):
cmdline = self._cmdline(cmd, *args, **kwargs)
- self.ui.debug(_('running: %s\n') % (cmdline,))
+ self.ui.debug('running: %s\n' % (cmdline,))
self.prerun()
try:
return util.popen(cmdline)
@@ -365,7 +365,7 @@
return
for i, line in enumerate(fp):
try:
- key, value = line[:-1].rsplit(' ', 1)
+ key, value = line.splitlines()[0].rsplit(' ', 1)
except ValueError:
raise util.Abort(_('syntax error in %s(%d): key/value pair expected')
% (self.path, i+1))
--- a/hgext/convert/cvs.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/convert/cvs.py Fri Oct 16 11:19:39 2009 +0200
@@ -22,21 +22,11 @@
raise NoRepo("%s does not look like a CVS checkout" % path)
checktool('cvs')
- self.cmd = ui.config('convert', 'cvsps', 'builtin')
- cvspsexe = self.cmd.split(None, 1)[0]
- self.builtin = cvspsexe == 'builtin'
- if not self.builtin:
- ui.warn(_('warning: support for external cvsps is deprecated and '
- 'will be removed in Mercurial 1.4\n'))
-
- if not self.builtin:
- checktool(cvspsexe)
self.changeset = None
self.files = {}
self.tags = {}
self.lastbranch = {}
- self.parent = {}
self.socket = None
self.cvsroot = open(os.path.join(cvs, "Root")).read()[:-1]
self.cvsrepo = open(os.path.join(cvs, "Repository")).read()[:-1]
@@ -50,19 +40,13 @@
self.changeset = {}
maxrev = 0
- cmd = self.cmd
if self.rev:
# TODO: handle tags
try:
# patchset number?
maxrev = int(self.rev)
except ValueError:
- try:
- # date
- util.parsedate(self.rev, ['%Y/%m/%d %H:%M:%S'])
- cmd = '%s -d "1970/01/01 00:00:01" -d "%s"' % (cmd, self.rev)
- except util.Abort:
- raise util.Abort(_('revision %s is not a patchset number or date') % self.rev)
+ raise util.Abort(_('revision %s is not a patchset number') % self.rev)
d = os.getcwd()
try:
@@ -71,116 +55,36 @@
state = 0
filerevids = {}
- if self.builtin:
- # builtin cvsps code
- self.ui.status(_('using builtin cvsps\n'))
-
- cache = 'update'
- if not self.ui.configbool('convert', 'cvsps.cache', True):
- cache = None
- db = cvsps.createlog(self.ui, cache=cache)
- db = cvsps.createchangeset(self.ui, db,
- fuzz=int(self.ui.config('convert', 'cvsps.fuzz', 60)),
- mergeto=self.ui.config('convert', 'cvsps.mergeto', None),
- mergefrom=self.ui.config('convert', 'cvsps.mergefrom', None))
-
- for cs in db:
- if maxrev and cs.id>maxrev:
- break
- id = str(cs.id)
- cs.author = self.recode(cs.author)
- self.lastbranch[cs.branch] = id
- cs.comment = self.recode(cs.comment)
- date = util.datestr(cs.date)
- self.tags.update(dict.fromkeys(cs.tags, id))
-
- files = {}
- for f in cs.entries:
- files[f.file] = "%s%s" % ('.'.join([str(x) for x in f.revision]),
- ['', '(DEAD)'][f.dead])
+ cache = 'update'
+ if not self.ui.configbool('convert', 'cvsps.cache', True):
+ cache = None
+ db = cvsps.createlog(self.ui, cache=cache)
+ db = cvsps.createchangeset(self.ui, db,
+ fuzz=int(self.ui.config('convert', 'cvsps.fuzz', 60)),
+ mergeto=self.ui.config('convert', 'cvsps.mergeto', None),
+ mergefrom=self.ui.config('convert', 'cvsps.mergefrom', None))
- # add current commit to set
- c = commit(author=cs.author, date=date,
- parents=[str(p.id) for p in cs.parents],
- desc=cs.comment, branch=cs.branch or '')
- self.changeset[id] = c
- self.files[id] = files
- else:
- # external cvsps
- for l in util.popen(cmd):
- if state == 0: # header
- if l.startswith("PatchSet"):
- id = l[9:-2]
- if maxrev and int(id) > maxrev:
- # ignore everything
- state = 3
- elif l.startswith("Date:"):
- date = util.parsedate(l[6:-1], ["%Y/%m/%d %H:%M:%S"])
- date = util.datestr(date)
- elif l.startswith("Branch:"):
- branch = l[8:-1]
- self.parent[id] = self.lastbranch.get(branch, 'bad')
- self.lastbranch[branch] = id
- elif l.startswith("Ancestor branch:"):
- ancestor = l[17:-1]
- # figure out the parent later
- self.parent[id] = self.lastbranch[ancestor]
- elif l.startswith("Author:"):
- author = self.recode(l[8:-1])
- elif l.startswith("Tag:") or l.startswith("Tags:"):
- t = l[l.index(':')+1:]
- t = [ut.strip() for ut in t.split(',')]
- if (len(t) > 1) or (t[0] and (t[0] != "(none)")):
- self.tags.update(dict.fromkeys(t, id))
- elif l.startswith("Log:"):
- # switch to gathering log
- state = 1
- log = ""
- elif state == 1: # log
- if l == "Members: \n":
- # switch to gathering members
- files = {}
- oldrevs = []
- log = self.recode(log[:-1])
- state = 2
- else:
- # gather log
- log += l
- elif state == 2: # members
- if l == "\n": # start of next entry
- state = 0
- p = [self.parent[id]]
- if id == "1":
- p = []
- if branch == "HEAD":
- branch = ""
- if branch:
- latest = 0
- # the last changeset that contains a base
- # file is our parent
- for r in oldrevs:
- latest = max(filerevids.get(r, 0), latest)
- if latest:
- p = [latest]
+ for cs in db:
+ if maxrev and cs.id>maxrev:
+ break
+ id = str(cs.id)
+ cs.author = self.recode(cs.author)
+ self.lastbranch[cs.branch] = id
+ cs.comment = self.recode(cs.comment)
+ date = util.datestr(cs.date)
+ self.tags.update(dict.fromkeys(cs.tags, id))
- # add current commit to set
- c = commit(author=author, date=date, parents=p,
- desc=log, branch=branch)
- self.changeset[id] = c
- self.files[id] = files
- else:
- colon = l.rfind(':')
- file = l[1:colon]
- rev = l[colon+1:-2]
- oldrev, rev = rev.split("->")
- files[file] = rev
+ files = {}
+ for f in cs.entries:
+ files[f.file] = "%s%s" % ('.'.join([str(x) for x in f.revision]),
+ ['', '(DEAD)'][f.dead])
- # save some information for identifying branch points
- oldrevs.append("%s:%s" % (oldrev, file))
- filerevids["%s:%s" % (rev, file)] = id
- elif state == 3:
- # swallow all input
- continue
+ # add current commit to set
+ c = commit(author=cs.author, date=date,
+ parents=[str(p.id) for p in cs.parents],
+ desc=cs.comment, branch=cs.branch or '')
+ self.changeset[id] = c
+ self.files[id] = files
self.heads = self.lastbranch.values()
finally:
--- a/hgext/convert/cvsps.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/convert/cvsps.py Fri Oct 16 11:19:39 2009 +0200
@@ -199,7 +199,7 @@
cmd = [util.shellquote(arg) for arg in cmd]
ui.note(_("running %s\n") % (' '.join(cmd)))
- ui.debug(_("prefix=%r directory=%r root=%r\n") % (prefix, directory, root))
+ ui.debug("prefix=%r directory=%r root=%r\n" % (prefix, directory, root))
pfp = util.popen(' '.join(cmd))
peek = pfp.readline()
@@ -378,7 +378,7 @@
e.revision[-1] == 1 and # 1.1 or 1.1.x.1
len(e.comment) == 1 and
file_added_re.match(e.comment[0])):
- ui.debug(_('found synthetic revision in %s: %r\n')
+ ui.debug('found synthetic revision in %s: %r\n'
% (e.rcs, e.comment[0]))
e.synthetic = True
--- a/hgext/convert/darcs.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/convert/darcs.py Fri Oct 16 11:19:39 2009 +0200
@@ -75,7 +75,7 @@
self.parents[child] = []
def after(self):
- self.ui.debug(_('cleaning up %s\n') % self.tmppath)
+ self.ui.debug('cleaning up %s\n' % self.tmppath)
shutil.rmtree(self.tmppath, ignore_errors=True)
def xml(self, cmd, **kwargs):
@@ -85,6 +85,17 @@
self.checkexit(fp.close())
return etree.getroot()
+ def manifest(self):
+ man = []
+ output, status = self.run('show', 'files', no_directories=True,
+ repodir=self.tmppath)
+ self.checkexit(status)
+ for line in output.split('\n'):
+ path = line[2:]
+ if path:
+ man.append(path)
+ return man
+
def getheads(self):
return self.parents[None]
@@ -107,18 +118,35 @@
output, status = self.run('revert', all=True, repodir=self.tmppath)
self.checkexit(status, output)
- def getchanges(self, rev):
- self.pull(rev)
+ def getchanges(self, rev):
copies = {}
changes = []
+ man = None
for elt in self.changes[rev].find('summary').getchildren():
if elt.tag in ('add_directory', 'remove_directory'):
continue
if elt.tag == 'move':
- changes.append((elt.get('from'), rev))
- copies[elt.get('from')] = elt.get('to')
+ if man is None:
+ man = self.manifest()
+ source, dest = elt.get('from'), elt.get('to')
+ if source in man:
+ # File move
+ changes.append((source, rev))
+ changes.append((dest, rev))
+ copies[dest] = source
+ else:
+ # Directory move, deduce file moves from manifest
+ source = source + '/'
+ for f in man:
+ if not f.startswith(source):
+ continue
+ fdest = dest + '/' + f[len(source):]
+ changes.append((f, rev))
+ changes.append((fdest, rev))
+ copies[fdest] = f
else:
changes.append((elt.text.strip(), rev))
+ self.pull(rev)
self.lastrev = rev
return sorted(changes), copies
--- a/hgext/convert/gnuarch.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/convert/gnuarch.py Fri Oct 16 11:19:39 2009 +0200
@@ -125,7 +125,7 @@
break
def after(self):
- self.ui.debug(_('cleaning up %s\n') % self.tmppath)
+ self.ui.debug('cleaning up %s\n' % self.tmppath)
shutil.rmtree(self.tmppath, ignore_errors=True)
def getheads(self):
@@ -195,7 +195,7 @@
return os.system(cmdline)
def _update(self, rev):
- self.ui.debug(_('applying revision %s...\n') % rev)
+ self.ui.debug('applying revision %s...\n' % rev)
changeset, status = self.runlines('replay', '-d', self.tmppath,
rev)
if status:
@@ -205,7 +205,7 @@
self._obtainrevision(rev)
else:
old_rev = self.parents[rev][0]
- self.ui.debug(_('computing changeset between %s and %s...\n')
+ self.ui.debug('computing changeset between %s and %s...\n'
% (old_rev, rev))
self._parsechangeset(changeset, rev)
@@ -254,10 +254,10 @@
return changes, copies
def _obtainrevision(self, rev):
- self.ui.debug(_('obtaining revision %s...\n') % rev)
+ self.ui.debug('obtaining revision %s...\n' % rev)
output = self._execute('get', rev, self.tmppath)
self.checkexit(output)
- self.ui.debug(_('analyzing revision %s...\n') % rev)
+ self.ui.debug('analyzing revision %s...\n' % rev)
files = self._readcontents(self.tmppath)
self.changes[rev].add_files += files
--- a/hgext/convert/hg.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/convert/hg.py Fri Oct 16 11:19:39 2009 +0200
@@ -55,12 +55,12 @@
self.filemapmode = False
def before(self):
- self.ui.debug(_('run hg sink pre-conversion action\n'))
+ self.ui.debug('run hg sink pre-conversion action\n')
self.wlock = self.repo.wlock()
self.lock = self.repo.lock()
def after(self):
- self.ui.debug(_('run hg sink post-conversion action\n'))
+ self.ui.debug('run hg sink post-conversion action\n')
self.lock.release()
self.wlock.release()
@@ -248,8 +248,7 @@
return self.lastctx
def parents(self, ctx):
- return [p.node() for p in ctx.parents()
- if p and self.keep(p.node())]
+ return [p for p in ctx.parents() if p and self.keep(p.node())]
def getheads(self):
if self.rev:
@@ -275,20 +274,20 @@
if self.ignoreerrors:
# calling getcopies() is a simple way to detect missing
# revlogs and populate self.ignored
- self.getcopies(ctx, files)
+ self.getcopies(ctx, parents, files)
return [(f, rev) for f in files if f not in self.ignored], {}
if self._changescache and self._changescache[0] == rev:
m, a, r = self._changescache[1]
else:
- m, a, r = self.repo.status(parents[0], ctx.node())[:3]
+ m, a, r = self.repo.status(parents[0].node(), ctx.node())[:3]
# getcopies() detects missing revlogs early, run it before
# filtering the changes.
- copies = self.getcopies(ctx, m + a)
+ copies = self.getcopies(ctx, parents, m + a)
changes = [(name, rev) for name in m + a + r
if name not in self.ignored]
return sorted(changes), copies
- def getcopies(self, ctx, files):
+ def getcopies(self, ctx, parents, files):
copies = {}
for name in files:
if name in self.ignored:
@@ -297,6 +296,14 @@
copysource, copynode = ctx.filectx(name).renamed()
if copysource in self.ignored or not self.keep(copynode):
continue
+ # Ignore copy sources not in parent revisions
+ found = False
+ for p in parents:
+ if copysource in p:
+ found = True
+ break
+ if not found:
+ continue
copies[name] = copysource
except TypeError:
pass
@@ -309,7 +316,7 @@
def getcommit(self, rev):
ctx = self.changectx(rev)
- parents = [hex(p) for p in self.parents(ctx)]
+ parents = [p.hex() for p in self.parents(ctx)]
if self.saverev:
crev = rev
else:
@@ -332,7 +339,7 @@
changes = [], ctx.manifest().keys(), []
else:
i = i or 0
- changes = self.repo.status(parents[i], ctx.node())[:3]
+ changes = self.repo.status(parents[i].node(), ctx.node())[:3]
changes = [[f for f in l if f not in self.ignored] for l in changes]
if i == 0:
@@ -348,10 +355,10 @@
self.convertfp.flush()
def before(self):
- self.ui.debug(_('run hg source pre-conversion action\n'))
+ self.ui.debug('run hg source pre-conversion action\n')
def after(self):
- self.ui.debug(_('run hg source post-conversion action\n'))
+ self.ui.debug('run hg source post-conversion action\n')
def hasnativeorder(self):
return True
--- a/hgext/convert/p4.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/convert/p4.py Fri Oct 16 11:19:39 2009 +0200
@@ -53,7 +53,7 @@
def _parse_view(self, path):
"Read changes affecting the path"
cmd = 'p4 -G changes -s submitted "%s"' % path
- stdout = util.popen(cmd)
+ stdout = util.popen(cmd, mode='rb')
for d in loaditer(stdout):
c = d.get("change", None)
if c:
@@ -72,7 +72,7 @@
views = {"//": ""}
else:
cmd = 'p4 -G client -o "%s"' % path
- clientspec = marshal.load(util.popen(cmd))
+ clientspec = marshal.load(util.popen(cmd, mode='rb'))
views = {}
for client in clientspec:
@@ -105,7 +105,7 @@
lastid = None
for change in self.p4changes:
cmd = "p4 -G describe %s" % change
- stdout = util.popen(cmd)
+ stdout = util.popen(cmd, mode='rb')
d = marshal.load(stdout)
desc = self.recode(d["desc"])
@@ -147,7 +147,7 @@
def getfile(self, name, rev):
cmd = 'p4 -G print "%s#%s"' % (self.depotname[name], rev)
- stdout = util.popen(cmd)
+ stdout = util.popen(cmd, mode='rb')
mode = None
contents = ""
--- a/hgext/convert/subversion.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/convert/subversion.py Fri Oct 16 11:19:39 2009 +0200
@@ -22,6 +22,7 @@
from common import commandline, converter_source, converter_sink, mapfile
try:
+ raise ImportError("SVN support disabled due to license incompatibility")
from svn.core import SubversionException, Pool
import svn
import svn.client
@@ -114,7 +115,11 @@
def __iter__(self):
while True:
- entry = pickle.load(self._stdout)
+ try:
+ entry = pickle.load(self._stdout)
+ except EOFError:
+ raise util.Abort(_('Mercurial failed to run itself, check'
+ ' hg executable is in PATH'))
try:
orig_paths, revnum, author, date, message = entry
except:
@@ -152,11 +157,13 @@
def issvnurl(url):
try:
proto, path = url.split('://', 1)
- path = urllib.url2pathname(path)
+ if proto == 'file':
+ path = urllib.url2pathname(path)
except ValueError:
proto = 'file'
path = os.path.abspath(url)
- path = path.replace(os.sep, '/')
+ if proto == 'file':
+ path = path.replace(os.sep, '/')
check = protomap.get(proto, lambda p, p2: False)
while '/' in path:
if check(path, proto):
@@ -531,7 +538,7 @@
"""
if not path.startswith(self.rootmodule):
# Requests on foreign branches may be forbidden at server level
- self.ui.debug(_('ignoring foreign branch %r\n') % path)
+ self.ui.debug('ignoring foreign branch %r\n' % path)
return None
if not stop:
@@ -559,7 +566,7 @@
if not path.startswith(p) or not paths[p].copyfrom_path:
continue
newpath = paths[p].copyfrom_path + path[len(p):]
- self.ui.debug(_("branch renamed from %s to %s at %d\n") %
+ self.ui.debug("branch renamed from %s to %s at %d\n" %
(path, newpath, revnum))
path = newpath
break
@@ -567,7 +574,7 @@
stream.close()
if not path.startswith(self.rootmodule):
- self.ui.debug(_('ignoring foreign branch %r\n') % path)
+ self.ui.debug('ignoring foreign branch %r\n' % path)
return None
return self.revid(dirent.created_rev, path)
@@ -579,7 +586,7 @@
prevmodule = self.prevmodule
if prevmodule is None:
prevmodule = ''
- self.ui.debug(_("reparent to %s\n") % svnurl)
+ self.ui.debug("reparent to %s\n" % svnurl)
svn.ra.reparent(self.ra, svnurl)
self.prevmodule = module
return prevmodule
@@ -612,14 +619,14 @@
copyfrom_path = self.getrelpath(ent.copyfrom_path, pmodule)
if not copyfrom_path:
continue
- self.ui.debug(_("copied to %s from %s@%s\n") %
+ self.ui.debug("copied to %s from %s@%s\n" %
(entrypath, copyfrom_path, ent.copyfrom_rev))
copies[self.recode(entrypath)] = self.recode(copyfrom_path)
elif kind == 0: # gone, but had better be a deleted *file*
- self.ui.debug(_("gone from %s\n") % ent.copyfrom_rev)
+ self.ui.debug("gone from %s\n" % ent.copyfrom_rev)
pmodule, prevnum = self.revsplit(parents[0])[1:]
parentpath = pmodule + "/" + entrypath
- self.ui.debug(_("entry %s\n") % parentpath)
+ self.ui.debug("entry %s\n" % parentpath)
# We can avoid the reparent calls if the module has
# not changed but it probably does not worth the pain.
@@ -646,7 +653,7 @@
del copies[childpath]
entries.append(childpath)
else:
- self.ui.debug(_('unknown path in revision %d: %s\n') % \
+ self.ui.debug('unknown path in revision %d: %s\n' % \
(revnum, path))
elif kind == svn.core.svn_node_dir:
# If the directory just had a prop change,
@@ -679,7 +686,7 @@
if not copyfrompath:
continue
copyfrom[path] = ent
- self.ui.debug(_("mark %s came from %s:%d\n")
+ self.ui.debug("mark %s came from %s:%d\n"
% (path, copyfrompath, ent.copyfrom_rev))
children = self._find_children(ent.copyfrom_path, ent.copyfrom_rev)
children.sort()
@@ -703,7 +710,7 @@
"""Return the parsed commit object or None, and True if
the revision is a branch root.
"""
- self.ui.debug(_("parsing revision %d (%d changes)\n") %
+ self.ui.debug("parsing revision %d (%d changes)\n" %
(revnum, len(orig_paths)))
branched = False
@@ -732,7 +739,7 @@
self.ui.note(_('found parent of branch %s at %d: %s\n') %
(self.module, prevnum, prevmodule))
else:
- self.ui.debug(_("no copyfrom path, don't know what to do.\n"))
+ self.ui.debug("no copyfrom path, don't know what to do.\n")
paths = []
# filter out unrelated paths
@@ -785,7 +792,7 @@
lastonbranch = True
break
if not paths:
- self.ui.debug(_('revision %d has no entries\n') % revnum)
+ self.ui.debug('revision %d has no entries\n' % revnum)
continue
cset, lastonbranch = parselogentry(paths, revnum, author,
date, message)
@@ -867,7 +874,7 @@
return relative
# The path is outside our tracked tree...
- self.ui.debug(_('%r is not under %r, ignoring\n') % (path, module))
+ self.ui.debug('%r is not under %r, ignoring\n' % (path, module))
return None
def _checkpath(self, path, revnum):
--- a/hgext/extdiff.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/extdiff.py Fri Oct 16 11:19:39 2009 +0200
@@ -42,9 +42,9 @@
'''
from mercurial.i18n import _
-from mercurial.node import short
+from mercurial.node import short, nullid
from mercurial import cmdutil, util, commands
-import os, shlex, shutil, tempfile
+import os, shlex, shutil, tempfile, re
def snapshot(ui, repo, files, node, tmproot):
'''snapshot files as of some revision
@@ -69,7 +69,7 @@
for fn in files:
wfn = util.pconvert(fn)
if not wfn in ctx:
- # skipping new file after a merge ?
+ # File doesn't exist; could be a bogus modify
continue
ui.note(' %s\n' % wfn)
dest = os.path.join(base, wfn)
@@ -96,59 +96,102 @@
revs = opts.get('rev')
change = opts.get('change')
+ args = ' '.join(diffopts)
+ do3way = '$parent2' in args
if revs and change:
msg = _('cannot specify --rev and --change at the same time')
raise util.Abort(msg)
elif change:
node2 = repo.lookup(change)
- node1 = repo[node2].parents()[0].node()
+ node1a, node1b = repo.changelog.parents(node2)
else:
- node1, node2 = cmdutil.revpair(repo, revs)
+ node1a, node2 = cmdutil.revpair(repo, revs)
+ if not revs:
+ node1b = repo.dirstate.parents()[1]
+ else:
+ node1b = nullid
+
+ # Disable 3-way merge if there is only one parent
+ if do3way:
+ if node1b == nullid:
+ do3way = False
matcher = cmdutil.match(repo, pats, opts)
- modified, added, removed = repo.status(node1, node2, matcher)[:3]
- if not (modified or added or removed):
- return 0
+ mod_a, add_a, rem_a = map(set, repo.status(node1a, node2, matcher)[:3])
+ if do3way:
+ mod_b, add_b, rem_b = map(set, repo.status(node1b, node2, matcher)[:3])
+ else:
+ mod_b, add_b, rem_b = set(), set(), set()
+ modadd = mod_a | add_a | mod_b | add_b
+ common = modadd | rem_a | rem_b
+ if not common:
+ return 0
tmproot = tempfile.mkdtemp(prefix='extdiff.')
- dir2root = ''
try:
- # Always make a copy of node1
- dir1 = snapshot(ui, repo, modified + removed, node1, tmproot)[0]
- changes = len(modified) + len(removed) + len(added)
+ # Always make a copy of node1a (and node1b, if applicable)
+ dir1a_files = mod_a | rem_a | ((mod_b | add_b) - add_a)
+ dir1a = snapshot(ui, repo, dir1a_files, node1a, tmproot)[0]
+ if do3way:
+ dir1b_files = mod_b | rem_b | ((mod_a | add_a) - add_b)
+ dir1b = snapshot(ui, repo, dir1b_files, node1b, tmproot)[0]
+ else:
+ dir1b = None
+
+ fns_and_mtime = []
# If node2 in not the wc or there is >1 change, copy it
- if node2 or changes > 1:
- dir2, fns_and_mtime = snapshot(ui, repo, modified + added, node2, tmproot)
+ dir2root = ''
+ if node2:
+ dir2 = snapshot(ui, repo, modadd, node2, tmproot)[0]
+ elif len(common) > 1:
+ #we only actually need to get the files to copy back to the working
+ #dir in this case (because the other cases are: diffing 2 revisions
+ #or single file -- in which case the file is already directly passed
+ #to the diff tool).
+ dir2, fns_and_mtime = snapshot(ui, repo, modadd, None, tmproot)
else:
# This lets the diff tool open the changed file directly
dir2 = ''
dir2root = repo.root
- fns_and_mtime = []
# If only one change, diff the files instead of the directories
- if changes == 1 :
- if len(modified):
- dir1 = os.path.join(dir1, util.localpath(modified[0]))
- dir2 = os.path.join(dir2root, dir2, util.localpath(modified[0]))
- elif len(removed) :
- dir1 = os.path.join(dir1, util.localpath(removed[0]))
- dir2 = os.devnull
- else:
- dir1 = os.devnull
- dir2 = os.path.join(dir2root, dir2, util.localpath(added[0]))
+ # Handle bogus modifies correctly by checking if the files exist
+ if len(common) == 1:
+ common_file = util.localpath(common.pop())
+ dir1a = os.path.join(dir1a, common_file)
+ if not os.path.isfile(os.path.join(tmproot, dir1a)):
+ dir1a = os.devnull
+ if do3way:
+ dir1b = os.path.join(dir1b, common_file)
+ if not os.path.isfile(os.path.join(tmproot, dir1b)):
+ dir1b = os.devnull
+ dir2 = os.path.join(dir2root, dir2, common_file)
- cmdline = ('%s %s %s %s' %
- (util.shellquote(diffcmd), ' '.join(diffopts),
- util.shellquote(dir1), util.shellquote(dir2)))
- ui.debug(_('running %r in %s\n') % (cmdline, tmproot))
+ # Function to quote file/dir names in the argument string
+ # When not operating in 3-way mode, an empty string is returned for parent2
+ replace = dict(parent=dir1a, parent1=dir1a, parent2=dir1b, child=dir2)
+ def quote(match):
+ key = match.group()[1:]
+ if not do3way and key == 'parent2':
+ return ''
+ return util.shellquote(replace[key])
+
+ # Match parent2 first, so 'parent1?' will match both parent1 and parent
+ regex = '\$(parent2|parent1?|child)'
+ if not do3way and not re.search(regex, args):
+ args += ' $parent1 $child'
+ args = re.sub(regex, quote, args)
+ cmdline = util.shellquote(diffcmd) + ' ' + args
+
+ ui.debug('running %r in %s\n' % (cmdline, tmproot))
util.system(cmdline, cwd=tmproot)
for copy_fn, working_fn, mtime in fns_and_mtime:
if os.path.getmtime(copy_fn) != mtime:
- ui.debug(_('file changed while diffing. '
- 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn))
+ ui.debug('file changed while diffing. '
+ 'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn))
util.copyfile(copy_fn, working_fn)
return 1
@@ -173,11 +216,11 @@
that revision is compared to the working directory, and, when no
revisions are specified, the working directory files are compared
to its parent.'''
- program = opts['program'] or 'diff'
- if opts['program']:
- option = opts['option']
- else:
- option = opts['option'] or ['-Npru']
+ program = opts.get('program')
+ option = opts.get('option')
+ if not program:
+ program = 'diff'
+ option = option or ['-Npru']
return dodiff(ui, repo, program, option, pats, opts)
cmdtable = {
--- a/hgext/hgcia.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/hgcia.py Fri Oct 16 11:19:39 2009 +0200
@@ -229,10 +229,10 @@
n = bin(node)
cia = hgcia(ui, repo)
if not cia.user:
- ui.debug(_('cia: no user specified'))
+ ui.debug('cia: no user specified')
return
if not cia.project:
- ui.debug(_('cia: no project specified'))
+ ui.debug('cia: no project specified')
return
if hooktype == 'changegroup':
start = repo.changelog.rev(n)
--- a/hgext/hgk.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/hgk.py Fri Oct 16 11:19:39 2009 +0200
@@ -308,7 +308,7 @@
os.chdir(repo.root)
optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
- ui.debug(_("running %s\n") % cmd)
+ ui.debug("running %s\n" % cmd)
util.system(cmd)
cmdtable = {
--- a/hgext/inotify/__init__.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/inotify/__init__.py Fri Oct 16 11:19:39 2009 +0200
@@ -17,28 +17,7 @@
def serve(ui, repo, **opts):
'''start an inotify server for this repository'''
- timeout = opts.get('timeout')
- if timeout:
- timeout = float(timeout) * 1e3
-
- class service(object):
- def init(self):
- try:
- self.master = server.master(ui, repo.dirstate,
- repo.root, timeout)
- except server.AlreadyStartedException, inst:
- raise util.Abort(str(inst))
-
- def run(self):
- try:
- self.master.run()
- finally:
- self.master.shutdown()
-
- service = service()
- logfile = ui.config('inotify', 'log')
- cmdutil.service(opts, initfn=service.init, runfn=service.run,
- logfile=logfile)
+ server.start(ui, repo.dirstate, repo.root, opts)
def debuginotify(ui, repo, **opts):
'''debugging information for inotify extension
--- a/hgext/inotify/client.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/inotify/client.py Fri Oct 16 11:19:39 2009 +0200
@@ -31,10 +31,11 @@
'removing it)\n'))
os.unlink(os.path.join(self.root, '.hg', 'inotify.sock'))
if err[0] in (errno.ECONNREFUSED, errno.ENOENT) and autostart:
- self.ui.debug(_('(starting inotify server)\n'))
+ self.ui.debug('(starting inotify server)\n')
try:
try:
- server.start(self.ui, self.dirstate, self.root)
+ server.start(self.ui, self.dirstate, self.root,
+ dict(daemon=True, daemon_pipefds=''))
except server.AlreadyStartedException, inst:
# another process may have started its own
# inotify server while this one was starting.
@@ -50,7 +51,7 @@
'server: %s\n') % err[-1])
elif err[0] in (errno.ECONNREFUSED, errno.ENOENT):
# silently ignore normal errors if autostart is False
- self.ui.debug(_('(inotify server not running)\n'))
+ self.ui.debug('(inotify server not running)\n')
else:
self.ui.warn(_('failed to contact inotify server: %s\n')
% err[-1])
--- a/hgext/inotify/server.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/inotify/server.py Fri Oct 16 11:19:39 2009 +0200
@@ -7,7 +7,7 @@
# GNU General Public License version 2, incorporated herein by reference.
from mercurial.i18n import _
-from mercurial import osutil, util
+from mercurial import cmdutil, osutil, util
import common
import errno, os, select, socket, stat, struct, sys, tempfile, time
@@ -823,52 +823,29 @@
sys.exit(0)
pollable.run()
-def start(ui, dirstate, root):
- def closefds(ignore):
- # (from python bug #1177468)
- # close all inherited file descriptors
- # Python 2.4.1 and later use /dev/urandom to seed the random module's RNG
- # a file descriptor is kept internally as os._urandomfd (created on demand
- # the first time os.urandom() is called), and should not be closed
- try:
- os.urandom(4)
- urandom_fd = getattr(os, '_urandomfd', None)
- except AttributeError:
- urandom_fd = None
- ignore.append(urandom_fd)
- for fd in range(3, 256):
- if fd in ignore:
- continue
+def start(ui, dirstate, root, opts):
+ timeout = opts.get('timeout')
+ if timeout:
+ timeout = float(timeout) * 1e3
+
+ class service(object):
+ def init(self):
try:
- os.close(fd)
- except OSError:
- pass
-
- m = master(ui, dirstate, root)
- sys.stdout.flush()
- sys.stderr.flush()
+ self.master = master(ui, dirstate, root, timeout)
+ except AlreadyStartedException, inst:
+ raise util.Abort(str(inst))
- pid = os.fork()
- if pid:
- return pid
-
- closefds(pollable.instances.keys())
- os.setsid()
-
- fd = os.open('/dev/null', os.O_RDONLY)
- os.dup2(fd, 0)
- if fd > 0:
- os.close(fd)
+ def run(self):
+ try:
+ self.master.run()
+ finally:
+ self.master.shutdown()
- fd = os.open(ui.config('inotify', 'log', '/dev/null'),
- os.O_RDWR | os.O_CREAT | os.O_TRUNC)
- os.dup2(fd, 1)
- os.dup2(fd, 2)
- if fd > 2:
- os.close(fd)
+ runargs = None
+ if 'inserve' not in sys.argv:
+ runargs = [sys.argv[0], 'inserve', '-R', root]
- try:
- m.run()
- finally:
- m.shutdown()
- os._exit(0)
+ service = service()
+ logfile = ui.config('inotify', 'log')
+ cmdutil.service(opts, initfn=service.init, runfn=service.run,
+ logfile=logfile, runargs=runargs)
--- a/hgext/keyword.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/keyword.py Fri Oct 16 11:19:39 2009 +0200
@@ -244,12 +244,14 @@
return t2 != text
return revlog.revlog.cmp(self, node, text)
-def _status(ui, repo, kwt, unknown, *pats, **opts):
+def _status(ui, repo, kwt, *pats, **opts):
'''Bails out if [keyword] configuration is not active.
Returns status of working directory.'''
if kwt:
- match = cmdutil.match(repo, pats, opts)
- return repo.status(match=match, unknown=unknown, clean=True)
+ unknown = (opts.get('unknown') or opts.get('all')
+ or opts.get('untracked'))
+ return repo.status(match=cmdutil.match(repo, pats, opts), clean=True,
+ unknown=unknown)
if ui.configitems('keyword'):
raise util.Abort(_('[keyword] patterns cannot match'))
raise util.Abort(_('no [keyword] patterns configured'))
@@ -259,7 +261,7 @@
if repo.dirstate.parents()[1] != nullid:
raise util.Abort(_('outstanding uncommitted merge'))
kwt = kwtools['templater']
- status = _status(ui, repo, kwt, False, *pats, **opts)
+ status = _status(ui, repo, kwt, *pats, **opts)
modified, added, removed, deleted = status[:4]
if modified or added or removed or deleted:
raise util.Abort(_('outstanding uncommitted changes'))
@@ -354,7 +356,7 @@
repo.commit(text=msg)
ui.status(_('\n\tkeywords expanded\n'))
ui.write(repo.wread(fn))
- ui.debug(_('\nremoving temporary repository %s\n') % tmpdir)
+ ui.debug('\nremoving temporary repository %s\n' % tmpdir)
shutil.rmtree(tmpdir, ignore_errors=True)
def expand(ui, repo, *pats, **opts):
@@ -380,30 +382,32 @@
See "hg help keyword" on how to construct patterns both for
inclusion and exclusion of files.
- Use -u/--untracked to list untracked files as well.
-
- With -a/--all and -v/--verbose the codes used to show the status
+ With -A/--all and -v/--verbose the codes used to show the status
of files are::
K = keyword expansion candidate
- k = keyword expansion candidate (untracked)
+ k = keyword expansion candidate (not tracked)
I = ignored
- i = ignored (untracked)
+ i = ignored (not tracked)
'''
kwt = kwtools['templater']
- status = _status(ui, repo, kwt, opts.get('untracked'), *pats, **opts)
+ status = _status(ui, repo, kwt, *pats, **opts)
+ cwd = pats and repo.getcwd() or ''
modified, added, removed, deleted, unknown, ignored, clean = status
- files = sorted(modified + added + clean)
+ files = []
+ if not (opts.get('unknown') or opts.get('untracked')) or opts.get('all'):
+ files = sorted(modified + added + clean)
wctx = repo[None]
kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)]
- kwuntracked = [f for f in unknown if kwt.iskwfile(f, wctx.flags)]
- cwd = pats and repo.getcwd() or ''
- kwfstats = (not opts.get('ignore') and
- (('K', kwfiles), ('k', kwuntracked),) or ())
+ kwunknown = [f for f in unknown if kwt.iskwfile(f, wctx.flags)]
+ if not opts.get('ignore') or opts.get('all'):
+ showfiles = kwfiles, kwunknown
+ else:
+ showfiles = [], []
if opts.get('all') or opts.get('ignore'):
- kwfstats += (('I', [f for f in files if f not in kwfiles]),
- ('i', [f for f in unknown if f not in kwuntracked]),)
- for char, filenames in kwfstats:
+ showfiles += ([f for f in files if f not in kwfiles],
+ [f for f in unknown if f not in kwunknown])
+ for char, filenames in zip('KkIi', showfiles):
fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
for f in filenames:
ui.write(fmt % repo.pathto(f, cwd))
@@ -545,9 +549,12 @@
_('hg kwexpand [OPTION]... [FILE]...')),
'kwfiles':
(files,
- [('a', 'all', None, _('show keyword status flags of all files')),
+ [('A', 'all', None, _('show keyword status flags of all files')),
('i', 'ignore', None, _('show files excluded from expansion')),
- ('u', 'untracked', None, _('additionally show untracked files')),
+ ('u', 'unknown', None, _('only show unknown (not tracked) files')),
+ ('a', 'all', None,
+ _('show keyword status flags of all files (DEPRECATED)')),
+ ('u', 'untracked', None, _('only show untracked files (DEPRECATED)')),
] + commands.walkopts,
_('hg kwfiles [OPTION]... [FILE]...')),
'kwshrink': (shrink, commands.walkopts,
--- a/hgext/mq.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/mq.py Fri Oct 16 11:19:39 2009 +0200
@@ -321,7 +321,7 @@
if bad:
raise util.Abort(bad)
guards = sorted(set(guards))
- self.ui.debug(_('active guards: %s\n') % ' '.join(guards))
+ self.ui.debug('active guards: %s\n' % ' '.join(guards))
self.active_guards = guards
self.guards_dirty = True
@@ -997,6 +997,8 @@
self.ui.warn(_('done\n'))
raise
+ if not self.applied:
+ return ret[0]
top = self.applied[-1].name
if ret[0] and ret[0] > 1:
msg = _("errors during apply, please fix and refresh %s\n")
@@ -2618,7 +2620,7 @@
(pop,
[('a', 'all', None, _('pop all patches')),
('n', 'name', '', _('queue name to pop')),
- ('f', 'force', None, _('forget any local changes'))],
+ ('f', 'force', None, _('forget any local changes to patched files'))],
_('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')),
"^qpush":
(push,
--- a/hgext/notify.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/notify.py Fri Oct 16 11:19:39 2009 +0200
@@ -43,6 +43,7 @@
diffstat = True # add a diffstat before the diff content
sources = serve # notify if source of incoming changes in this list
# (serve == ssh or http, push, pull, bundle)
+ merge = False # send notification for merges (default True)
[email]
from = user@host.com # email address to send as if none given
[web]
@@ -111,6 +112,7 @@
self.test = self.ui.configbool('notify', 'test', True)
self.charsets = mail._charsets(self.ui)
self.subs = self.subscribers()
+ self.merge = self.ui.configbool('notify', 'merge', True)
mapfile = self.ui.config('notify', 'style')
template = (self.ui.config('notify', hooktype) or
@@ -165,11 +167,14 @@
def url(self, path=None):
return self.ui.config('web', 'baseurl') + (path or self.root)
- def node(self, ctx):
- '''format one changeset.'''
+ def node(self, ctx, **props):
+ '''format one changeset, unless it is a suppressed merge.'''
+ if not self.merge and len(ctx.parents()) > 1:
+ return False
self.t.show(ctx, changes=ctx.changeset(),
baseurl=self.ui.config('web', 'baseurl'),
- root=self.repo.root, webroot=self.root)
+ root=self.repo.root, webroot=self.root, **props)
+ return True
def skipsource(self, source):
'''true if incoming changes from this source should be skipped.'''
@@ -276,23 +281,36 @@
ctx = repo[node]
if not n.subs:
- ui.debug(_('notify: no subscribers to repository %s\n') % n.root)
+ ui.debug('notify: no subscribers to repository %s\n' % n.root)
return
if n.skipsource(source):
- ui.debug(_('notify: changes have source "%s" - skipping\n') % source)
+ ui.debug('notify: changes have source "%s" - skipping\n' % source)
return
ui.pushbuffer()
+ data = ''
+ count = 0
if hooktype == 'changegroup':
start, end = ctx.rev(), len(repo)
- count = end - start
for rev in xrange(start, end):
- n.node(repo[rev])
- n.diff(ctx, repo['tip'])
+ if n.node(repo[rev]):
+ count += 1
+ else:
+ data += ui.popbuffer()
+ ui.note(_('notify: suppressing notification for merge %d:%s\n') %
+ (rev, repo[rev].hex()[:12]))
+ ui.pushbuffer()
+ if count:
+ n.diff(ctx, repo['tip'])
else:
- count = 1
- n.node(ctx)
+ if not n.node(ctx):
+ ui.popbuffer()
+ ui.note(_('notify: suppressing notification for merge %d:%s\n') %
+ (ctx.rev(), ctx.hex()[:12]))
+ return
+ count += 1
n.diff(ctx)
- data = ui.popbuffer()
- n.send(ctx, count, data)
+ data += ui.popbuffer()
+ if count:
+ n.send(ctx, count, data)
--- a/hgext/rebase.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/rebase.py Fri Oct 16 11:19:39 2009 +0200
@@ -35,7 +35,7 @@
if not first:
ancestor.ancestor = newancestor
else:
- repo.ui.debug(_("first revision, do not change ancestor\n"))
+ repo.ui.debug("first revision, do not change ancestor\n")
stats = merge.update(repo, rev, True, True, False)
return stats
@@ -149,7 +149,7 @@
"""Skip commit if collapsing has been required and rev is not the last
revision, commit otherwise
"""
- repo.ui.debug(_(" set parents\n"))
+ repo.ui.debug(" set parents\n")
if collapse and not last:
repo.dirstate.setparents(repo[p1].node())
return None
@@ -187,23 +187,23 @@
def rebasenode(repo, rev, target, state, skipped, targetancestors, collapse,
extrafn):
'Rebase a single revision'
- repo.ui.debug(_("rebasing %d:%s\n") % (rev, repo[rev]))
+ repo.ui.debug("rebasing %d:%s\n" % (rev, repo[rev]))
p1, p2 = defineparents(repo, rev, target, state, targetancestors)
- repo.ui.debug(_(" future parents are %d and %d\n") % (repo[p1].rev(),
+ repo.ui.debug(" future parents are %d and %d\n" % (repo[p1].rev(),
repo[p2].rev()))
# Merge phase
if len(repo.parents()) != 2:
# Update to target and merge it with local
if repo['.'].rev() != repo[p1].rev():
- repo.ui.debug(_(" update to %d:%s\n") % (repo[p1].rev(), repo[p1]))
+ repo.ui.debug(" update to %d:%s\n" % (repo[p1].rev(), repo[p1]))
merge.update(repo, p1, False, True, False)
else:
- repo.ui.debug(_(" already in target\n"))
+ repo.ui.debug(" already in target\n")
repo.dirstate.write()
- repo.ui.debug(_(" merge against %d:%s\n") % (repo[rev].rev(), repo[rev]))
+ repo.ui.debug(" merge against %d:%s\n" % (repo[rev].rev(), repo[rev]))
first = repo[rev].rev() == repo[min(state)].rev()
stats = rebasemerge(repo, rev, first)
@@ -211,7 +211,7 @@
raise util.Abort(_('fix unresolved conflicts with hg resolve then '
'run hg rebase --continue'))
else: # we have an interrupted rebase
- repo.ui.debug(_('resuming interrupted rebase\n'))
+ repo.ui.debug('resuming interrupted rebase\n')
# Keep track of renamed files in the revision that is going to be rebased
# Here we simulate the copies and renames in the source changeset
@@ -234,7 +234,7 @@
else:
if not collapse:
repo.ui.note(_('no changes, revision %d skipped\n') % rev)
- repo.ui.debug(_('next revision set to %s\n') % p1)
+ repo.ui.debug('next revision set to %s\n' % p1)
skipped.add(rev)
state[rev] = p1
@@ -280,7 +280,7 @@
mqrebase = {}
for p in repo.mq.applied:
if repo[p.rev].rev() in state:
- repo.ui.debug(_('revision %d is an mq patch (%s), finalize it.\n') %
+ repo.ui.debug('revision %d is an mq patch (%s), finalize it.\n' %
(repo[p.rev].rev(), p.name))
mqrebase[repo[p.rev].rev()] = (p.name, isagitpatch(repo, p.name))
@@ -290,7 +290,7 @@
# We must start import from the newest revision
for rev in sorted(mqrebase, reverse=True):
if rev not in skipped:
- repo.ui.debug(_('import mq patch %d (%s)\n')
+ repo.ui.debug('import mq patch %d (%s)\n'
% (state[rev], mqrebase[rev][0]))
repo.mq.qimport(repo, (), patchname=mqrebase[rev][0],
git=mqrebase[rev][1],rev=[str(state[rev])])
@@ -311,7 +311,7 @@
newrev = repo[v].hex()
f.write("%s:%s\n" % (oldrev, newrev))
f.close()
- repo.ui.debug(_('rebase status stored\n'))
+ repo.ui.debug('rebase status stored\n')
def clearstatus(repo):
'Remove the status files'
@@ -342,7 +342,7 @@
else:
oldrev, newrev = l.split(':')
state[repo[oldrev].rev()] = repo[newrev].rev()
- repo.ui.debug(_('rebase status resumed\n'))
+ repo.ui.debug('rebase status resumed\n')
return originalwd, target, state, collapse, keep, keepbranches, external
except IOError, err:
if err.errno != errno.ENOENT:
@@ -381,9 +381,9 @@
if src:
commonbase = repo[src].ancestor(repo[dest])
if commonbase == repo[src]:
- raise util.Abort(_('cannot rebase an ancestor'))
+ raise util.Abort(_('source is ancestor of destination'))
if commonbase == repo[dest]:
- raise util.Abort(_('cannot rebase a descendant'))
+ raise util.Abort(_('source is descendant of destination'))
source = repo[src].rev()
else:
if base:
@@ -392,20 +392,24 @@
cwd = repo['.'].rev()
if cwd == dest:
- repo.ui.debug(_('already working on current\n'))
+ repo.ui.debug('source and destination are the same\n')
return None
targetancestors = set(repo.changelog.ancestors(dest))
if cwd in targetancestors:
- repo.ui.debug(_('already working on the current branch\n'))
+ repo.ui.debug('source is ancestor of destination\n')
return None
cwdancestors = set(repo.changelog.ancestors(cwd))
+ if dest in cwdancestors:
+ repo.ui.debug('source is descendant of destination\n')
+ return None
+
cwdancestors.add(cwd)
rebasingbranch = cwdancestors - targetancestors
source = min(rebasingbranch)
- repo.ui.debug(_('rebase onto %d starting from %d\n') % (dest, source))
+ repo.ui.debug('rebase onto %d starting from %d\n' % (dest, source))
state = dict.fromkeys(repo.changelog.descendants(source), nullrev)
external = nullrev
if collapse:
@@ -429,8 +433,8 @@
if opts.get('rebase'):
if opts.get('update'):
del opts['update']
- ui.debug(_('--update and --rebase are not compatible, ignoring '
- 'the update flag\n'))
+ ui.debug('--update and --rebase are not compatible, ignoring '
+ 'the update flag\n')
cmdutil.bail_if_changed(repo)
revsprepull = len(repo)
@@ -460,9 +464,9 @@
('s', 'source', '', _('rebase from a given revision')),
('b', 'base', '', _('rebase from the base of a given revision')),
('d', 'dest', '', _('rebase onto a given revision')),
- ('', 'collapse', False, _('collapse the rebased revisions')),
- ('', 'keep', False, _('keep original revisions')),
- ('', 'keepbranches', False, _('keep original branches')),
+ ('', 'collapse', False, _('collapse the rebased changesets')),
+ ('', 'keep', False, _('keep original changesets')),
+ ('', 'keepbranches', False, _('keep original branch names')),
('c', 'continue', False, _('continue an interrupted rebase')),
('a', 'abort', False, _('abort an interrupted rebase')),] +
templateopts,
--- a/hgext/record.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/record.py Fri Oct 16 11:19:39 2009 +0200
@@ -463,7 +463,7 @@
fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
dir=backupdir)
os.close(fd)
- ui.debug(_('backup %r as %r\n') % (f, tmpname))
+ ui.debug('backup %r as %r\n' % (f, tmpname))
util.copyfile(repo.wjoin(f), tmpname)
backups[f] = tmpname
@@ -481,7 +481,7 @@
# 3b. (apply)
if dopatch:
try:
- ui.debug(_('applying patch\n'))
+ ui.debug('applying patch\n')
ui.debug(fp.getvalue())
pfiles = {}
patch.internalpatch(fp, ui, 1, repo.root, files=pfiles,
@@ -512,7 +512,7 @@
# 5. finally restore backed-up files
try:
for realname, tmpname in backups.iteritems():
- ui.debug(_('restoring %r to %r\n') % (tmpname, realname))
+ ui.debug('restoring %r to %r\n' % (tmpname, realname))
util.copyfile(tmpname, repo.wjoin(realname))
os.unlink(tmpname)
os.rmdir(backupdir)
--- a/hgext/win32mbcs.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/win32mbcs.py Fri Oct 16 11:19:39 2009 +0200
@@ -142,6 +142,6 @@
for f in funcs.split():
wrapname(f, wrapper)
wrapname("mercurial.osutil.listdir", wrapperforlistdir)
- ui.debug(_("[win32mbcs] activated with encoding: %s\n")
+ ui.debug("[win32mbcs] activated with encoding: %s\n"
% encoding.encoding)
--- a/hgext/zeroconf/__init__.py Fri Oct 16 11:18:38 2009 +0200
+++ b/hgext/zeroconf/__init__.py Fri Oct 16 11:19:39 2009 +0200
@@ -109,12 +109,13 @@
def __init__(self, conf, baseui=None):
super(hgwebdirzc, self).__init__(conf, baseui)
prefix = self.ui.config("web", "prefix", "").strip('/') + '/'
- for r, p in self.repos:
+ for repo, path in self.repos:
u = self.ui.copy()
- u.readconfig(os.path.join(p, '.hg', 'hgrc'))
- n = os.path.basename(r)
- path = (prefix + r).strip('/')
- publish(n, "hgweb", path, int(u.config("web", "port", 8000)))
+ u.readconfig(os.path.join(path, '.hg', 'hgrc'))
+ name = os.path.basename(repo)
+ path = (prefix + repo).strip('/')
+ desc = u.config('web', 'description', name)
+ publish(name, desc, path, int(u.config("web", "port", 8000)))
# listen
@@ -136,25 +137,24 @@
Zeroconf.ServiceBrowser(server, "_hg._tcp.local.", l)
time.sleep(1)
server.close()
- for v in l.found.values():
- n = v.name[:v.name.index('.')]
- n.replace(" ", "-")
- u = "http://%s:%s%s" % (socket.inet_ntoa(v.address), v.port,
- v.properties.get("path", "/"))
- yield "zc-" + n, u
+ for value in l.found.values():
+ name = value.name[:value.name.index('.')]
+ url = "http://%s:%s%s" % (socket.inet_ntoa(value.address), value.port,
+ value.properties.get("path", "/"))
+ yield "zc-" + name, url
def config(orig, self, section, key, default=None, untrusted=False):
if section == "paths" and key.startswith("zc-"):
- for n, p in getzcpaths():
- if n == key:
- return p
+ for name, path in getzcpaths():
+ if name == key:
+ return path
return orig(self, section, key, default, untrusted)
def configitems(orig, self, section, untrusted=False):
- r = orig(self, section, untrusted)
+ repos = orig(self, section, untrusted)
if section == "paths":
- r += getzcpaths()
- return r
+ repos += getzcpaths()
+ return repos
extensions.wrapfunction(ui.ui, 'config', config)
extensions.wrapfunction(ui.ui, 'configitems', configitems)
--- a/i18n/da.po Fri Oct 16 11:18:38 2009 +0200
+++ b/i18n/da.po Fri Oct 16 11:19:39 2009 +0200
@@ -17,8 +17,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2009-07-20 23:05+0200\n"
-"PO-Revision-Date: 2009-07-21 00:18+0200\n"
+"POT-Creation-Date: 2009-09-29 00:26+0200\n"
+"PO-Revision-Date: 2009-09-29 00:41+0200\n"
"Last-Translator: <mg@lazybytes.net>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
@@ -36,8 +36,12 @@
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 @@
"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 @@
" # (\"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 @@
"\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 @@
"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 @@
"\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 @@
" version=3.0\n"
" bzuser=unknown@domain.com\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 @@
" [usermap]\n"
" user@emaildomain.com=user.name@bugzilladomain.com\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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
"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 @@
"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 @@
" - 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 @@
" 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 @@
"\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 @@
"\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 @@
" 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 @@
" 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 @@
" --config convert.p4.startrev=0 (perforce changelist number)\n"
" specify initial Perforce revision.\n"
"\n"
-"\n"
" Mercurial Destination\n"
" ---------------------\n"
"\n"
@@ -1007,7 +1041,8 @@
#, python-format
msgid ""
"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
-msgstr "uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)"
+msgstr ""
+"uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)"
#, python-format
msgid "%d bytes missing from remote file"
@@ -1086,6 +1121,10 @@
msgid "%d changeset entries\n"
msgstr "%d ændringer\n"
+#, python-format
+msgid "darcs version 2.1 or newer needed (found %r)"
+msgstr ""
+
msgid "Python ElementTree module is not available"
msgstr "Python ElementTree modulet er ikke tilstede"
@@ -1330,14 +1369,14 @@
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"
@@ -1353,14 +1392,13 @@
" 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 ""
@@ -1419,6 +1457,21 @@
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]..."
@@ -1492,10 +1545,6 @@
msgstr "sammenføjer med %d:%s\n"
#, python-format
-msgid "Automated merge with %s"
-msgstr "Automatisk sammenføjning med %s"
-
-#, python-format
msgid "new changeset %d:%s merges remote changes with local\n"
msgstr "ny ændring %d:%s fletter fjernændringer sammen med lokale\n"
@@ -1576,10 +1625,6 @@
"arbejdskopien af .hgsigs er ændret (deponer venligst .hgsigs manuelt eller "
"brug --force)"
-#, python-format
-msgid "Added signature for changeset %s"
-msgstr "Tilføjede underskrift af ændring %s"
-
msgid "unknown signature version"
msgstr "ukendt underskrift-version"
@@ -1655,38 +1700,38 @@
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:cia@cia.vc\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:cia@cia.vc\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
@@ -1717,19 +1762,19 @@
"\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"
@@ -1819,10 +1864,10 @@
"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 ""
@@ -1831,10 +1876,10 @@
"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"
@@ -1949,10 +1994,6 @@
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 ""
@@ -2021,12 +2062,12 @@
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"
@@ -2056,20 +2097,22 @@
"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"
@@ -2088,8 +2131,8 @@
"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
@@ -2112,10 +2155,12 @@
" 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 ""
@@ -2123,25 +2168,50 @@
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
@@ -2168,8 +2238,8 @@
" [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"
@@ -2177,11 +2247,12 @@
" 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 ""
@@ -2232,19 +2303,18 @@
"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"
@@ -2257,19 +2327,18 @@
"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"
@@ -2503,6 +2572,10 @@
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"
@@ -2619,9 +2692,15 @@
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"
@@ -2738,15 +2817,9 @@
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"
@@ -3095,8 +3168,11 @@
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"
@@ -3239,17 +3315,17 @@
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]..."
@@ -3317,8 +3393,11 @@
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"
@@ -3329,65 +3408,66 @@
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 = user@host.com # 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 = user@host.com # 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
@@ -3423,7 +3503,7 @@
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"
@@ -3432,19 +3512,19 @@
"$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"
@@ -3461,15 +3541,15 @@
"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"
@@ -3485,11 +3565,9 @@
"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"
@@ -3500,7 +3578,7 @@
"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"
@@ -3523,13 +3601,13 @@
"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"
@@ -3539,7 +3617,7 @@
"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"
@@ -3579,23 +3657,24 @@
" 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"
@@ -3674,6 +3753,9 @@
msgid "message identifier to reply to"
msgstr ""
+msgid "flags to add in subject prefixes"
+msgstr ""
+
msgid "email addresses of recipients"
msgstr ""
@@ -3714,13 +3796,16 @@
" 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"
@@ -3770,7 +3855,7 @@
"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"
@@ -3789,22 +3874,22 @@
msgstr ""
msgid "cannot use both abort and continue"
-msgstr ""
+msgstr "abort og continue kan ikke angives samtidig"
msgid "cannot use collapse with continue or abort"
-msgstr ""
+msgstr "continue eller abort kan ikke angives samtidig med collapse"
msgid "abort and continue do not allow specifying revisions"
-msgstr ""
+msgstr "abort og continue tillader ikke at der angives revisioner"
msgid "cannot specify both a revision and a base"
-msgstr ""
+msgstr "man kan ikke angive både en revision og en basis"
msgid "nothing to rebase\n"
msgstr ""
msgid "cannot use both keepbranches and extrafn"
-msgstr ""
+msgstr "man kan ikke bruge både keepbranches og extrafn"
msgid "rebase merging completed\n"
msgstr ""
@@ -3817,7 +3902,7 @@
#, python-format
msgid "%d revisions have been skipped\n"
-msgstr ""
+msgstr "sprang %d revisioner over\n"
msgid " set parents\n"
msgstr ""
@@ -3981,30 +4066,9 @@
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"
@@ -4015,6 +4079,9 @@
msgid " and "
msgstr " og "
+msgid "y"
+msgstr ""
+
#, python-format
msgid "record this change to %r?"
msgstr "optag denne ændring i %r?"
@@ -4034,19 +4101,19 @@
" 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"
@@ -4162,9 +4229,9 @@
"\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"
@@ -4255,19 +4322,22 @@
"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"
@@ -4275,7 +4345,7 @@
msgstr ""
#, python-format
-msgid "[win32mbcs] filename conversion fail with %s encoding\n"
+msgid "[win32mbcs] filename conversion failed with %s encoding\n"
msgstr ""
msgid "[win32mbcs] cannot activate on this platform.\n"
@@ -4288,31 +4358,31 @@
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
@@ -4358,15 +4428,15 @@
"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"
@@ -4661,19 +4731,34 @@
" 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"
-" "
-msgstr ""
+" 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"
+"\n"
+" Tilføj alle nye filer og fjern alle manglende filer fra depotet.\n"
+"\n"
+" Nye filer bliver ignoreret hvis de matcher et af mønstrene i\n"
+" .hgignore. Som ved add, så træder disse ændringer først i kræft\n"
+" ved næste commit.\n"
+"\n"
+" Brug -s/--similarity tilvalget for at opdage omdøbte filer. Med en\n"
+" parameter større end 0 bliver hver fjernet fil sammenlignet med\n"
+" enhver tilføjet fil og filer der er tilstrækkelig ens bliver\n"
+" opført som omdøbte. Dette tilvalg tager et procenttal mellem 0\n"
+" (slået fra) og 100 (filer skal være identiske) som parameter. At\n"
+" opdage omdøbninger på denne måde kan være dyrt.\n"
+" "
msgid "similarity must be a number"
-msgstr ""
+msgstr "lighedsgrad skal være et tal"
msgid "similarity must be between 0 and 100"
-msgstr ""
+msgstr "lighedsgrad skal være mellem 0 og 100"
msgid ""
"show changeset information by line for each file\n"
@@ -4705,10 +4790,10 @@
" "
msgid "at least one filename or pattern is required"
-msgstr ""
+msgstr "kræver mindst et filnavn eller mønster"
msgid "at least one of -n/-c is required for -l"
-msgstr ""
+msgstr "brug af -l kræver mindst en af -n/-c"
#, python-format
msgid "%s: binary file\n"
@@ -4721,14 +4806,14 @@
" 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"
@@ -4744,10 +4829,10 @@
msgstr "intet arbejdskatalog: angive venligst en revision"
msgid "repository root cannot be destination"
-msgstr ""
+msgstr "depotets rod kan ikke bruges som destination"
msgid "cannot archive plain files to stdout"
-msgstr ""
+msgstr "flade filer kan ikke arkiveres til standarduddata"
msgid ""
"reverse effect of earlier changeset\n"
@@ -4806,11 +4891,7 @@
msgstr "%s er ikke forælder til %s"
msgid "cannot use --parent on non-merge changeset"
-msgstr ""
-
-#, python-format
-msgid "Backed out changeset %s"
-msgstr ""
+msgstr "kan ikke bruge --parent på en ændringer som ikke er en sammenføjning"
#, python-format
msgid "changeset %s backs out changeset %s\n"
@@ -4824,7 +4905,7 @@
msgstr ""
msgid "(use \"backout --merge\" if you want to auto-merge)\n"
-msgstr ""
+msgstr "(brug \"backout --merge\" hvis du vil sammenføje automatisk)\n"
msgid ""
"subdivision search of changesets\n"
@@ -4872,7 +4953,7 @@
msgstr ""
msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
-msgstr ""
+msgstr "(formen 'hg bisect <kommando>' er forældet)\n"
msgid "incompatible arguments"
msgstr "inkompatible argumenter"
@@ -4883,7 +4964,7 @@
#, python-format
msgid "failed to execute %s"
-msgstr ""
+msgstr "kunne ikke køre %s"
#, python-format
msgid "%s killed"
@@ -4894,8 +4975,8 @@
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"
@@ -4917,10 +4998,27 @@
" 'hg commit --close-branch' to mark this branch as closed.\n"
" "
msgstr ""
+"angiv eller vis navnet på den aktuelle gren\n"
+"\n"
+" Uden noget argument vises navnet på den nuværende gren. Med et\n"
+" argument angives arbejdskatalogets grennavn (grenen eksisterer\n"
+" ikke i depotet før næste deponering). Det anbefales at den primære\n"
+" udvikling foretages på 'default' grenen.\n"
+"\n"
+" Med mindre -f/--force bruges, så vil branch ikke lade dig bruge et\n"
+" grennavn som allerede eksisterer, selv hvis det er inaktivt.\n"
+"\n"
+" Brug -C/--clean for at nulstille arbejdskatalogs gren til samme\n"
+" gren dets forældre-ændring og derved negere end tidligere ændring.\n"
+"\n"
+" Brug kommandoen 'hg update' for at skifte til en eksisterende\n"
+" gren. Brug 'hg commit --close-branch' for at markere denne gren\n"
+" som lukket.\n"
+" "
#, python-format
msgid "reset working directory to branch %s\n"
-msgstr ""
+msgstr "nulstil arbejdskataloget til gren %s\n"
msgid "a branch of the same name already exists (use --force to override)"
msgstr ""
@@ -4996,13 +5094,29 @@
"\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"
-" "
-msgstr ""
+" 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"
+"\n"
+" Udskriver de angivne filer som de så ud ved den givne revision.\n"
+" Hvis der ikke angves en revision, så bruges forældre-revisionen\n"
+" til arbejdskataloget, eller spidsen hvis der ikke er hentet noget\n"
+" arbejdskatalog.\n"
+"\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"
+" "
msgid ""
"make a copy of an existing repository\n"
@@ -5039,7 +5153,7 @@
" 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"
@@ -5049,7 +5163,6 @@
" 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"
@@ -5086,7 +5199,7 @@
" 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"
@@ -5097,7 +5210,6 @@
" 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 ""
@@ -5399,16 +5511,16 @@
" 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"
@@ -5434,16 +5546,16 @@
" 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"
@@ -5525,24 +5637,29 @@
"\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 ""
+
+msgid "you must specify a branch to use --closed"
msgstr ""
#, python-format
@@ -5616,8 +5733,12 @@
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"
@@ -6061,15 +6182,15 @@
"\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"
@@ -6089,13 +6210,13 @@
" 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"
@@ -6149,9 +6270,10 @@
" 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 ""
@@ -6245,7 +6367,7 @@
" 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"
@@ -6314,15 +6436,16 @@
" 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"
@@ -6347,15 +6470,16 @@
" 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 ""
@@ -6403,17 +6527,9 @@
msgstr "mærkaten '%s' er ikke en lokal mærkat"
#, python-format
-msgid "Removed tag %s"
-msgstr "Mærke %s er fjernet"
-
-#, python-format
msgid "tag '%s' already exists (use -f to force)"
msgstr "mærkaten '%s' eksisterer allerede (brug -f for at gennemtvinge)"
-#, python-format
-msgid "Added tag %s for changeset %s"
-msgstr "Tilføjede mærkat %s til ændring %s"
-
msgid ""
"list repository tags\n"
"\n"
@@ -6511,6 +6627,9 @@
" Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n"
" "
+msgid "cannot specify both -c/--check and -C/--clean"
+msgstr "man kan ikke angive både -c/--check og -C/--clean"
+
msgid "uncommitted local changes"
msgstr "udeponerede lokale ændringer"
@@ -6525,6 +6644,14 @@
" integrity of their crosslinks and indices.\n"
" "
msgstr ""
+"verificer depotets integritet\n"
+"\n"
+" Verificer integreteten af det aktuelle depot.\n"
+"\n"
+" Dette vil lave en udførlig kontrol af depotets integritet.\n"
+" Hashværdier og tjeksummer valideres for hver indgang i\n"
+" historikfilen, manifæstet og fulgte filer. Desuden valideres\n"
+" integriteten af deres krydslinks og indekser."
msgid "output version and copyright information"
msgstr "udskriv version- og copyrightinformation"
@@ -6539,6 +6666,11 @@
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
+"\n"
+"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> og andre\n"
+"Dette er frit programmel; se kildekoden for kopieringsbetingelser. Der\n"
+"gives INGEN GARANTI; ikke engang for SALGBARHED eller EGNETHED FOR\n"
+"NOGET BESTEMT FORMÃ…L.\n"
msgid "repository root directory or symbolic path name"
msgstr "depotrodfolder eller symbolsk stinavn"
@@ -6721,10 +6853,10 @@
msgstr "[-gbsr] [-c KOMMANDO] [REV]"
msgid "set branch name even if it shadows an existing branch"
-msgstr ""
+msgstr "sæt grennavnet selv hvis det overskygger en eksisterende gren"
msgid "reset branch name to parent branch name"
-msgstr ""
+msgstr "nulstil grennavnet til forældre-grennavnet"
msgid "[-fC] [NAME]"
msgstr "[-fC] [NAVN]"
@@ -6732,8 +6864,8 @@
msgid "show only branches that have unmerged heads"
msgstr "vil kun grene som har usammenføjne hoveder"
-msgid "show normal and closed heads"
-msgstr "vis normale og lukkede hoveder"
+msgid "show normal and closed branches"
+msgstr "vis normale og lukkede grene"
msgid "[-a]"
msgstr "[-a]"
@@ -6847,7 +6979,7 @@
msgstr "[TILVALG]... [-r REV1 [-r REV2]] [FIL]..."
msgid "diff against the second parent"
-msgstr ""
+msgstr "find forskelle i forhold til den anden forældre"
msgid "[OPTION]... [-o OUTFILESPEC] REV..."
msgstr "[TILVALG]... [-o UDFILSPECIFIKATION] REV..."
@@ -6879,8 +7011,11 @@
msgid "show only heads which are descendants of REV"
msgstr "vis kun hoveder som er efterkommere af REV"
-msgid "show only the active heads from open branches"
-msgstr "vis kun aktive hoveder fra åbne grene"
+msgid "show only the active branch heads from open branches"
+msgstr "vis kun de aktive grenhoveder fra åbne grene"
+
+msgid "show normal and closed branch heads"
+msgstr "vis normale og lukkede grenhoveder"
msgid "[-r STARTREV] [REV]..."
msgstr "[-r STARTREV] [REV]..."
@@ -7459,9 +7594,6 @@
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"
@@ -7489,9 +7621,6 @@
msgid "&Yes"
msgstr ""
-msgid "n"
-msgstr ""
-
#, python-format
msgid "merging %s failed!\n"
msgstr "sammenføjning af %s fejlede!\n"
@@ -7512,27 +7641,27 @@
" 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"
@@ -7551,78 +7680,80 @@
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"
@@ -7643,34 +7774,34 @@
" 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 ""
@@ -7680,25 +7811,25 @@
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"
@@ -7706,45 +7837,46 @@
" \"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"
@@ -7752,7 +7884,7 @@
" 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"
" "
@@ -7766,22 +7898,21 @@
" 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"
@@ -7832,10 +7963,10 @@
" 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"
@@ -7873,12 +8004,12 @@
"\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"
@@ -7887,78 +8018,93 @@
" 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 <user@example.com>' becomes 'example.com'.\n"
-" - email: Any text. Extracts the first string that looks like an\n"
-" email address. Example: 'User <user@example.com>' becomes\n"
-" 'user@example.com'.\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 <user@example.com>' becomes\n"
+" 'example.com'.\n"
+" :email: Any text. Extracts the first string that looks like\n"
+" an email address. Example: 'User <user@example.com>'\n"
+" becomes 'user@example.com'.\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 ""
@@ -7967,7 +8113,7 @@
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"
@@ -7976,8 +8122,8 @@
" 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"
@@ -7988,28 +8134,34 @@
" 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"
@@ -8232,8 +8384,8 @@
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"
@@ -8263,17 +8415,6 @@
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'!"
@@ -8633,9 +8774,6 @@
msgid "&Delete"
msgstr ""
-msgid "c"
-msgstr ""
-
#, python-format
msgid ""
"remote changed %s which local deleted\n"
@@ -8781,6 +8919,10 @@
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"
@@ -8909,9 +9051,6 @@
msgid "&Remote"
msgstr ""
-msgid "r"
-msgstr ""
-
#, python-format
msgid ""
" local changed subrepository %s which remote removed\n"
@@ -8936,6 +9075,17 @@
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 ""
@@ -9001,12 +9151,12 @@
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: "
--- a/i18n/de.po Fri Oct 16 11:18:38 2009 +0200
+++ b/i18n/de.po Fri Oct 16 11:19:39 2009 +0200
@@ -10,21 +10,22 @@
# 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: <mercurial-devel@selenic.com>\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 <tobias.bell@gmail.com>\n"
+"Last-Translator: Fabian Kreutz <fabian.kreutz@starnet.fi>\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 @@
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 @@
" 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 @@
#, 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 @@
" 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 @@
" 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 @@
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 @@
"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 @@
"\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 @@
" version=3.0\n"
" bzuser=unknown@domain.com\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 @@
" [usermap]\n"
" user@emaildomain.com=user.name@bugzilladomain.com\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=unknown@domain.com\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"
+" user@emaildomain.com=user.name@bugzilladomain.com\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 @@
#, 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 @@
"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 @@
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 @@
#, 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 @@
" # 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 @@
"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 @@
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 @@
" - 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 @@
" 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 @@
"\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 @@
"\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 @@
" 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 @@
" 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 @@
" --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 @@
"\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 @@
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 @@
"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 @@
#, 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 @@
#, 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 @@
#, 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 @@
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 @@
" 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 @@
" 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 @@
" "
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 @@
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 @@
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 @@
" 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 @@
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 @@
" 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 @@
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 @@
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:cia@cia.vc\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:cia@cia.vc\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 @@
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 @@
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 @@
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 <adam@hupp.org>\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 @@
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 @@
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 @@
msgstr ""
#, python-format
-msgid "status: %r dir(%d) -> %s\n"
-msgstr ""
-
-#, python-format
msgid "status: %r %s -> %s\n"
msgstr ""
@@ -2000,11 +2608,21 @@
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 @@
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 @@
"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 @@
"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 @@
"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 @@
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 @@
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 @@
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 @@
"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 @@
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 @@
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 @@
" 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 = user@host.com # 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 = user@host.com # 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 @@
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 @@
"$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 @@
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 @@
"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 @@
"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 @@
"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 @@
"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 @@
" 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 @@
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 @@
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 @@
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 @@
" 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 @@
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 @@
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 @@
" 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 @@
"| [-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 @@
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 @@
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 @@
" 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 @@
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 @@
"\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 @@
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 @@
"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 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
msgstr ""
#, python-format
+msgid "HG: subrepo %s"
+msgstr "HG: Unterarchiv %s"
+
+#, python-format
msgid "HG: added %s"
msgstr ""
@@ -4480,7 +5203,7 @@
" 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 @@
" 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 @@
" Ãœ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 @@
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 @@
" 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 @@
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 @@
"\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 @@
" 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 @@
"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 @@
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 @@
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 @@
" 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 @@
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 @@
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 @@
" 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 @@
"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 @@
"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 @@
" 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 @@
" 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 @@
"\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 @@
"\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 @@
" 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 @@
" 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 @@
" 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 @@
"\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 @@
" 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 @@
"date.\n"
" "
+msgid "nothing changed\n"
+msgstr "Keine Änderung\n"
+
msgid "created new head\n"
msgstr "neuer Kopf erzeugt\n"
@@ -5112,14 +5844,14 @@
" 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 @@
"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 @@
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 @@
" 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 @@
" 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 @@
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 @@
"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 @@
"aufschlussreich.\n"
" "
+#, fuzzy
msgid ""
"dump the header and diffs for one or more changesets\n"
"\n"
@@ -5411,23 +6147,23 @@
" 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 @@
" 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 @@
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 @@
"\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 @@
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 @@
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 @@
"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 @@
" 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 @@
" falls nicht der 'default'-Zweig vorliegt.\n"
" "
+#, fuzzy
msgid ""
"import an ordered set of patches\n"
"\n"
@@ -5695,8 +6470,8 @@
" 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 @@
" 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 @@
"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 @@
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 @@
" 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 @@
" 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 @@
" mit Leerzeichen in Dateinamen vermeidet.\n"
" "
+#, fuzzy
msgid ""
"show revision history of entire repository or files\n"
"\n"
@@ -5871,8 +6647,8 @@
" 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 @@
"\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 @@
"\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 @@
"\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 @@
" 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 @@
" 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 @@
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 @@
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 @@
" Formate für die Quellangabe.\n"
" "
+#, fuzzy
msgid ""
"push changes to the specified destination\n"
"\n"
@@ -6141,14 +6924,13 @@
"\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 @@
" 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 @@
" 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 @@
" (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 @@
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 @@
" \"hg revert\" rückgängig gemacht werden.\n"
" "
+#, fuzzy
msgid ""
"retry file merges from a merge or update\n"
"\n"
@@ -6318,13 +7099,14 @@
" 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 @@
" -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 @@
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 @@
" 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 @@
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 @@
" 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 @@
" 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 @@
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 @@
" --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 @@
"\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 @@
" 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 mercurial@selenic.com\n"
@@ -7706,7 +8501,7 @@
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 @@
#, 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 @@
msgid "&Other"
msgstr ""
-msgid "l"
-msgstr ""
-
#, python-format
msgid "merging %s and %s to %s\n"
msgstr ""
@@ -7802,9 +8594,6 @@
msgid "&Yes"
msgstr ""
-msgid "n"
-msgstr ""
-
#, python-format
msgid "merging %s failed!\n"
msgstr ""
@@ -7817,72 +8606,115 @@
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 @@
"(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 @@
" 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 @@
" 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 @@
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 @@
" \"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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
"\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 @@
" 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 <user@example.com>' becomes 'example.com'.\n"
-" - email: Any text. Extracts the first string that looks like an\n"
-" email address. Example: 'User <user@example.com>' becomes\n"
-" 'user@example.com'.\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 <user@example.com>' becomes\n"
+" 'example.com'.\n"
+" :email: Any text. Extracts the first string that looks like\n"
+" an email address. Example: 'User <user@example.com>'\n"
+" becomes 'user@example.com'.\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 @@
" "
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 @@
" 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 @@
" - 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 @@
" 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 @@
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 @@
"'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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
msgid "&Delete"
msgstr ""
-msgid "c"
-msgstr ""
-
#, python-format
msgid ""
"remote changed %s which local deleted\n"
@@ -9223,10 +10076,18 @@
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 @@
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 @@
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 @@
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"
--- a/i18n/hggettext Fri Oct 16 11:18:38 2009 +0200
+++ b/i18n/hggettext Fri Oct 16 11:19:39 2009 +0200
@@ -112,6 +112,11 @@
print poentry(path, lineno, func.__doc__)
+def rawtext(path):
+ src = open(path).read()
+ print poentry(path, 1, src)
+
+
if __name__ == "__main__":
# It is very important that we import the Mercurial modules from
# the source tree where hggettext is executed. Otherwise we might
@@ -120,4 +125,7 @@
sys.path.insert(0, os.getcwd())
from mercurial import demandimport; demandimport.enable()
for path in sys.argv[1:]:
- docstrings(path)
+ if path.endswith('.txt'):
+ rawtext(path)
+ else:
+ docstrings(path)
--- a/i18n/pt_BR.po Fri Oct 16 11:18:38 2009 +0200
+++ b/i18n/pt_BR.po Fri Oct 16 11:19:39 2009 +0200
@@ -54,8 +54,12 @@
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 @@
"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 @@
" # (\"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 @@
"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 @@
"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 @@
"\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 @@
"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 @@
"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 @@
"\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 @@
" version=3.0\n"
" bzuser=unknown@domain.com\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 @@
" [usermap]\n"
" user@emaildomain.com=user.name@bugzilladomain.com\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 @@
"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 @@
" version=3.0\n"
" bzuser=unknown@domain.com\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 @@
" user@emaildomain.com=user.name@bugzilladomain.com\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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
"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 @@
"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 @@
"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 @@
" - 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 @@
" 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 @@
"\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 @@
"\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 @@
" 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 @@
" 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 @@
" --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 @@
"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 @@
" - 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 @@
" 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 @@
"\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 @@
" 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 @@
" 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 @@
" --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 @@
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 @@
" 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 @@
" 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 @@
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 @@
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:cia@cia.vc\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:cia@cia.vc\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:cia@cia.vc\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:cia@cia.vc\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 @@
"\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 @@
"\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 @@
"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 @@
"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 @@
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 @@
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 @@
"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 @@
"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 @@
"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 @@
"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 @@
" **.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 @@
" 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 @@
" 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 @@
" [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 @@
" 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 @@
" 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 @@
"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 @@
"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 @@
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 @@
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 @@
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 = user@host.com # 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 = user@host.com # 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 @@
" [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 = user@host.com # 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 = user@host.com # 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 @@
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 @@
"$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 @@
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 @@
"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 @@
"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 @@
"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 @@
"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 @@
"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 @@
"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 @@
"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 @@
"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 @@
"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 @@
"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 @@
"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 @@
" 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 @@
"\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 @@
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 @@
" 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 @@
" 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 @@
"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 @@
"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 @@
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 @@
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 @@
" 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 @@
" 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 @@
"\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 @@
" 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 @@
"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 @@
"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 @@
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 @@
"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 @@
"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 @@
" 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 @@
" 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 @@
" 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 @@
" -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 @@
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 @@
"\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 @@
"\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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
"\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 @@
"\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 @@
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 @@
"\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 @@
" (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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" -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 @@
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 @@
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 @@
" 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 @@
"\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 @@
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 @@
" 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 @@
" 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 @@
" \"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 @@
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 @@
" \"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 @@
" 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 @@
" \"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 @@
" 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"
@@ -9812,22 +9949,21 @@
" 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"
@@ -9846,23 +9982,22 @@
" individuais.\n"
"\n"
" Um simples inteiro é tratado como um número de revisão. Inteiros\n"
-" negativos são tratados como contados topologicamente a partir da\n"
-" tip, com -1 denotando a tip. Assim, números negativos são úteis\n"
-" apenas se você memorizou os números de sua árvore local e quiser\n"
-" evitar digitar um único caractere. Este editor sugere copiar e\n"
-" colar.\n"
+" negativos são contados a partir da tip, com -1 denotando a tip,\n"
+" -2 denotando a revisão anterior à tip, e assim por diante.\n"
"\n"
" Uma string hexadecimal de 40 dÃgitos é tratada como um\n"
" identificador único de revisão.\n"
"\n"
" Uma string hexadecimal de menos de 40 caracteres é tratada como\n"
-" um identificador único de revisão, e referida como um\n"
-" identificador curto. Um identificador curto é válido apenas se\n"
-" for o prefixo de um identificador completo.\n"
-"\n"
-" Qualquer outra string é tratada como um nome de etiqueta, que é\n"
-" um nome simbólico associado a um identificador de revisão. Nomes\n"
-" de etiqueta não podem conter o caractere \":\".\n"
+" um identificador único de revisão, chamado de identificador\n"
+" curto. Um identificador curto é válido apenas se for o prefixo\n"
+" de um identificador completo.\n"
+"\n"
+" Qualquer outra string é tratada como um nome de etiqueta ou\n"
+" ramo. Um nome de etiqueta é um nome simbólico associado a um\n"
+" identificador de revisão. Um nome de ramo denota a revisão mais\n"
+" recente de tal ramo. Nomes de etiqueta ou de ramo não podem\n"
+" conter o caractere \":\".\n"
"\n"
" O nome reservado \"tip\" é uma etiqueta especial que sempre\n"
" identifica a revisão mais recente.\n"
@@ -9931,10 +10066,10 @@
" 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"
@@ -9965,10 +10100,10 @@
" 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"
@@ -9994,6 +10129,7 @@
msgid "Template Usage"
msgstr "Uso de modelos"
+#, fuzzy
msgid ""
"\n"
" Mercurial allows you to customize output of commands through\n"
@@ -10006,12 +10142,12 @@
"\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"
@@ -10020,78 +10156,92 @@
" 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 <user@example.com>' becomes 'example.com'.\n"
-" - email: Any text. Extracts the first string that looks like an\n"
-" email address. Example: 'User <user@example.com>' becomes\n"
-" 'user@example.com'.\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 <user@example.com>' becomes\n"
+" 'example.com'.\n"
+" :email: Any text. Extracts the first string that looks like\n"
+" an email address. Example: 'User <user@example.com>'\n"
+" becomes 'user@example.com'.\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"
@@ -10105,12 +10255,12 @@
"\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"
@@ -10120,93 +10270,97 @@
" 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 <user@example.com>' 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 <user@example.com>' se torna 'user@example.com'.\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.\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\n"
-" utilizado em cabeçalhos de e-mail.\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 <user@example.com>' 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 <user@example.com>' se torna 'user@example.com'.\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"
@@ -10214,7 +10368,7 @@
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"
@@ -10223,8 +10377,8 @@
" 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"
@@ -10235,28 +10389,34 @@
" 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"
@@ -10277,7 +10437,7 @@
" "
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"
@@ -10298,29 +10458,35 @@
" 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"
@@ -10545,8 +10711,8 @@
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"
@@ -10578,17 +10744,6 @@
"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'!"
@@ -10960,9 +11115,6 @@
msgid "&Delete"
msgstr "(&D) apagar"
-msgid "c"
-msgstr "c"
-
#, python-format
msgid ""
"remote changed %s which local deleted\n"
@@ -11108,6 +11260,10 @@
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"
@@ -11238,9 +11394,6 @@
msgid "&Remote"
msgstr "&Remoto"
-msgid "r"
-msgstr "r"
-
#, python-format
msgid ""
" local changed subrepository %s which remote removed\n"
@@ -11269,6 +11422,17 @@
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"
@@ -11334,12 +11498,12 @@
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: "
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/i18n/sv.po Fri Oct 16 11:19:39 2009 +0200
@@ -0,0 +1,9006 @@
+# Swedish translation for Mercurial
+# Svensk översättning för Mercurial
+# Copyright (C) 2009 Matt Mackall and others
+#
+# Translation dictionary:
+#
+# changeset ändring
+# commit arkivera
+# merge sammanfoga
+# tag märke
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Mercurial\n"
+"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
+"POT-Creation-Date: 2009-08-18 20:47+0200\n"
+"PO-Revision-Date: 2009-08-21 19:38+0200\n"
+"Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
+"Language-Team: Swedish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#, python-format
+msgid " (default: %s)"
+msgstr ""
+
+msgid "OPTIONS"
+msgstr ""
+
+msgid "COMMANDS"
+msgstr ""
+
+msgid ""
+" options:\n"
+"\n"
+msgstr ""
+
+#, python-format
+msgid ""
+" aliases: %s\n"
+"\n"
+msgstr ""
+
+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 ""
+
+#, python-format
+msgid "acl: %s not enabled\n"
+msgstr ""
+
+#, python-format
+msgid "acl: %s enabled, %d entries for user %s\n"
+msgstr ""
+
+#, python-format
+msgid "config error - hook type \"%s\" cannot stop incoming changesets"
+msgstr ""
+
+#, python-format
+msgid "acl: changes have source \"%s\" - skipping\n"
+msgstr ""
+
+#, python-format
+msgid "acl: user %s denied on %s\n"
+msgstr ""
+
+#, python-format
+msgid "acl: access denied for changeset %s"
+msgstr ""
+
+#, python-format
+msgid "acl: user %s not allowed on %s\n"
+msgstr ""
+
+#, python-format
+msgid "acl: allowing changeset %s\n"
+msgstr ""
+
+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 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"
+"\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 ""
+
+msgid ""
+"track a line of development with movable markers\n"
+"\n"
+" Bookmarks are pointers to certain commits that move when\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 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"
+" a revision using -r REV (where REV may be an existing bookmark),\n"
+" the bookmark is assigned to that revision.\n"
+" "
+msgstr ""
+
+msgid "a bookmark of this name does not exist"
+msgstr ""
+
+msgid "a bookmark of the same name already exists"
+msgstr ""
+
+msgid "new bookmark name required"
+msgstr ""
+
+msgid "bookmark name required"
+msgstr ""
+
+msgid "bookmark name cannot contain newlines"
+msgstr ""
+
+msgid "a bookmark cannot have the name of an existing branch"
+msgstr ""
+
+msgid "force"
+msgstr ""
+
+msgid "revision"
+msgstr "revision"
+
+msgid "delete a given bookmark"
+msgstr ""
+
+msgid "rename a given bookmark"
+msgstr ""
+
+msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
+msgstr ""
+
+msgid ""
+"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"
+"bug status.\n"
+"\n"
+"The hook updates the Bugzilla database directly. Only Bugzilla\n"
+"installations using MySQL are supported.\n"
+"\n"
+"The hook relies on a Bugzilla script to send bug change notification\n"
+"emails. That script changes between Bugzilla versions; the\n"
+"'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
+"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
+"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"
+"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"
+"\n"
+" [hooks]\n"
+" # run bugzilla hook on every change pulled or pushed in here\n"
+" incoming.bugzilla = python:hgext.bugzilla.hook\n"
+"\n"
+"Example configuration:\n"
+"\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"
+"\n"
+" [bugzilla]\n"
+" host=localhost\n"
+" password=XYZZY\n"
+" version=3.0\n"
+" bzuser=unknown@domain.com\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"
+" strip=5\n"
+"\n"
+" [web]\n"
+" baseurl=http://dev.domain.com/hg\n"
+"\n"
+" [usermap]\n"
+" user@emaildomain.com=user.name@bugzilladomain.com\n"
+"\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 ""
+
+#, python-format
+msgid "connecting to %s:%s as %s, password %s\n"
+msgstr ""
+
+#, python-format
+msgid "query: %s %s\n"
+msgstr ""
+
+#, python-format
+msgid "failed query: %s %s\n"
+msgstr ""
+
+msgid "unknown database schema"
+msgstr ""
+
+#, python-format
+msgid "bug %d already knows about changeset %s\n"
+msgstr ""
+
+msgid "telling bugzilla to send mail:\n"
+msgstr ""
+
+#, python-format
+msgid " bug %s\n"
+msgstr ""
+
+#, python-format
+msgid "running notify command %s\n"
+msgstr ""
+
+#, python-format
+msgid "bugzilla notify command %s"
+msgstr ""
+
+msgid "done\n"
+msgstr ""
+
+#, python-format
+msgid "looking up user %s\n"
+msgstr ""
+
+#, python-format
+msgid "cannot find bugzilla user id for %s"
+msgstr ""
+
+#, python-format
+msgid "cannot find bugzilla user id for %s or %s"
+msgstr ""
+
+#, python-format
+msgid "bugzilla version %s not supported"
+msgstr ""
+
+msgid ""
+"changeset {node|short} in repo {root} refers to bug {bug}.\n"
+"details:\n"
+"\t{desc|tabindent}"
+msgstr ""
+
+#, python-format
+msgid "python mysql support not available: %s"
+msgstr ""
+
+#, python-format
+msgid "hook type %s does not pass a changeset id"
+msgstr ""
+
+#, python-format
+msgid "database error: %s"
+msgstr ""
+
+msgid "command to display child changesets"
+msgstr ""
+
+msgid ""
+"show the children of the given or working directory revision\n"
+"\n"
+" Print the children of the working directory's revisions. If a\n"
+" revision is given via -r/--rev, the children of that revision will\n"
+" be printed. If a file argument is given, revision in which the\n"
+" file was last changed (after the working directory revision or the\n"
+" argument to --rev if given) is printed.\n"
+" "
+msgstr ""
+
+msgid "show children of the specified revision"
+msgstr ""
+
+msgid "hg children [-r REV] [FILE]"
+msgstr ""
+
+msgid "command to display statistics about repository history"
+msgstr ""
+
+#, python-format
+msgid "Revision %d is a merge, ignoring...\n"
+msgstr ""
+
+#, python-format
+msgid "generating stats: %d%%"
+msgstr ""
+
+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"
+"\n"
+" # display daily activity graph\n"
+" hg churn -f '%H' -s -c\n"
+"\n"
+" # display activity of developers by month\n"
+" hg churn -f '%Y-%m' -s -c\n"
+"\n"
+" # display count of lines changed in every year\n"
+" 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\n"
+" a .hgchurn file will be looked for in the working directory root.\n"
+" "
+msgstr ""
+
+#, python-format
+msgid "assuming %i character terminal\n"
+msgstr ""
+
+msgid "count rate for the specified revision or range"
+msgstr ""
+
+msgid "count rate for revisions matching date spec"
+msgstr ""
+
+msgid "template to group changesets"
+msgstr ""
+
+msgid "strftime-compatible format for grouping by date"
+msgstr ""
+
+msgid "count rate by number of changesets"
+msgstr ""
+
+msgid "sort by key (default: sort by count)"
+msgstr ""
+
+msgid "file with email aliases"
+msgstr ""
+
+msgid "show progress"
+msgstr ""
+
+msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
+msgstr ""
+
+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"
+"patch status (applied, unapplied, missing), and to diff-related\n"
+"commands to highlight additions, removals, diff headers, and trailing\n"
+"whitespace.\n"
+"\n"
+"Other effects in addition to color, like bold and underlined text, are\n"
+"also available. Effects are rendered with the ECMA-48 SGR control\n"
+"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"
+msgstr ""
+
+msgid "when to colorize (always, auto, or never)"
+msgstr "när färgläggning ska ske (always, auto eller never)"
+
+msgid "don't colorize output"
+msgstr "färglägg inte utmatning"
+
+#, python-format
+msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
+msgstr ""
+
+msgid "import revisions from foreign VCS repositories into Mercurial"
+msgstr ""
+
+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"
+" - git [git]\n"
+" - Subversion [svn]\n"
+" - Monotone [mtn]\n"
+" - GNU Arch [gnuarch]\n"
+" - Bazaar [bzr]\n"
+" - Perforce [p4]\n"
+"\n"
+" Accepted destination formats [identifiers]:\n"
+"\n"
+" - Mercurial [hg]\n"
+" - Subversion [svn] (history on branches is not preserved)\n"
+"\n"
+" If no revision is given, all revisions will be converted.\n"
+" Otherwise, convert will only import up to the named revision\n"
+" (given in a format understood by the source).\n"
+"\n"
+" If no destination directory name is specified, it defaults to the\n"
+" 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 --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"
+"\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"
+" and can be run repeatedly to copy new commits.\n"
+"\n"
+" The [username mapping] file is a simple text file that maps each\n"
+" source commit author to a destination commit author. It is handy\n"
+" for source SCMs that use unix logins to identify authors (eg:\n"
+" CVS). One line per author mapping and the line format is:\n"
+" srcauthor=whatever string you want\n"
+"\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"
+"\n"
+" include path/to/file\n"
+"\n"
+" exclude path/to/file\n"
+"\n"
+" rename from/file to/file\n"
+"\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\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"
+" useful if you want to e.g. give a Subversion merge two parents, or\n"
+" graft two disconnected series of history together. Each entry\n"
+" contains a key, followed by a space, followed by one or two\n"
+" comma-separated values. The key is the revision ID in the source\n"
+" revision control system whose parents should be modified (same\n"
+" format as a key in .hg/shamap). The values are the revision IDs\n"
+" (in either the source or destination revision control system) that\n"
+" should be used as the new parents for that node.\n"
+"\n"
+" The branchmap is a file that allows you to rename a branch when it is\n"
+" being brought in from whatever external repository. When used in\n"
+" conjunction with a splicemap, it allows for a powerful combination\n"
+" to help fix even the most badly mismanaged repositories and turn them\n"
+" into nicely structured Mercurial repositories. The branchmap contains\n"
+" lines of the form \"original_branch_name new_branch_name\".\n"
+" \"original_branch_name\" is the name of the branch in the source\n"
+" repository, and \"new_branch_name\" is the name of the branch is the\n"
+" destination repository. This can be used to (for instance) move code\n"
+" in one repository from \"default\" to a named branch.\n"
+"\n"
+" Mercurial Source\n"
+" ----------------\n"
+"\n"
+" --config convert.hg.ignoreerrors=False (boolean)\n"
+" ignore integrity errors when reading. Use it to fix Mercurial\n"
+" repositories with missing revlogs, by converting from and to\n"
+" Mercurial.\n"
+" --config convert.hg.saverev=False (boolean)\n"
+" store original revision ID in changeset (forces target IDs to\n"
+" change)\n"
+" --config convert.hg.startrev=0 (hg revision identifier)\n"
+" convert start revision and its descendants\n"
+"\n"
+" CVS Source\n"
+" ----------\n"
+"\n"
+" CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
+" to indicate the starting point of what will be converted. Direct\n"
+" access to the repository files is not needed, unless of course the\n"
+" repository is :local:. The conversion uses the top level directory\n"
+" in the sandbox to find the CVS repository, and then uses CVS rlog\n"
+" commands to find files to convert. This means that unless a\n"
+" filemap is given, all files under the starting directory will be\n"
+" converted, and that any directory reorganization in the CVS\n"
+" sandbox is ignored.\n"
+"\n"
+" 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"
+"\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"
+"\n"
+" --config convert.cvsps=builtin\n"
+"\n"
+" and has a few more configurable options:\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"
+" parameters and output are similar to that of cvsps 2.1.\n"
+"\n"
+" Subversion Source\n"
+" -----------------\n"
+"\n"
+" Subversion source detects classical trunk/branches/tags layouts.\n"
+" By default, the supplied \"svn://repo/path/\" source URL is\n"
+" converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
+" replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
+" its subdirectories are listed as possible branches. If\n"
+" \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
+" converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
+" can be overridden with following options. Set them to paths\n"
+" relative to the source URL, or leave them blank to disable auto\n"
+" detection.\n"
+"\n"
+" --config convert.svn.branches=branches (directory name)\n"
+" specify the directory containing branches\n"
+" --config convert.svn.tags=tags (directory name)\n"
+" specify the directory containing tags\n"
+" --config convert.svn.trunk=trunk (directory name)\n"
+" specify the name of the trunk branch\n"
+"\n"
+" Source history can be retrieved starting at a specific revision,\n"
+" instead of being integrally converted. Only single branch\n"
+" conversions are supported.\n"
+"\n"
+" --config convert.svn.startrev=0 (svn revision number)\n"
+" specify start Subversion revision.\n"
+"\n"
+" Perforce Source\n"
+" ---------------\n"
+"\n"
+" The Perforce (P4) importer can be given a p4 depot path or a\n"
+" client specification as source. It will convert all files in the\n"
+" source to a flat Mercurial repository, ignoring labels, branches\n"
+" and integrations. Note that when a depot path is given you then\n"
+" usually should specify a target directory, because otherwise the\n"
+" target may be named ...-hg.\n"
+"\n"
+" It is possible to limit the amount of source history to be\n"
+" converted by specifying an initial Perforce revision.\n"
+"\n"
+" --config convert.p4.startrev=0 (perforce changelist number)\n"
+" specify initial Perforce revision.\n"
+"\n"
+" Mercurial Destination\n"
+" ---------------------\n"
+"\n"
+" --config convert.hg.clonebranches=False (boolean)\n"
+" dispatch source branches in separate clones.\n"
+" --config convert.hg.tagsbranch=default (branch name)\n"
+" tag revisions branch name\n"
+" --config convert.hg.usebranchnames=True (boolean)\n"
+" preserve branch names\n"
+"\n"
+" "
+msgstr ""
+
+msgid ""
+"create changeset information from CVS\n"
+"\n"
+" This command is intended as a debugging tool for the CVS to\n"
+" Mercurial converter, and can be used as a direct replacement for\n"
+" cvsps.\n"
+"\n"
+" Hg debugcvsps reads the CVS rlog for current directory (or any\n"
+" named directory) in the CVS repository, and converts the log to a\n"
+" series of changesets based on matching commit log entries and\n"
+" dates."
+msgstr ""
+
+msgid "username mapping filename"
+msgstr ""
+
+msgid "destination repository type"
+msgstr ""
+
+msgid "remap file names using contents of file"
+msgstr ""
+
+msgid "import up to target revision REV"
+msgstr ""
+
+msgid "source repository type"
+msgstr ""
+
+msgid "splice synthesized history into place"
+msgstr ""
+
+msgid "change branch names while converting"
+msgstr ""
+
+msgid "try to sort changesets by branches"
+msgstr ""
+
+msgid "try to sort changesets by date"
+msgstr ""
+
+msgid "preserve source changesets order"
+msgstr ""
+
+msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
+msgstr ""
+
+msgid "only return changes on specified branches"
+msgstr ""
+
+msgid "prefix to remove from file names"
+msgstr ""
+
+msgid "only return changes after or between specified tags"
+msgstr ""
+
+msgid "update cvs log cache"
+msgstr ""
+
+msgid "create new cvs log cache"
+msgstr ""
+
+msgid "set commit time fuzz in seconds"
+msgstr ""
+
+msgid "specify cvsroot"
+msgstr ""
+
+msgid "show parent changesets"
+msgstr ""
+
+msgid "show current changeset in ancestor branches"
+msgstr ""
+
+msgid "ignored for compatibility"
+msgstr ""
+
+msgid "hg debugcvsps [OPTION]... [PATH]..."
+msgstr ""
+
+msgid ""
+"warning: lightweight checkouts may cause conversion failures, try with a "
+"regular branch instead.\n"
+msgstr ""
+
+msgid "bzr source type could not be determined\n"
+msgstr ""
+
+#, python-format
+msgid "%s is not a valid revision in current branch"
+msgstr ""
+
+#, python-format
+msgid "%s is not available in %s anymore"
+msgstr ""
+
+#, python-format
+msgid "%s.%s symlink has no target"
+msgstr ""
+
+#, python-format
+msgid "cannot find required \"%s\" tool"
+msgstr ""
+
+#, python-format
+msgid "running: %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s error:\n"
+msgstr ""
+
+#, python-format
+msgid "syntax error in %s(%d): key/value pair expected"
+msgstr ""
+
+#, python-format
+msgid "could not open map file %r: %s"
+msgstr ""
+
+#, python-format
+msgid "%s: missing or unsupported repository"
+msgstr ""
+
+#, python-format
+msgid "convert: %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s: unknown repository type"
+msgstr ""
+
+#, python-format
+msgid "unknown sort mode: %s"
+msgstr ""
+
+#, python-format
+msgid "cycle detected between %s and %s"
+msgstr ""
+
+msgid "not all revisions were sorted"
+msgstr ""
+
+#, python-format
+msgid "Writing author map file %s\n"
+msgstr ""
+
+#, python-format
+msgid "Ignoring bad line in author map file %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "mapping author %s to %s\n"
+msgstr ""
+
+#, python-format
+msgid "overriding mapping for author %s, was %s, will be %s\n"
+msgstr ""
+
+#, python-format
+msgid "spliced in %s as parents of %s\n"
+msgstr ""
+
+msgid "scanning source...\n"
+msgstr ""
+
+msgid "sorting...\n"
+msgstr ""
+
+msgid "converting...\n"
+msgstr ""
+
+#, python-format
+msgid "source: %s\n"
+msgstr ""
+
+#, python-format
+msgid "assuming destination %s\n"
+msgstr ""
+
+msgid "more than one sort mode specified"
+msgstr ""
+
+msgid "--sourcesort is not supported by this data source"
+msgstr ""
+
+msgid ""
+"warning: support for external cvsps is deprecated and will be removed in "
+"Mercurial 1.4\n"
+msgstr ""
+
+#, python-format
+msgid "revision %s is not a patchset number or date"
+msgstr ""
+
+msgid "using builtin cvsps\n"
+msgstr ""
+
+#, python-format
+msgid "connecting to %s\n"
+msgstr ""
+
+msgid "CVS pserver authentication failed"
+msgstr ""
+
+#, python-format
+msgid ""
+"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
+msgstr ""
+
+#, python-format
+msgid "%d bytes missing from remote file"
+msgstr ""
+
+#, python-format
+msgid "cvs server: %s\n"
+msgstr ""
+
+#, python-format
+msgid "unknown CVS response: %s"
+msgstr ""
+
+msgid "collecting CVS rlog\n"
+msgstr ""
+
+#, python-format
+msgid "reading cvs log cache %s\n"
+msgstr ""
+
+#, python-format
+msgid "cache has %d log entries\n"
+msgstr ""
+
+#, python-format
+msgid "error reading cache: %r\n"
+msgstr ""
+
+#, python-format
+msgid "running %s\n"
+msgstr ""
+
+#, python-format
+msgid "prefix=%r directory=%r root=%r\n"
+msgstr ""
+
+msgid "RCS file must be followed by working file"
+msgstr ""
+
+msgid "must have at least some revisions"
+msgstr ""
+
+msgid "expected revision number"
+msgstr ""
+
+msgid "revision must be followed by date line"
+msgstr ""
+
+#, python-format
+msgid "found synthetic revision in %s: %r\n"
+msgstr ""
+
+#, python-format
+msgid "writing cvs log cache %s\n"
+msgstr ""
+
+#, python-format
+msgid "%d log entries\n"
+msgstr ""
+
+msgid "creating changesets\n"
+msgstr ""
+
+msgid "synthetic changeset cannot have multiple parents"
+msgstr ""
+
+#, python-format
+msgid ""
+"warning: CVS commit message references non-existent branch %r:\n"
+"%s\n"
+msgstr ""
+
+#, python-format
+msgid "%d changeset entries\n"
+msgstr ""
+
+#, python-format
+msgid "darcs version 2.1 or newer needed (found %r)"
+msgstr ""
+
+msgid "Python ElementTree module is not available"
+msgstr ""
+
+#, python-format
+msgid "cleaning up %s\n"
+msgstr ""
+
+msgid "internal calling inconsistency"
+msgstr ""
+
+msgid "errors in filemap"
+msgstr ""
+
+#, python-format
+msgid "%s:%d: %r already in %s list\n"
+msgstr ""
+
+#, python-format
+msgid "%s:%d: unknown directive %r\n"
+msgstr ""
+
+msgid "source repository doesn't support --filemap"
+msgstr ""
+
+#, python-format
+msgid "%s does not look like a GNU Arch repo"
+msgstr ""
+
+msgid "cannot find a GNU Arch tool"
+msgstr ""
+
+#, python-format
+msgid "analyzing tree version %s...\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"tree analysis stopped because it points to an unregistered archive %s...\n"
+msgstr ""
+
+#, python-format
+msgid "applying revision %s...\n"
+msgstr ""
+
+#, python-format
+msgid "computing changeset between %s and %s...\n"
+msgstr ""
+
+#, python-format
+msgid "obtaining revision %s...\n"
+msgstr ""
+
+#, python-format
+msgid "analyzing revision %s...\n"
+msgstr ""
+
+#, python-format
+msgid "could not parse cat-log of %s"
+msgstr ""
+
+#, python-format
+msgid "%s is not a local Mercurial repo"
+msgstr ""
+
+#, python-format
+msgid "initializing destination %s repository\n"
+msgstr ""
+
+msgid "run hg sink pre-conversion action\n"
+msgstr ""
+
+msgid "run hg sink post-conversion action\n"
+msgstr ""
+
+#, python-format
+msgid "pulling from %s into %s\n"
+msgstr ""
+
+msgid "filtering out empty revision\n"
+msgstr ""
+
+msgid "updating tags\n"
+msgstr ""
+
+#, python-format
+msgid "%s is not a valid start revision"
+msgstr ""
+
+#, python-format
+msgid "ignoring: %s\n"
+msgstr ""
+
+msgid "run hg source pre-conversion action\n"
+msgstr ""
+
+msgid "run hg source post-conversion action\n"
+msgstr ""
+
+#, python-format
+msgid "%s does not look like a monotone repo"
+msgstr ""
+
+#, python-format
+msgid "copying file in renamed directory from '%s' to '%s'"
+msgstr ""
+
+msgid "reading p4 views\n"
+msgstr ""
+
+msgid "collecting p4 changelists\n"
+msgstr ""
+
+msgid "Subversion python bindings could not be loaded"
+msgstr ""
+
+#, python-format
+msgid "Subversion python bindings %d.%d found, 1.4 or later required"
+msgstr ""
+
+msgid "Subversion python bindings are too old, 1.4 or later required"
+msgstr ""
+
+#, python-format
+msgid "svn: revision %s is not an integer"
+msgstr ""
+
+#, python-format
+msgid "svn: start revision %s is not an integer"
+msgstr ""
+
+#, python-format
+msgid "no revision found in module %s"
+msgstr ""
+
+#, python-format
+msgid "expected %s to be at %r, but not found"
+msgstr ""
+
+#, python-format
+msgid "found %s at %r\n"
+msgstr ""
+
+#, python-format
+msgid "ignoring empty branch %s\n"
+msgstr ""
+
+#, python-format
+msgid "found branch %s at %d\n"
+msgstr ""
+
+msgid "svn: start revision is not supported with more than one branch"
+msgstr ""
+
+#, python-format
+msgid "svn: no revision found after start revision %d"
+msgstr ""
+
+#, python-format
+msgid "no tags found at revision %d\n"
+msgstr ""
+
+#, python-format
+msgid "ignoring foreign branch %r\n"
+msgstr ""
+
+#, python-format
+msgid "%s not found up to revision %d"
+msgstr ""
+
+#, python-format
+msgid "branch renamed from %s to %s at %d\n"
+msgstr ""
+
+#, python-format
+msgid "reparent to %s\n"
+msgstr ""
+
+#, python-format
+msgid "copied to %s from %s@%s\n"
+msgstr ""
+
+#, python-format
+msgid "gone from %s\n"
+msgstr ""
+
+#, python-format
+msgid "entry %s\n"
+msgstr ""
+
+#, python-format
+msgid "unknown path in revision %d: %s\n"
+msgstr ""
+
+#, python-format
+msgid "mark %s came from %s:%d\n"
+msgstr ""
+
+#, python-format
+msgid "parsing revision %d (%d changes)\n"
+msgstr ""
+
+#, python-format
+msgid "found parent of branch %s at %d: %s\n"
+msgstr ""
+
+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 "revision %d has no entries\n"
+msgstr ""
+
+#, python-format
+msgid "svn: branch has no revision %s"
+msgstr ""
+
+#, python-format
+msgid "%r is not under %r, ignoring\n"
+msgstr ""
+
+#, python-format
+msgid "initializing svn repo %r\n"
+msgstr ""
+
+#, python-format
+msgid "initializing svn wc %r\n"
+msgstr ""
+
+msgid "unexpected svn output:\n"
+msgstr ""
+
+msgid "unable to cope with svn output"
+msgstr ""
+
+msgid "XXX TAGS NOT IMPLEMENTED YET\n"
+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\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"
+"\n"
+" [extdiff]\n"
+" # add new command that runs GNU diff(1) in 'context diff' mode\n"
+" cdiff = gdiff -Nprc5\n"
+" ## or the old way:\n"
+" #cmd.cdiff = gdiff\n"
+" #opts.cdiff = -Nprc5\n"
+"\n"
+" # add new command called vdiff, runs kdiff3\n"
+" vdiff = kdiff3\n"
+"\n"
+" # add new command called meld, runs meld (no need to name twice)\n"
+" 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) 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"
+"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 ""
+
+#, python-format
+msgid "making snapshot of %d files from rev %s\n"
+msgstr ""
+
+#, python-format
+msgid "making snapshot of %d files from working directory\n"
+msgstr ""
+
+msgid "cannot specify --rev and --change at the same time"
+msgstr ""
+
+#, python-format
+msgid "running %r in %s\n"
+msgstr ""
+
+#, python-format
+msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
+msgstr ""
+
+msgid "cleaning up temp directory\n"
+msgstr ""
+
+msgid ""
+"use external program to diff repository (or selected files)\n"
+"\n"
+" Show differences between revisions for the specified files, using\n"
+" an external program. The default program used is diff, with\n"
+" default options \"-Npru\".\n"
+"\n"
+" To select a different program, use the -p/--program option. The\n"
+" program will be passed the names of two directories to compare. To\n"
+" pass additional options to the program, use -o/--option. These\n"
+" will be passed before the names of the directories to compare.\n"
+"\n"
+" When two revision arguments are given, then changes are shown\n"
+" between those revisions. If only one revision is specified then\n"
+" that revision is compared to the working directory, and, when no\n"
+" revisions are specified, the working directory files are compared\n"
+" to its parent."
+msgstr ""
+
+msgid "comparison program to run"
+msgstr ""
+
+msgid "pass option to comparison program"
+msgstr ""
+
+msgid "change made by revision"
+msgstr "ändring gjord av revision"
+
+msgid "hg extdiff [OPT]... [FILE]..."
+msgstr ""
+
+#, 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 ""
+
+msgid "pull, update and merge in one command"
+msgstr ""
+
+msgid ""
+"pull changes from a remote repository, merge new changes if needed.\n"
+"\n"
+" This finds all changes from the repository at the specified path\n"
+" or URL and adds them to the local repository.\n"
+"\n"
+" If the pulled changes add a new branch head, the head is\n"
+" automatically merged, and the result of the merge is committed.\n"
+" Otherwise, the working directory is updated to include the new\n"
+" changes.\n"
+"\n"
+" When a merge occurs, the newly pulled changes are assumed to be\n"
+" \"authoritative\". The head of the new changes is used as the first\n"
+" parent, with local changes as the second. To switch the merge\n"
+" order, use --switch-parent.\n"
+"\n"
+" See 'hg help dates' for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+
+msgid ""
+"working dir not at branch tip (use \"hg update\" to check out branch tip)"
+msgstr ""
+
+msgid "outstanding uncommitted merge"
+msgstr ""
+
+msgid "outstanding uncommitted changes"
+msgstr ""
+
+msgid "working directory is missing some files"
+msgstr ""
+
+msgid ""
+"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
+msgstr ""
+
+#, python-format
+msgid "pulling from %s\n"
+msgstr ""
+
+msgid ""
+"Other repository doesn't support revision lookup, so a rev cannot be "
+"specified."
+msgstr ""
+
+#, python-format
+msgid ""
+"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
+"\" to merge them)\n"
+msgstr ""
+
+#, python-format
+msgid "updating to %d:%s\n"
+msgstr ""
+
+#, python-format
+msgid "merging with %d:%s\n"
+msgstr ""
+
+#, python-format
+msgid "new changeset %d:%s merges remote changes with local\n"
+msgstr ""
+
+msgid "a specific revision you would like to pull"
+msgstr ""
+
+msgid "edit commit message"
+msgstr ""
+
+msgid "edit commit message (DEPRECATED)"
+msgstr ""
+
+msgid "switch parents when merging"
+msgstr ""
+
+msgid "hg fetch [SOURCE]"
+msgstr ""
+
+msgid "commands to sign and verify changesets"
+msgstr ""
+
+msgid "error while verifying signature"
+msgstr ""
+
+#, python-format
+msgid "%s Bad signature from \"%s\"\n"
+msgstr ""
+
+#, python-format
+msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
+msgstr ""
+
+#, python-format
+msgid "%s Note: This key has expired (signed by: \"%s\")\n"
+msgstr ""
+
+msgid "list signed changesets"
+msgstr ""
+
+#, python-format
+msgid "%s:%d node does not exist\n"
+msgstr ""
+
+msgid "verify all the signatures there may be for a particular revision"
+msgstr ""
+
+#, python-format
+msgid "No valid signature for %s\n"
+msgstr ""
+
+msgid ""
+"add a signature for the current or given revision\n"
+"\n"
+" If no revision is given, the parent of the working directory is used,\n"
+" or tip if no revision is checked out.\n"
+"\n"
+" See 'hg help dates' for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+
+msgid "uncommitted merge - please provide a specific revision"
+msgstr ""
+
+msgid "Error while signing"
+msgstr ""
+
+msgid ""
+"working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
+"force)"
+msgstr ""
+
+msgid "unknown signature version"
+msgstr ""
+
+msgid "make the signature local"
+msgstr ""
+
+msgid "sign even if the sigfile is modified"
+msgstr ""
+
+msgid "do not commit the sigfile after signing"
+msgstr ""
+
+msgid "the key id to sign with"
+msgstr ""
+
+msgid "commit message"
+msgstr ""
+
+msgid "hg sign [OPTION]... [REVISION]..."
+msgstr ""
+
+msgid "hg sigcheck REVISION"
+msgstr ""
+
+msgid "hg sigs"
+msgstr ""
+
+msgid ""
+"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 ""
+
+#, python-format
+msgid "--graph option is incompatible with --%s"
+msgstr ""
+
+msgid ""
+"show revision history alongside an ASCII revision graph\n"
+"\n"
+" Print a revision history alongside a revision graph drawn with\n"
+" ASCII characters.\n"
+"\n"
+" Nodes printed as an @ character are parents of the working\n"
+" directory.\n"
+" "
+msgstr ""
+
+#, python-format
+msgid "comparing with %s\n"
+msgstr ""
+
+msgid "no changes found\n"
+msgstr ""
+
+msgid "show the revision DAG"
+msgstr ""
+
+msgid "limit number of changes displayed"
+msgstr "begränsa antalet visade ändringar"
+
+msgid "show patch"
+msgstr "visa patch"
+
+msgid "show the specified revision or range"
+msgstr "visa den specifika revisionen eller serien"
+
+msgid "hg glog [OPTION]... [FILE]"
+msgstr ""
+
+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:cia@cia.vc\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
+msgid "hgcia: sending update to %s\n"
+msgstr ""
+
+msgid "email.from must be defined when sending by email"
+msgstr ""
+
+msgid "cia: no user specified"
+msgstr ""
+
+msgid "cia: no project specified"
+msgstr ""
+
+msgid ""
+"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"
+"which provides hooks for hgk to get information. hgk can be found in\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"
+"\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"
+"\n"
+" [hgk]\n"
+" vdiff=vdiff\n"
+"\n"
+"Revisions context menu will now display additional entries to fire\n"
+"vdiff on hovered and selected revisions.\n"
+msgstr ""
+
+msgid "diff trees from two commits"
+msgstr ""
+
+msgid "output common ancestor information"
+msgstr ""
+
+msgid "cat a specific revision"
+msgstr ""
+
+msgid "cat-file: type or revision not supplied\n"
+msgstr ""
+
+msgid "aborting hg cat-file only understands commits\n"
+msgstr ""
+
+msgid "parse given revisions"
+msgstr ""
+
+msgid "print revisions"
+msgstr ""
+
+msgid "print extension options"
+msgstr ""
+
+msgid "start interactive history viewer"
+msgstr ""
+
+msgid "hg view [-l LIMIT] [REVRANGE]"
+msgstr ""
+
+msgid "generate patch"
+msgstr ""
+
+msgid "recursive"
+msgstr ""
+
+msgid "pretty"
+msgstr ""
+
+msgid "stdin"
+msgstr ""
+
+msgid "detect copies"
+msgstr ""
+
+msgid "search"
+msgstr ""
+
+msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
+msgstr ""
+
+msgid "hg debug-cat-file [OPTION]... TYPE FILE"
+msgstr ""
+
+msgid "hg debug-config"
+msgstr ""
+
+msgid "hg debug-merge-base REV REV"
+msgstr ""
+
+msgid "ignored"
+msgstr ""
+
+msgid "hg debug-rev-parse REV"
+msgstr ""
+
+msgid "header"
+msgstr ""
+
+msgid "topo-order"
+msgstr ""
+
+msgid "parents"
+msgstr ""
+
+msgid "max-count"
+msgstr ""
+
+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"
+"There is a single configuration option::\n"
+"\n"
+" [web]\n"
+" pygments_style = <style>\n"
+"\n"
+"The default is 'colorful'.\n"
+msgstr ""
+
+msgid "accelerate status report using Linux's inotify service"
+msgstr ""
+
+msgid "start an inotify server for this repository"
+msgstr ""
+
+msgid ""
+"debugging information for inotify extension\n"
+"\n"
+" Prints the list of directories being watched by the inotify server.\n"
+" "
+msgstr ""
+
+msgid "directories being watched:\n"
+msgstr ""
+
+msgid "run server in background"
+msgstr "kör servern i bakgrunden"
+
+msgid "used internally by daemon mode"
+msgstr "används internt av daemon-läget"
+
+msgid "minutes to sit idle before exiting"
+msgstr ""
+
+msgid "name of file to write process ID to"
+msgstr "filnamn att skriva process-ID till"
+
+msgid "hg inserve [OPTION]..."
+msgstr ""
+
+msgid "(found dead inotify server socket; removing it)\n"
+msgstr ""
+
+msgid "(starting inotify server)\n"
+msgstr ""
+
+#, python-format
+msgid "could not start inotify server: %s\n"
+msgstr ""
+
+#, python-format
+msgid "could not talk to new inotify server: %s\n"
+msgstr ""
+
+msgid "(inotify server not running)\n"
+msgstr ""
+
+#, python-format
+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 ""
+
+#, python-format
+msgid "(inotify: received '%s' response when expecting '%s')\n"
+msgstr ""
+
+msgid "this system does not seem to support inotify"
+msgstr ""
+
+#, python-format
+msgid "*** the current per-user limit on the number of inotify watches is %s\n"
+msgstr ""
+
+msgid "*** this limit is too low to watch every directory in this repository\n"
+msgstr ""
+
+msgid "*** counting directories: "
+msgstr ""
+
+#, python-format
+msgid "found %d\n"
+msgstr ""
+
+#, python-format
+msgid "*** to raise the limit from %d to %d (run as root):\n"
+msgstr ""
+
+#, python-format
+msgid "*** echo %d > %s\n"
+msgstr ""
+
+#, python-format
+msgid "cannot watch %s until inotify watch limit is raised"
+msgstr ""
+
+#, python-format
+msgid "inotify service not available: %s"
+msgstr ""
+
+#, python-format
+msgid "watching %r\n"
+msgstr ""
+
+#, python-format
+msgid "watching directories under %r\n"
+msgstr ""
+
+#, python-format
+msgid "status: %r %s -> %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s dirstate reload\n"
+msgstr ""
+
+#, python-format
+msgid "%s end dirstate reload\n"
+msgstr ""
+
+msgid "rescanning due to .hgignore change\n"
+msgstr ""
+
+#, python-format
+msgid "%s event: created %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s event: deleted %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s event: modified %s\n"
+msgstr ""
+
+#, python-format
+msgid "filesystem containing %s was unmounted\n"
+msgstr ""
+
+#, python-format
+msgid "%s readable: %d bytes\n"
+msgstr ""
+
+#, python-format
+msgid "%s below threshold - unhooking\n"
+msgstr ""
+
+#, python-format
+msgid "%s reading %d events\n"
+msgstr ""
+
+#, python-format
+msgid "%s hooking back up with %d bytes readable\n"
+msgstr ""
+
+#, python-format
+msgid "could not start server: %s"
+msgstr ""
+
+#, python-format
+msgid "answering query for %r\n"
+msgstr ""
+
+#, python-format
+msgid "received query from incompatible client version %d\n"
+msgstr ""
+
+#, python-format
+msgid "unrecognized query type: %s\n"
+msgstr ""
+
+msgid "finished setup\n"
+msgstr ""
+
+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
+msgid "interhg: invalid pattern for %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "interhg: invalid regexp for %s: %s\n"
+msgstr ""
+
+msgid ""
+"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"
+"\n"
+"Keywords are only expanded in local repositories and not stored in the\n"
+"change history. The mechanism can be regarded as a convenience for the\n"
+"current user or for archive distribution.\n"
+"\n"
+"Configuration is done in the [keyword] and [keywordmaps] sections of\n"
+"hgrc files.\n"
+"\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 the less you\n"
+"lose speed in huge repositories.\n"
+"\n"
+"For [keywordmaps] template mapping and expansion demonstration and\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"
+"kwdemo\" to control the results of your config changes.\n"
+"\n"
+"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
+"the risk of inadvertently storing expanded keywords in the change\n"
+"history.\n"
+"\n"
+"To force expansion after enabling it, or a configuration change, run\n"
+"\"hg kwexpand\".\n"
+"\n"
+"Also, when committing with the record extension or using mq's qrecord,\n"
+"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
+"the files in question to update keyword expansions after all changes\n"
+"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 \"Log =\n"
+"{desc}\" expands to the first line of the changeset description.\n"
+msgstr ""
+
+#, python-format
+msgid "overwriting %s expanding keywords\n"
+msgstr ""
+
+#, python-format
+msgid "overwriting %s shrinking keywords\n"
+msgstr ""
+
+msgid "[keyword] patterns cannot match"
+msgstr ""
+
+msgid "no [keyword] patterns configured"
+msgstr ""
+
+msgid ""
+"print [keywordmaps] configuration and an expansion example\n"
+"\n"
+" Show current, custom, or default keyword template maps and their\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 ""
+
+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"
+"removing temporary repository %s\n"
+msgstr ""
+
+msgid ""
+"expand keywords in the working directory\n"
+"\n"
+" Run after (re)enabling keyword expansion.\n"
+"\n"
+" kwexpand refuses to run if given files contain local changes.\n"
+" "
+msgstr ""
+
+msgid ""
+"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"
+"\n"
+" kwshrink refuses to run if given files contain local changes.\n"
+" "
+msgstr ""
+
+msgid "show default keyword template maps"
+msgstr ""
+
+msgid "read maps from rcfile"
+msgstr ""
+
+msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
+msgstr ""
+
+msgid "hg kwexpand [OPTION]... [FILE]..."
+msgstr ""
+
+msgid "show keyword status flags of all files"
+msgstr ""
+
+msgid "show files excluded from expansion"
+msgstr ""
+
+msgid "additionally show untracked files"
+msgstr ""
+
+msgid "hg kwfiles [OPTION]... [FILE]..."
+msgstr ""
+
+msgid "hg kwshrink [OPTION]... [FILE]..."
+msgstr ""
+
+msgid ""
+"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"
+"applied patches (subset of known patches).\n"
+"\n"
+"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 ""
+
+#, python-format
+msgid "%s appears more than once in %s"
+msgstr ""
+
+msgid "guard cannot be an empty string"
+msgstr ""
+
+#, python-format
+msgid "guard %r starts with invalid character: %r"
+msgstr ""
+
+#, python-format
+msgid "invalid character in guard %r: %r"
+msgstr ""
+
+#, python-format
+msgid "active guards: %s\n"
+msgstr ""
+
+#, python-format
+msgid "guard %r too short"
+msgstr ""
+
+#, python-format
+msgid "guard %r starts with invalid char"
+msgstr ""
+
+#, python-format
+msgid "allowing %s - no guards in effect\n"
+msgstr ""
+
+#, python-format
+msgid "allowing %s - no matching negative guards\n"
+msgstr ""
+
+#, python-format
+msgid "allowing %s - guarded by %r\n"
+msgstr ""
+
+#, python-format
+msgid "skipping %s - guarded by %r\n"
+msgstr ""
+
+#, python-format
+msgid "skipping %s - no matching guards\n"
+msgstr ""
+
+#, python-format
+msgid "error removing undo: %s\n"
+msgstr ""
+
+#, python-format
+msgid "apply failed for patch %s"
+msgstr ""
+
+#, python-format
+msgid "patch didn't work out, merging %s\n"
+msgstr ""
+
+#, python-format
+msgid "update returned %d"
+msgstr ""
+
+msgid "repo commit failed"
+msgstr ""
+
+#, python-format
+msgid "unable to read %s"
+msgstr ""
+
+#, python-format
+msgid "patch %s does not exist\n"
+msgstr ""
+
+#, python-format
+msgid "patch %s is not applied\n"
+msgstr ""
+
+msgid "patch failed, unable to continue (try -v)\n"
+msgstr ""
+
+#, python-format
+msgid "applying %s\n"
+msgstr ""
+
+#, python-format
+msgid "unable to read %s\n"
+msgstr ""
+
+#, python-format
+msgid "imported patch %s\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"\n"
+"imported patch %s"
+msgstr ""
+
+#, python-format
+msgid "patch %s is empty\n"
+msgstr ""
+
+msgid "patch failed, rejects left in working dir\n"
+msgstr ""
+
+msgid "fuzz found when applying patch, stopping\n"
+msgstr ""
+
+#, python-format
+msgid "revision %d is not managed"
+msgstr ""
+
+#, python-format
+msgid "cannot delete revision %d above applied patches"
+msgstr ""
+
+#, python-format
+msgid "patch %s finalized without changeset message\n"
+msgstr ""
+
+msgid "qdelete requires at least one revision or patch name"
+msgstr ""
+
+#, python-format
+msgid "cannot delete applied patch %s"
+msgstr ""
+
+#, python-format
+msgid "patch %s not in series file"
+msgstr ""
+
+msgid "no patches applied"
+msgstr ""
+
+msgid "working directory revision is not qtip"
+msgstr ""
+
+msgid "local changes found, refresh first"
+msgstr ""
+
+msgid "local changes found"
+msgstr ""
+
+#, python-format
+msgid "\"%s\" cannot be used as the name of a patch"
+msgstr ""
+
+#, python-format
+msgid "patch \"%s\" already exists"
+msgstr ""
+
+#, python-format
+msgid "error unlinking %s\n"
+msgstr ""
+
+#, python-format
+msgid "patch name \"%s\" is ambiguous:\n"
+msgstr ""
+
+#, python-format
+msgid "patch %s not in series"
+msgstr ""
+
+msgid "(working directory not at a head)\n"
+msgstr ""
+
+msgid "no patches in series\n"
+msgstr ""
+
+#, python-format
+msgid "cannot push to a previous patch: %s"
+msgstr ""
+
+#, python-format
+msgid "qpush: %s is already at the top\n"
+msgstr ""
+
+#, python-format
+msgid "guarded by %r"
+msgstr ""
+
+msgid "no matching guards"
+msgstr ""
+
+#, python-format
+msgid "cannot push '%s' - %s\n"
+msgstr ""
+
+msgid "all patches are currently applied\n"
+msgstr ""
+
+msgid "patch series already fully applied\n"
+msgstr ""
+
+msgid "cleaning up working directory..."
+msgstr ""
+
+#, python-format
+msgid "errors during apply, please fix and refresh %s\n"
+msgstr ""
+
+#, python-format
+msgid "now at: %s\n"
+msgstr ""
+
+#, python-format
+msgid "patch %s is not applied"
+msgstr ""
+
+msgid "no patches applied\n"
+msgstr ""
+
+#, python-format
+msgid "qpop: %s is already at the top\n"
+msgstr ""
+
+msgid "qpop: forcing dirstate update\n"
+msgstr ""
+
+#, python-format
+msgid "trying to pop unknown node %s"
+msgstr ""
+
+msgid "popping would remove a revision not managed by this patch queue"
+msgstr ""
+
+msgid "deletions found between repo revs"
+msgstr ""
+
+#, python-format
+msgid "popping %s\n"
+msgstr ""
+
+msgid "patch queue now empty\n"
+msgstr ""
+
+msgid "cannot refresh a revision with children"
+msgstr ""
+
+msgid ""
+"refresh interrupted while patch was popped! (revert --all, qpush to "
+"recover)\n"
+msgstr ""
+
+msgid "patch queue directory already exists"
+msgstr ""
+
+#, python-format
+msgid "patch %s is not in series file"
+msgstr ""
+
+msgid "No saved patch data found\n"
+msgstr ""
+
+#, python-format
+msgid "restoring status: %s\n"
+msgstr ""
+
+msgid "save entry has children, leaving it alone\n"
+msgstr ""
+
+#, python-format
+msgid "removing save entry %s\n"
+msgstr ""
+
+#, python-format
+msgid "saved queue repository parents: %s %s\n"
+msgstr ""
+
+msgid "queue directory updating\n"
+msgstr ""
+
+msgid "Unable to load queue repository\n"
+msgstr ""
+
+msgid "save: no patches applied, exiting\n"
+msgstr ""
+
+msgid "status is already saved\n"
+msgstr ""
+
+msgid "hg patches saved state"
+msgstr ""
+
+msgid "repo commit failed\n"
+msgstr ""
+
+#, python-format
+msgid "patch %s is already in the series file"
+msgstr ""
+
+msgid "option \"-r\" not valid when importing files"
+msgstr ""
+
+msgid "option \"-n\" not valid when importing multiple patches"
+msgstr ""
+
+#, python-format
+msgid "revision %d is the root of more than one branch"
+msgstr ""
+
+#, python-format
+msgid "revision %d is already managed"
+msgstr ""
+
+#, python-format
+msgid "revision %d is not the parent of the queue"
+msgstr ""
+
+#, python-format
+msgid "revision %d has unmanaged children"
+msgstr ""
+
+#, python-format
+msgid "cannot import merge revision %d"
+msgstr ""
+
+#, python-format
+msgid "revision %d is not the parent of %d"
+msgstr ""
+
+msgid "-e is incompatible with import from -"
+msgstr ""
+
+#, python-format
+msgid "patch %s does not exist"
+msgstr ""
+
+msgid "need --name to import a patch from -"
+msgstr ""
+
+#, python-format
+msgid "adding %s to series file\n"
+msgstr ""
+
+msgid ""
+"remove patches from queue\n"
+"\n"
+" 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 "print the patches not yet applied"
+msgstr ""
+
+msgid ""
+"import a patch\n"
+"\n"
+" The patch is inserted into the series after the last applied\n"
+" patch. If no patches have been applied, qimport prepends the patch\n"
+" to the series.\n"
+"\n"
+" The patch will have the same name as its source file unless you\n"
+" give it a new one with -n/--name.\n"
+"\n"
+" You can register an existing patch inside the patch directory with\n"
+" the -e/--existing flag.\n"
+"\n"
+" With -f/--force, an existing patch of the same name will be\n"
+" overwritten.\n"
+"\n"
+" An existing changeset may be placed under mq control with -r/--rev\n"
+" (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
+" With -g/--git, patches imported with --rev will use the git diff\n"
+" format. See the diffs help topic for information on why this is\n"
+" important for preserving rename/copy information and permission\n"
+" changes.\n"
+"\n"
+" To import a patch from standard input, pass - as the patch file.\n"
+" When importing from standard input, a patch name must be specified\n"
+" using the --name flag.\n"
+" "
+msgstr ""
+
+msgid ""
+"init a new queue repository\n"
+"\n"
+" The queue repository is unversioned by default. If\n"
+" -c/--create-repo is specified, qinit will create a separate nested\n"
+" repository for patches (qinit -c may also be run later to convert\n"
+" an unversioned patch repository into a versioned one). You can use\n"
+" qcommit to commit changes to this queue repository."
+msgstr ""
+
+msgid ""
+"clone main and patch repository at same time\n"
+"\n"
+" If source is local, destination will have no patches applied. If\n"
+" source is remote, this command can not check if patches are\n"
+" applied in source, so cannot guarantee that patches are not\n"
+" applied in destination. If you clone remote repository, be sure\n"
+" before that it has no patches applied.\n"
+"\n"
+" 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"
+" would be created by qinit -c.\n"
+" "
+msgstr ""
+
+msgid "versioned patch repository not found (see qinit -c)"
+msgstr ""
+
+msgid "cloning main repository\n"
+msgstr ""
+
+msgid "cloning patch repository\n"
+msgstr ""
+
+msgid "stripping applied patches from destination repository\n"
+msgstr ""
+
+msgid "updating destination repository\n"
+msgstr ""
+
+msgid "commit changes in the queue repository"
+msgstr ""
+
+msgid "print the entire series file"
+msgstr ""
+
+msgid "print the name of the current patch"
+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"
+" qnew creates a new patch on top of the currently-applied patch (if\n"
+" any). It will refuse to run if there are any outstanding changes\n"
+" unless -f/--force is specified, in which case the patch will be\n"
+" initialized with them. You may also use -I/--include,\n"
+" -X/--exclude, and/or a list of files after the patch name to add\n"
+" only changes to matching files to the new patch, leaving the rest\n"
+" as uncommitted modifications.\n"
+"\n"
+" -u/--user and -d/--date can be used to set the (given) user and\n"
+" date, respectively. -U/--currentuser and -D/--currentdate set user\n"
+" to current user and date to current date.\n"
+"\n"
+" -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
+" well as the commit message. If none is specified, the header is\n"
+" empty and the commit message is '[mq]: PATCH'.\n"
+"\n"
+" Use the -g/--git option to keep the patch in the git extended diff\n"
+" format. Read the diffs help topic for more information on why this\n"
+" is important for preserving permission changes and copy/rename\n"
+" information.\n"
+" "
+msgstr ""
+
+msgid ""
+"update the current patch\n"
+"\n"
+" If any file patterns are provided, the refreshed patch will\n"
+" contain only the modifications that match those patterns; the\n"
+" remaining modifications will remain in the working directory.\n"
+"\n"
+" If -s/--short is specified, files currently included in the patch\n"
+" will be refreshed just like matched files and remain in the patch.\n"
+"\n"
+" hg add/remove/copy/rename work as usual, though you might want to\n"
+" use git-style patches (-g/--git or [diff] git=1) to track copies\n"
+" and renames. See the diffs help topic for more information on the\n"
+" git diff format.\n"
+" "
+msgstr ""
+
+msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
+msgstr ""
+
+msgid ""
+"diff of the current patch and subsequent modifications\n"
+"\n"
+" Shows a diff which includes the current patch as well as any\n"
+" changes which have been made in the working directory since the\n"
+" last refresh (thus showing what the current patch would become\n"
+" after a qrefresh).\n"
+"\n"
+" Use 'hg diff' if you only want to see the changes made since the\n"
+" last qrefresh, or 'hg export qtip' if you want to see changes made\n"
+" by the current patch without including changes made since the\n"
+" qrefresh.\n"
+" "
+msgstr ""
+
+msgid ""
+"fold the named patches into the current patch\n"
+"\n"
+" Patches must not yet be applied. Each patch will be successively\n"
+" applied to the current patch in the order given. If all the\n"
+" patches apply successfully, the current patch will be refreshed\n"
+" with the new cumulative patch, and the folded patches will be\n"
+" deleted. With -k/--keep, the folded patch files will not be\n"
+" removed afterwards.\n"
+"\n"
+" The header for each folded patch will be concatenated with the\n"
+" current patch header, separated by a line of '* * *'."
+msgstr ""
+
+msgid "qfold requires at least one patch name"
+msgstr ""
+
+msgid "No patches applied"
+msgstr ""
+
+#, python-format
+msgid "Skipping already folded patch %s"
+msgstr ""
+
+#, python-format
+msgid "qfold cannot fold already applied patch %s"
+msgstr ""
+
+#, python-format
+msgid "Error folding patch %s"
+msgstr ""
+
+msgid "push or pop patches until named patch is at top of stack"
+msgstr ""
+
+msgid ""
+"set or print guards for a patch\n"
+"\n"
+" Guards control whether a patch can be pushed. A patch with no\n"
+" guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
+" pushed only if the qselect command has activated it. A patch with\n"
+" a negative guard (\"-foo\") is never pushed if the qselect command\n"
+" has activated it.\n"
+"\n"
+" With no arguments, print the currently active guards.\n"
+" With arguments, set guards for the named patch.\n"
+" NOTE: Specifying negative guards now requires '--'.\n"
+"\n"
+" To set guards on another patch:\n"
+" hg qguard -- other.patch +2.6.17 -stable\n"
+" "
+msgstr ""
+
+msgid "cannot mix -l/--list with options or arguments"
+msgstr ""
+
+msgid "no patch to work with"
+msgstr ""
+
+#, python-format
+msgid "no patch named %s"
+msgstr ""
+
+msgid "print the header of the topmost or specified patch"
+msgstr ""
+
+msgid ""
+"push the next patch onto the stack\n"
+"\n"
+" When -f/--force is applied, all local changes in patched files\n"
+" will be lost.\n"
+" "
+msgstr ""
+
+msgid "no saved queues found, please use -n\n"
+msgstr ""
+
+#, python-format
+msgid "merging with queue at: %s\n"
+msgstr ""
+
+msgid ""
+"pop the current patch off the stack\n"
+"\n"
+" By default, pops off the top of the patch stack. If given a patch\n"
+" name, keeps popping off patches until the named patch is at the\n"
+" top of the stack.\n"
+" "
+msgstr ""
+
+#, python-format
+msgid "using patch queue: %s\n"
+msgstr ""
+
+msgid ""
+"rename a patch\n"
+"\n"
+" With one argument, renames the current patch to PATCH1.\n"
+" With two arguments, renames PATCH1 to PATCH2."
+msgstr ""
+
+#, python-format
+msgid "%s already exists"
+msgstr ""
+
+#, python-format
+msgid "A patch named %s already exists in the series file"
+msgstr ""
+
+msgid "restore the queue state saved by a revision"
+msgstr ""
+
+msgid "save current queue state"
+msgstr ""
+
+#, python-format
+msgid "destination %s exists and is not a directory"
+msgstr ""
+
+#, python-format
+msgid "destination %s exists, use -f to force"
+msgstr ""
+
+#, python-format
+msgid "copy %s to %s\n"
+msgstr ""
+
+msgid ""
+"strip a revision and all its descendants from the repository\n"
+"\n"
+" If one of the working directory's parent revisions is stripped, the\n"
+" working directory will be updated to the parent of the stripped\n"
+" revision.\n"
+" "
+msgstr ""
+
+msgid ""
+"set or print guarded patches to push\n"
+"\n"
+" Use the qguard command to set or print guards on patch, then use\n"
+" qselect to tell mq which guards to use. A patch will be pushed if\n"
+" it has no guards or any positive guards match the currently\n"
+" selected guard, but will not be pushed if any negative guards\n"
+" match the current guard. For example:\n"
+"\n"
+" qguard foo.patch -stable (negative guard)\n"
+" qguard bar.patch +stable (positive guard)\n"
+" qselect stable\n"
+"\n"
+" This activates the \"stable\" guard. mq will skip foo.patch (because\n"
+" it has a negative match) but push bar.patch (because it has a\n"
+" positive match).\n"
+"\n"
+" With no arguments, prints the currently active guards.\n"
+" With one argument, sets the active guard.\n"
+"\n"
+" Use -n/--none to deactivate guards (no other arguments needed).\n"
+" When no guards are active, patches with positive guards are\n"
+" skipped and patches with negative guards are pushed.\n"
+"\n"
+" qselect can change the guards on applied patches. It does not pop\n"
+" guarded patches by default. Use --pop to pop back to the last\n"
+" applied patch that is not guarded. Use --reapply (which implies\n"
+" --pop) to push back to the current patch afterwards, but skip\n"
+" guarded patches.\n"
+"\n"
+" Use -s/--series to print a list of all guards in the series file\n"
+" (no other arguments needed). Use -v for more information."
+msgstr ""
+
+msgid "guards deactivated\n"
+msgstr ""
+
+#, python-format
+msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
+msgstr ""
+
+#, python-format
+msgid "number of guarded, applied patches has changed from %d to %d\n"
+msgstr ""
+
+msgid "guards in series file:\n"
+msgstr ""
+
+msgid "no guards in series file\n"
+msgstr ""
+
+msgid "active guards:\n"
+msgstr ""
+
+msgid "no active guards\n"
+msgstr ""
+
+msgid "popping guarded patches\n"
+msgstr ""
+
+msgid "reapplying unguarded patches\n"
+msgstr ""
+
+msgid ""
+"move applied patches into repository history\n"
+"\n"
+" Finishes the specified revisions (corresponding to applied\n"
+" patches) by moving them out of mq control into regular repository\n"
+" history.\n"
+"\n"
+" Accepts a revision range or the -a/--applied option. If --applied\n"
+" is specified, all applied mq revisions are removed from mq\n"
+" control. Otherwise, the given revisions must be at the base of the\n"
+" stack of applied patches.\n"
+"\n"
+" This can be especially useful if your changes have been applied to\n"
+" an upstream repository, or if you are about to push your changes\n"
+" to upstream.\n"
+" "
+msgstr ""
+
+msgid "no revisions specified"
+msgstr ""
+
+msgid "cannot commit over an applied mq patch"
+msgstr ""
+
+msgid "source has mq patches applied"
+msgstr ""
+
+#, python-format
+msgid "mq status file refers to unknown node %s\n"
+msgstr ""
+
+#, python-format
+msgid "Tag %s overrides mq patch of the same name\n"
+msgstr ""
+
+msgid "cannot import over an applied patch"
+msgstr ""
+
+msgid "print first line of patch header"
+msgstr ""
+
+msgid "hg qapplied [-s] [PATCH]"
+msgstr ""
+
+msgid "use pull protocol to copy metadata"
+msgstr "använd pull-protokollet för att kopiera metadata"
+
+msgid "do not update the new working directories"
+msgstr ""
+
+msgid "use uncompressed transfer (fast over LAN)"
+msgstr "använd okomprimerad överföring (snabbt över LAN)"
+
+msgid "location of source patch repository"
+msgstr ""
+
+msgid "hg qclone [OPTION]... SOURCE [DEST]"
+msgstr ""
+
+msgid "hg qcommit [OPTION]... [FILE]..."
+msgstr ""
+
+msgid "hg qdiff [OPTION]... [FILE]..."
+msgstr ""
+
+msgid "keep patch file"
+msgstr ""
+
+msgid "stop managing a revision (DEPRECATED)"
+msgstr ""
+
+msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
+msgstr ""
+
+msgid "edit patch header"
+msgstr ""
+
+msgid "keep folded patch files"
+msgstr ""
+
+msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
+msgstr ""
+
+msgid "overwrite any local changes"
+msgstr ""
+
+msgid "hg qgoto [OPTION]... PATCH"
+msgstr ""
+
+msgid "list all patches and guards"
+msgstr ""
+
+msgid "drop all guards"
+msgstr ""
+
+msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
+msgstr ""
+
+msgid "hg qheader [PATCH]"
+msgstr ""
+
+msgid "import file in patch directory"
+msgstr ""
+
+msgid "name of patch file"
+msgstr ""
+
+msgid "overwrite existing files"
+msgstr ""
+
+msgid "place existing revisions under mq control"
+msgstr ""
+
+msgid "use git extended diff format"
+msgstr "använd gits utökade diff-format"
+
+msgid "qpush after importing"
+msgstr ""
+
+msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
+msgstr ""
+
+msgid "create queue repository"
+msgstr ""
+
+msgid "hg qinit [-c]"
+msgstr ""
+
+msgid "import uncommitted changes into patch"
+msgstr ""
+
+msgid "add \"From: <current user>\" to patch"
+msgstr ""
+
+msgid "add \"From: <given user>\" to patch"
+msgstr ""
+
+msgid "add \"Date: <current date>\" to patch"
+msgstr ""
+
+msgid "add \"Date: <given date>\" to patch"
+msgstr ""
+
+msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
+msgstr ""
+
+msgid "hg qnext [-s]"
+msgstr ""
+
+msgid "hg qprev [-s]"
+msgstr ""
+
+msgid "pop all patches"
+msgstr ""
+
+msgid "queue name to pop"
+msgstr ""
+
+msgid "forget any local changes"
+msgstr ""
+
+msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
+msgstr ""
+
+msgid "apply if the patch has rejects"
+msgstr ""
+
+msgid "list patch name in commit text"
+msgstr ""
+
+msgid "apply all patches"
+msgstr ""
+
+msgid "merge from another queue"
+msgstr ""
+
+msgid "merge queue name"
+msgstr ""
+
+msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
+msgstr ""
+
+msgid "refresh only files already in the patch and specified files"
+msgstr ""
+
+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]..."
+msgstr ""
+
+msgid "hg qrename PATCH1 [PATCH2]"
+msgstr ""
+
+msgid "delete save entry"
+msgstr ""
+
+msgid "update queue working directory"
+msgstr ""
+
+msgid "hg qrestore [-d] [-u] REV"
+msgstr ""
+
+msgid "copy patch directory"
+msgstr ""
+
+msgid "copy directory name"
+msgstr ""
+
+msgid "clear queue status file"
+msgstr ""
+
+msgid "force copy"
+msgstr ""
+
+msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
+msgstr ""
+
+msgid "disable all guards"
+msgstr ""
+
+msgid "list all guards in series file"
+msgstr ""
+
+msgid "pop to before first guarded applied patch"
+msgstr ""
+
+msgid "pop, then reapply patches"
+msgstr ""
+
+msgid "hg qselect [OPTION]... [GUARD]..."
+msgstr ""
+
+msgid "print patches not in series"
+msgstr ""
+
+msgid "hg qseries [-ms]"
+msgstr ""
+
+msgid "force removal with local changes"
+msgstr ""
+
+msgid "bundle unrelated changesets"
+msgstr ""
+
+msgid "no backups"
+msgstr ""
+
+msgid "hg strip [-f] [-b] [-n] REV"
+msgstr ""
+
+msgid "hg qtop [-s]"
+msgstr ""
+
+msgid "hg qunapplied [-s] [PATCH]"
+msgstr ""
+
+msgid "finish all applied changesets"
+msgstr ""
+
+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 = user@host.com # 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
+msgid "%s: %d new changesets"
+msgstr ""
+
+#, python-format
+msgid "notify: sending %d subscribers %d changes\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"\n"
+"diffs (truncated from %d to %d lines):\n"
+"\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"\n"
+"diffs (%d lines):\n"
+"\n"
+msgstr ""
+
+#, python-format
+msgid "notify: no subscribers to repository %s\n"
+msgstr ""
+
+#, python-format
+msgid "notify: changes have source \"%s\" - skipping\n"
+msgstr ""
+
+msgid ""
+"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"
+"\n"
+"If no pager is set, the pager extensions uses the environment variable\n"
+"$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"
+"\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"
+"\n"
+" [pager]\n"
+" ignore = version, help, update\n"
+"\n"
+"You can also enable the pager only for certain commands using\n"
+"pager.attend::\n"
+"\n"
+" [pager]\n"
+" attend = log\n"
+"\n"
+"If pager.attend is present, pager.ignore will be ignored.\n"
+"\n"
+"To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
+"specify them in the global .hgrc\n"
+msgstr ""
+
+msgid ""
+"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"
+" 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~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 ""
+"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"
+"\n"
+"Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
+"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"
+"- [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"
+"mail and news readers, and in mail archives.\n"
+"\n"
+"With the -d/--diffstat option, you will be prompted for each changeset\n"
+"with a diffstat summary and the changeset summary, so you can be sure\n"
+"you are sending the right changes.\n"
+"\n"
+"To configure other defaults, add a section like this to your hgrc\n"
+"file::\n"
+"\n"
+" [email]\n"
+" from = My Name <my@email>\n"
+" to = recipient1, recipient2, ...\n"
+" cc = cc1, cc2, ...\n"
+" bcc = bcc1, bcc2, ...\n"
+"\n"
+"Then you can use the \"hg email\" command to mail a series of changesets\n"
+"as a patchbomb.\n"
+"\n"
+"To avoid sending patches prematurely, it is a good idea to first run\n"
+"the \"email\" command with the \"-n\" option (test only). You will be\n"
+"prompted for an email recipient address, a subject and an introductory\n"
+"message describing the patches of your patchbomb. Then when all is\n"
+"done, patchbomb messages are displayed. If the PAGER environment\n"
+"variable is set, your pager will be fired up once for each patchbomb\n"
+"message, so you can verify everything is alright.\n"
+"\n"
+"The -m/--mbox option is also very useful. Instead of previewing each\n"
+"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"
+"\n"
+" % mutt -R -f mbox\n"
+"\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"
+"\n"
+" % formail -s sendmail -bm -t < mbox\n"
+"\n"
+"That should be all. Now your patchbomb is on its way out.\n"
+"\n"
+"You can also either configure the method option in the email section\n"
+"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.\n"
+msgstr ""
+
+msgid "Please enter a valid value.\n"
+msgstr ""
+
+msgid "does the diffstat above look okay? "
+msgstr ""
+
+msgid "diffstat rejected"
+msgstr ""
+
+msgid ""
+"send changesets by email\n"
+"\n"
+" By default, diffs are sent in the format generated by hg export,\n"
+" one per message. The series starts with a \"[PATCH 0 of N]\"\n"
+" introduction, which describes the series as a whole.\n"
+"\n"
+" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
+" the first line of the changeset description as the subject text.\n"
+" The message contains two or three parts. First, the changeset\n"
+" description. Next, (optionally) if the diffstat program is\n"
+" installed and -d/--diffstat is used, the result of running\n"
+" diffstat on the patch. Finally, the patch itself, as generated by\n"
+" \"hg export\".\n"
+"\n"
+" By default the patch is included as text in the email body for\n"
+" easy reviewing. Using the -a/--attach option will instead create\n"
+" an attachment for the patch. With -i/--inline an inline attachment\n"
+" will be created.\n"
+"\n"
+" With -o/--outgoing, emails will be generated for patches not found\n"
+" in the destination repository (or only those which are ancestors\n"
+" of the specified revisions if any are provided)\n"
+"\n"
+" With -b/--bundle, changesets are selected as for --outgoing, but a\n"
+" 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 "
+"default\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"
+" "
+msgstr ""
+
+msgid "specify at least one changeset with -r or -o"
+msgstr ""
+
+msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
+msgstr ""
+
+msgid "too many destinations"
+msgstr ""
+
+msgid "use only one form to specify the revision"
+msgstr ""
+
+msgid ""
+"\n"
+"Write the introductory message for the patch series.\n"
+"\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"This patch series consists of %d patches.\n"
+"\n"
+msgstr ""
+
+msgid "Final summary:\n"
+msgstr ""
+
+msgid "Displaying "
+msgstr ""
+
+msgid "Writing "
+msgstr ""
+
+msgid "Sending "
+msgstr ""
+
+msgid "send patches as attachments"
+msgstr ""
+
+msgid "send patches as inline attachments"
+msgstr ""
+
+msgid "email addresses of blind carbon copy recipients"
+msgstr ""
+
+msgid "email addresses of copy recipients"
+msgstr ""
+
+msgid "add diffstat output to messages"
+msgstr ""
+
+msgid "use the given date as the sending date"
+msgstr ""
+
+msgid "use the given file as the series description"
+msgstr ""
+
+msgid "email address of sender"
+msgstr ""
+
+msgid "print messages that would be sent"
+msgstr ""
+
+msgid "write messages to mbox file instead of sending them"
+msgstr ""
+
+msgid "subject of first message (intro or single patch)"
+msgstr ""
+
+msgid "message identifier to reply to"
+msgstr ""
+
+msgid "email addresses of recipients"
+msgstr ""
+
+msgid "omit hg patch header"
+msgstr ""
+
+msgid "send changes not found in the target repository"
+msgstr ""
+
+msgid "send changes not in target as a binary bundle"
+msgstr ""
+
+msgid "name of the bundle attachment file"
+msgstr ""
+
+msgid "a revision to send"
+msgstr ""
+
+msgid "run even when remote repository is unrelated (with -b/--bundle)"
+msgstr ""
+
+msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
+msgstr ""
+
+msgid "send an introduction email for a single patch"
+msgstr ""
+
+msgid "hg email [OPTION]... [DEST]..."
+msgstr ""
+
+msgid "command to delete untracked files from the working directory"
+msgstr ""
+
+msgid ""
+"removes files not tracked by Mercurial\n"
+"\n"
+" Delete files not known to Mercurial. This is useful to test local\n"
+" and uncommitted changes in an otherwise-clean source tree.\n"
+"\n"
+" This means that purge will delete:\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"
+"\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"
+"\n"
+" Be careful with purge, as you could irreversibly delete some files\n"
+" you forgot to add to the repository. If you only want to print the\n"
+" list of files that this program would delete, use the --print\n"
+" option.\n"
+" "
+msgstr ""
+
+#, python-format
+msgid "%s cannot be removed"
+msgstr ""
+
+#, python-format
+msgid "warning: %s\n"
+msgstr ""
+
+#, python-format
+msgid "Removing file %s\n"
+msgstr ""
+
+#, python-format
+msgid "Removing directory %s\n"
+msgstr ""
+
+msgid "abort if an error occurs"
+msgstr ""
+
+msgid "purge ignored files too"
+msgstr ""
+
+msgid "print filenames instead of deleting them"
+msgstr ""
+
+msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
+msgstr ""
+
+msgid "hg purge [OPTION]... [DIR]..."
+msgstr ""
+
+msgid ""
+"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://mercurial.selenic.com/wiki/RebaseExtension\n"
+msgstr ""
+
+msgid "first revision, do not change ancestor\n"
+msgstr ""
+
+msgid ""
+"move changeset (and descendants) to a different branch\n"
+"\n"
+" Rebase uses repeated merging to graft changesets from one part of\n"
+" history onto another. This can be useful for linearizing local\n"
+" changes relative to a master development tree.\n"
+"\n"
+" If a rebase is interrupted to manually resolve a merge, it can be\n"
+" continued with --continue/-c or aborted with --abort/-a.\n"
+" "
+msgstr ""
+
+msgid "cannot use both abort and continue"
+msgstr ""
+
+msgid "cannot use collapse with continue or abort"
+msgstr ""
+
+msgid "abort and continue do not allow specifying revisions"
+msgstr ""
+
+msgid "cannot specify both a revision and a base"
+msgstr ""
+
+msgid "nothing to rebase\n"
+msgstr ""
+
+msgid "cannot use both keepbranches and extrafn"
+msgstr ""
+
+msgid "rebase merging completed\n"
+msgstr ""
+
+msgid "warning: new changesets detected on source branch, not stripping\n"
+msgstr ""
+
+msgid "rebase completed\n"
+msgstr ""
+
+#, python-format
+msgid "%d revisions have been skipped\n"
+msgstr ""
+
+msgid " set parents\n"
+msgstr ""
+
+#, python-format
+msgid "rebasing %d:%s\n"
+msgstr ""
+
+#, python-format
+msgid " future parents are %d and %d\n"
+msgstr ""
+
+#, python-format
+msgid " update to %d:%s\n"
+msgstr ""
+
+msgid " already in target\n"
+msgstr ""
+
+#, python-format
+msgid " merge against %d:%s\n"
+msgstr ""
+
+msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
+msgstr ""
+
+msgid "resuming interrupted rebase\n"
+msgstr ""
+
+#, python-format
+msgid "no changes, revision %d skipped\n"
+msgstr ""
+
+#, python-format
+msgid "next revision set to %s\n"
+msgstr ""
+
+#, python-format
+msgid "cannot use revision %d as base, result would have 3 parents"
+msgstr ""
+
+#, python-format
+msgid "revision %d is an mq patch (%s), finalize it.\n"
+msgstr ""
+
+#, python-format
+msgid "import mq patch %d (%s)\n"
+msgstr ""
+
+msgid "rebase status stored\n"
+msgstr ""
+
+msgid "rebase status resumed\n"
+msgstr ""
+
+msgid "no rebase in progress"
+msgstr ""
+
+msgid "warning: new changesets detected on target branch, not stripping\n"
+msgstr ""
+
+msgid "rebase aborted\n"
+msgstr ""
+
+msgid "cannot rebase onto an applied mq patch"
+msgstr ""
+
+msgid "cannot rebase an ancestor"
+msgstr ""
+
+msgid "cannot rebase a descendant"
+msgstr ""
+
+msgid "already working on current\n"
+msgstr ""
+
+msgid "already working on the current branch\n"
+msgstr ""
+
+#, python-format
+msgid "rebase onto %d starting from %d\n"
+msgstr ""
+
+msgid "unable to collapse, there is more than one external parent"
+msgstr ""
+
+msgid "--update and --rebase are not compatible, ignoring the update flag\n"
+msgstr ""
+
+msgid "rebase working directory to branch head"
+msgstr ""
+
+msgid "rebase from a given revision"
+msgstr ""
+
+msgid "rebase from the base of a given revision"
+msgstr ""
+
+msgid "rebase onto a given revision"
+msgstr ""
+
+msgid "collapse the rebased revisions"
+msgstr ""
+
+msgid "keep original revisions"
+msgstr ""
+
+msgid "keep original branches"
+msgstr ""
+
+msgid "continue an interrupted rebase"
+msgstr ""
+
+msgid "abort an interrupted rebase"
+msgstr ""
+
+msgid ""
+"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
+"| [-c] | [-a]"
+msgstr ""
+
+msgid "commands to interactively select changes for commit/qrefresh"
+msgstr ""
+
+msgid "this modifies a binary file (all or nothing)\n"
+msgstr ""
+
+msgid "this is a binary file\n"
+msgstr ""
+
+#, python-format
+msgid "%d hunks, %d lines changed\n"
+msgstr ""
+
+msgid "[Ynsfdaq?]"
+msgstr ""
+
+msgid "&Yes, record this change"
+msgstr ""
+
+msgid "&No, skip this change"
+msgstr ""
+
+msgid "&Skip remaining changes to this file"
+msgstr ""
+
+msgid "Record remaining changes to this &file"
+msgstr ""
+
+msgid "&Done, skip remaining changes and files"
+msgstr ""
+
+msgid "Record &all changes to all remaining files"
+msgstr ""
+
+msgid "&Quit, recording no changes"
+msgstr ""
+
+msgid "&?"
+msgstr ""
+
+msgid "y - record this change"
+msgstr ""
+
+msgid "user quit"
+msgstr ""
+
+#, python-format
+msgid "examine changes to %s?"
+msgstr ""
+
+msgid " and "
+msgstr ""
+
+msgid "y"
+msgstr ""
+
+#, python-format
+msgid "record this change to %r?"
+msgstr ""
+
+#, python-format
+msgid "record change %d/%d to %r?"
+msgstr ""
+
+msgid ""
+"interactively select changes to commit\n"
+"\n"
+" If a list of files is omitted, all changes reported by \"hg status\"\n"
+" will be candidates for recording.\n"
+"\n"
+" See 'hg help dates' for a list of formats valid for -d/--date.\n"
+"\n"
+" 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 ""
+
+msgid "'mq' extension not loaded"
+msgstr ""
+
+msgid "running non-interactively, use commit instead"
+msgstr ""
+
+msgid "no changes to record\n"
+msgstr ""
+
+#, python-format
+msgid "backup %r as %r\n"
+msgstr ""
+
+msgid "applying patch\n"
+msgstr ""
+
+msgid "patch failed to apply"
+msgstr ""
+
+#, python-format
+msgid "restoring %r to %r\n"
+msgstr ""
+
+msgid "hg record [OPTION]... [FILE]..."
+msgstr ""
+
+msgid "hg qrecord [OPTION]... PATCH [FILE]..."
+msgstr ""
+
+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 ""
+
+msgid "[-U] SOURCE [DEST]"
+msgstr ""
+
+msgid ""
+"command to transplant changesets from another branch\n"
+"\n"
+"This extension allows you to transplant patches from another branch.\n"
+"\n"
+"Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
+"map from a changeset hash to its hash in the source repository.\n"
+msgstr ""
+
+#, python-format
+msgid "skipping already applied revision %s\n"
+msgstr ""
+
+#, python-format
+msgid "skipping merge changeset %s:%s\n"
+msgstr ""
+
+#, python-format
+msgid "%s merged at %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s transplanted to %s\n"
+msgstr ""
+
+#, python-format
+msgid "filtering %s\n"
+msgstr ""
+
+msgid "filter failed"
+msgstr ""
+
+msgid "can only omit patchfile if merging"
+msgstr ""
+
+#, python-format
+msgid "%s: empty changeset"
+msgstr ""
+
+msgid "Fix up the merge and run hg transplant --continue"
+msgstr ""
+
+#, python-format
+msgid "%s transplanted as %s\n"
+msgstr ""
+
+msgid "transplant log file is corrupt"
+msgstr ""
+
+#, python-format
+msgid "working dir not at transplant parent %s"
+msgstr ""
+
+msgid "commit failed"
+msgstr ""
+
+msgid "apply changeset? [ynmpcq?]:"
+msgstr ""
+
+msgid ""
+"transplant changesets from another branch\n"
+"\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"
+"\n"
+" You can rewrite the changelog message with the --filter option.\n"
+" Its argument will be invoked with the current changelog message as\n"
+" $1 and the patch as $2.\n"
+"\n"
+" If --source/-s is specified, selects changesets from the named\n"
+" repository. If --branch/-b is specified, selects changesets from\n"
+" the branch holding the named revision, up to that revision. If\n"
+" --all/-a is specified, all changesets on the branch will be\n"
+" transplanted, otherwise you will be prompted to select the\n"
+" changesets you want.\n"
+"\n"
+" hg transplant --branch REVISION --all will rebase the selected\n"
+" branch (up to the named revision) onto your current working\n"
+" directory.\n"
+"\n"
+" You can optionally mark selected transplanted changesets as merge\n"
+" changesets. You will not be prompted to transplant any ancestors\n"
+" of a merged transplant, and you can merge descendants of them\n"
+" normally instead of transplanting them.\n"
+"\n"
+" If no merges or revisions are provided, hg transplant will start\n"
+" an interactive changeset browser.\n"
+"\n"
+" If a changeset application fails, you can fix the merge by hand\n"
+" and then resume where you left off by calling hg transplant\n"
+" --continue/-c.\n"
+" "
+msgstr ""
+
+msgid "--continue is incompatible with branch, all or merge"
+msgstr ""
+
+msgid "no source URL, branch tag or revision list provided"
+msgstr ""
+
+msgid "--all requires a branch revision"
+msgstr ""
+
+msgid "--all is incompatible with a revision list"
+msgstr ""
+
+msgid "no revision checked out"
+msgstr ""
+
+msgid "outstanding uncommitted merges"
+msgstr ""
+
+msgid "outstanding local changes"
+msgstr ""
+
+msgid "pull patches from REPOSITORY"
+msgstr ""
+
+msgid "pull patches from branch BRANCH"
+msgstr ""
+
+msgid "pull all changesets up to BRANCH"
+msgstr ""
+
+msgid "skip over REV"
+msgstr ""
+
+msgid "merge at REV"
+msgstr ""
+
+msgid "append transplant info to log message"
+msgstr ""
+
+msgid "continue last transplant session after repair"
+msgstr ""
+
+msgid "filter changesets through FILTER"
+msgstr ""
+
+msgid ""
+"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+msgstr ""
+
+msgid ""
+"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"
+"such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
+"This extension can be used to fix the issue with those encodings by\n"
+"wrapping some functions to convert to Unicode string before path\n"
+"operation.\n"
+"\n"
+"This extension is useful for:\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"
+"\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"
+"\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"
+"setting or HGENCODING.\n"
+msgstr ""
+
+#, python-format
+msgid "[win32mbcs] filename conversion failed with %s encoding\n"
+msgstr ""
+
+msgid "[win32mbcs] cannot activate on this platform.\n"
+msgstr ""
+
+#, python-format
+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"
+"and does not need EOL conversion by the win32text plugin.\n"
+"Before your next commit, please reconsider your encode/decode settings in \n"
+"Mercurial.ini or %s.\n"
+msgstr ""
+
+#, python-format
+msgid "Attempt to commit or push text file(s) using %s line endings\n"
+msgstr ""
+
+#, python-format
+msgid "in %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"\n"
+"To prevent this mistake in your local repository,\n"
+"add to Mercurial.ini or .hg/hgrc:\n"
+"\n"
+"[hooks]\n"
+"pretxncommit.%s = python:hgext.win32text.forbid%s\n"
+"\n"
+"and also consider adding:\n"
+"\n"
+"[extensions]\n"
+"hgext.win32text =\n"
+"[encode]\n"
+"** = %sencode:\n"
+"[decode]\n"
+"** = %sdecode:\n"
+msgstr ""
+
+msgid ""
+"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 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"
+msgstr ""
+
+msgid "archive prefix contains illegal components"
+msgstr ""
+
+msgid "cannot give prefix when archiving to files"
+msgstr ""
+
+#, python-format
+msgid "unknown archive type '%s'"
+msgstr ""
+
+msgid "invalid changegroup"
+msgstr ""
+
+msgid "unknown parent"
+msgstr ""
+
+#, python-format
+msgid "integrity check failed on %s:%d"
+msgstr ""
+
+#, python-format
+msgid "%s: not a Mercurial bundle file"
+msgstr ""
+
+#, python-format
+msgid "%s: unknown bundle version"
+msgstr ""
+
+#, python-format
+msgid "%s: unknown bundle compression type"
+msgstr ""
+
+msgid "cannot create new bundle repository"
+msgstr ""
+
+#, python-format
+msgid "premature EOF reading chunk (got %d bytes, expected %d)"
+msgstr ""
+
+msgid "empty username"
+msgstr ""
+
+#, python-format
+msgid "username %s contains a newline"
+msgstr ""
+
+msgid "options --message and --logfile are mutually exclusive"
+msgstr ""
+
+#, python-format
+msgid "can't read commit message '%s': %s"
+msgstr ""
+
+msgid "limit must be a positive integer"
+msgstr ""
+
+msgid "limit must be positive"
+msgstr ""
+
+msgid "too many revisions specified"
+msgstr ""
+
+#, python-format
+msgid "invalid format spec '%%%s' in output filename"
+msgstr ""
+
+#, python-format
+msgid "adding %s\n"
+msgstr ""
+
+#, python-format
+msgid "removing %s\n"
+msgstr ""
+
+#, python-format
+msgid "recording removal of %s as rename to %s (%d%% similar)\n"
+msgstr ""
+
+#, python-format
+msgid "%s: not copying - file is not managed\n"
+msgstr ""
+
+#, python-format
+msgid "%s: not copying - file has been marked for remove\n"
+msgstr ""
+
+#, python-format
+msgid "%s: not overwriting - %s collides with %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s: not overwriting - file exists\n"
+msgstr ""
+
+#, python-format
+msgid "%s: deleted in working copy\n"
+msgstr ""
+
+#, python-format
+msgid "%s: cannot copy - %s\n"
+msgstr ""
+
+#, python-format
+msgid "moving %s to %s\n"
+msgstr ""
+
+#, python-format
+msgid "copying %s to %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
+msgstr ""
+
+msgid "no source or destination specified"
+msgstr ""
+
+msgid "no destination specified"
+msgstr ""
+
+msgid "with multiple sources, destination must be an existing directory"
+msgstr ""
+
+#, python-format
+msgid "destination %s is not a directory"
+msgstr ""
+
+msgid "no files to copy"
+msgstr ""
+
+msgid "(consider using --after)\n"
+msgstr ""
+
+#, python-format
+msgid "changeset: %d:%s\n"
+msgstr ""
+
+#, python-format
+msgid "branch: %s\n"
+msgstr ""
+
+#, python-format
+msgid "tag: %s\n"
+msgstr ""
+
+#, python-format
+msgid "parent: %d:%s\n"
+msgstr ""
+
+#, python-format
+msgid "manifest: %d:%s\n"
+msgstr ""
+
+#, python-format
+msgid "user: %s\n"
+msgstr ""
+
+#, python-format
+msgid "date: %s\n"
+msgstr ""
+
+msgid "files+:"
+msgstr ""
+
+msgid "files-:"
+msgstr ""
+
+msgid "files:"
+msgstr ""
+
+#, python-format
+msgid "files: %s\n"
+msgstr ""
+
+#, python-format
+msgid "copies: %s\n"
+msgstr ""
+
+#, python-format
+msgid "extra: %s=%s\n"
+msgstr ""
+
+msgid "description:\n"
+msgstr ""
+
+#, python-format
+msgid "summary: %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s: no key named '%s'"
+msgstr ""
+
+#, python-format
+msgid "%s: %s"
+msgstr ""
+
+#, python-format
+msgid "Found revision %s from %s\n"
+msgstr ""
+
+msgid "revision matching date not found"
+msgstr ""
+
+#, python-format
+msgid "cannot follow nonexistent file: \"%s\""
+msgstr ""
+
+#, python-format
+msgid "%s:%s copy source revision cannot be found!\n"
+msgstr ""
+
+msgid "can only follow copies/renames for explicit filenames"
+msgstr ""
+
+msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
+msgstr ""
+
+msgid "HG: Leave message empty to abort commit."
+msgstr ""
+
+#, python-format
+msgid "HG: user: %s"
+msgstr ""
+
+msgid "HG: branch merge"
+msgstr ""
+
+#, python-format
+msgid "HG: branch '%s'"
+msgstr ""
+
+#, python-format
+msgid "HG: subrepo %s"
+msgstr ""
+
+#, python-format
+msgid "HG: added %s"
+msgstr ""
+
+#, python-format
+msgid "HG: changed %s"
+msgstr ""
+
+#, python-format
+msgid "HG: removed %s"
+msgstr ""
+
+msgid "HG: no files changed"
+msgstr ""
+
+msgid "empty commit message"
+msgstr ""
+
+msgid ""
+"add the specified files on the next commit\n"
+"\n"
+" Schedule files to be version controlled and added to the\n"
+" repository.\n"
+"\n"
+" The files will be added to the repository at the next commit. To\n"
+" undo an add before that, see hg forget.\n"
+"\n"
+" If no names are given, add all files to the repository.\n"
+" "
+msgstr ""
+"lägg till de specificerade filerna i nästa arkivering\n"
+"\n"
+" Schemalägg filer att versionshanteras och läggas till i arkivet.\n"
+"\n"
+" Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n"
+" ångra en addering innan dess, se hg forget.\n"
+"\n"
+" Om inga namn anges, läggs alla filer till i arkivet.\n"
+" "
+
+msgid ""
+"add all new files, delete all missing files\n"
+"\n"
+" Add all new files and remove all missing files from the\n"
+" repository.\n"
+"\n"
+" New files are ignored if they match any of the patterns in\n"
+" .hgignore. As with add, these changes take effect at the next\n"
+" commit.\n"
+"\n"
+" Use the -s/--similarity option to detect renamed files. With a\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 ""
+
+msgid "similarity must be a number"
+msgstr ""
+
+msgid "similarity must be between 0 and 100"
+msgstr ""
+
+msgid ""
+"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 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 annotate the file\n"
+" anyway, although the results will probably be neither useful\n"
+" nor desirable.\n"
+" "
+msgstr ""
+"visa ändringsinformation för varje rad i filer\n"
+"\n"
+" Visa ändringar i filer, och ansvarigt revisions-ID för varje rad\n"
+"\n"
+" Detta kommando är användbart för att upptäcka när en ändring gjordes\n"
+" och av vem.\n"
+"\n"
+" Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n"
+" som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n"
+" om resultatet antagligen inte kommer att vara användbart.\n"
+" "
+
+msgid "at least one filename or pattern is required"
+msgstr ""
+
+msgid "at least one of -n/-c is required for -l"
+msgstr ""
+
+#, python-format
+msgid "%s: binary file\n"
+msgstr ""
+
+msgid ""
+"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"
+"\n"
+" The exact name of the destination archive or directory is given\n"
+" using a format string; see 'hg help export' for details.\n"
+"\n"
+" Each member added to an archive file has a directory prefix\n"
+" prepended. Use -p/--prefix to specify a format string for the\n"
+" prefix. The default is the basename of the archive, with suffixes\n"
+" removed.\n"
+" "
+msgstr ""
+
+msgid "no working directory: please specify a revision"
+msgstr ""
+
+msgid "repository root cannot be destination"
+msgstr ""
+
+msgid "cannot archive plain files to stdout"
+msgstr ""
+
+msgid ""
+"reverse effect of earlier changeset\n"
+"\n"
+" 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 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.\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"
+" changeset afterwards. This saves you from doing the merge by hand.\n"
+" The result of this merge is not committed, as with a normal merge.\n"
+"\n"
+" See 'hg help dates' for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+
+msgid "please specify just one revision"
+msgstr ""
+
+msgid "please specify a revision to backout"
+msgstr ""
+
+msgid "cannot backout change on a different branch"
+msgstr ""
+
+msgid "cannot backout a change with no parents"
+msgstr ""
+
+msgid "cannot backout a merge changeset without --parent"
+msgstr ""
+
+#, python-format
+msgid "%s is not a parent of %s"
+msgstr ""
+
+msgid "cannot use --parent on non-merge changeset"
+msgstr ""
+
+#, python-format
+msgid "changeset %s backs out changeset %s\n"
+msgstr ""
+
+#, python-format
+msgid "merging with changeset %s\n"
+msgstr ""
+
+msgid "the backout changeset is a new head - do not forget to merge\n"
+msgstr ""
+
+msgid "(use \"backout --merge\" if you want to auto-merge)\n"
+msgstr ""
+
+msgid ""
+"subdivision search of changesets\n"
+"\n"
+" This command helps to find changesets which introduce problems. To\n"
+" use, mark the earliest changeset you know exhibits the problem as\n"
+" 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 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 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 ""
+
+msgid "The first good revision is:\n"
+msgstr ""
+
+msgid "The first bad revision is:\n"
+msgstr ""
+
+msgid "Due to skipped revisions, the first good revision could be any of:\n"
+msgstr ""
+
+msgid "Due to skipped revisions, the first bad revision could be any of:\n"
+msgstr ""
+
+msgid "cannot bisect (no known good revisions)"
+msgstr ""
+
+msgid "cannot bisect (no known bad revisions)"
+msgstr ""
+
+msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
+msgstr ""
+
+msgid "incompatible arguments"
+msgstr ""
+
+#, python-format
+msgid "cannot find executable: %s"
+msgstr ""
+
+#, python-format
+msgid "failed to execute %s"
+msgstr ""
+
+#, python-format
+msgid "%s killed"
+msgstr ""
+
+#, python-format
+msgid "Changeset %d:%s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
+msgstr ""
+
+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 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 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. Use\n"
+" 'hg commit --close-branch' to mark this branch as closed.\n"
+" "
+msgstr ""
+
+#, python-format
+msgid "reset working directory to branch %s\n"
+msgstr ""
+
+msgid "a branch of the same name already exists (use --force to override)"
+msgstr ""
+
+#, python-format
+msgid "marked working directory as branch %s\n"
+msgstr ""
+
+msgid ""
+"list repository named branches\n"
+"\n"
+" List the repository's named branches, indicating which ones are\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"
+" "
+msgstr ""
+
+msgid ""
+"create a changegroup file\n"
+"\n"
+" Generate a compressed changegroup file collecting changesets not\n"
+" known to be in another repository.\n"
+"\n"
+" 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).\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"
+" command. This is useful when direct push and pull are not\n"
+" available or when exporting an entire repository is undesirable.\n"
+"\n"
+" Applying bundles preserves all changeset contents including\n"
+" permissions, copy/rename information, and revision history.\n"
+" "
+msgstr ""
+
+msgid "--base is incompatible with specifying a destination"
+msgstr ""
+
+msgid "unknown bundle type specified with --type"
+msgstr ""
+
+msgid ""
+"output the current or given revision of files\n"
+"\n"
+" Print the specified files as they were at the given revision. If\n"
+" no revision is given, the parent of the working directory is used,\n"
+" or tip if no revision is checked out.\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 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"
+" "
+msgstr ""
+
+msgid ""
+"make a copy of an existing repository\n"
+"\n"
+" Create a copy of an existing repository in a new directory.\n"
+"\n"
+" If no destination directory name is specified, it defaults to the\n"
+" basename of the source.\n"
+"\n"
+" The location of the source is added to the new repository's\n"
+" .hg/hgrc file, as the default to be used for future pulls.\n"
+"\n"
+" If you use the -r/--rev option to clone up to a specific revision,\n"
+" no subsequent revisions (including subsequent tags) will be\n"
+" present in the cloned repository. This option implies --pull, even\n"
+" on local repositories.\n"
+"\n"
+" By default, clone will check out the head of the 'default' branch.\n"
+" If the -U/--noupdate option is used, the new clone will contain\n"
+" only a repository (.hg) and no working copy (the working copy\n"
+" parent is the null revision).\n"
+"\n"
+" See 'hg help urls' for valid source format details.\n"
+"\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"
+" 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"
+" to the repository data, not to the checked out files). Some\n"
+" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
+" do not report errors. In these cases, use the --pull option to\n"
+" avoid hardlinking.\n"
+"\n"
+" In some cases, you can clone repositories and checked out files\n"
+" using full hardlinks with ::\n"
+"\n"
+" $ cp -al REPO REPOCLONE\n"
+"\n"
+" This is the fastest way to clone, but it is not always safe. The\n"
+" operation is not atomic (making sure REPO is not modified during\n"
+" the operation is up to you) and you have to make sure your editor\n"
+" 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"
+" "
+msgstr ""
+"gör en kopia av ett existerande arkiv\n"
+"\n"
+" Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
+"\n"
+" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
+" källan att användas.\n"
+"\n"
+" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
+" som standardplats att användas för framtida dragningar.\n"
+"\n"
+" Om du använder flaggan -r/--rev för att klona fram till en specifik\n"
+" revision, kommer inga efterföljande revisioner (inklusive efterföljande\n"
+" märken) att finnas i det klonade arkivet. Denna flagga använder\n"
+" automatiskt --pull, även för lokala arkiv.\n"
+"\n"
+" Som standard kommer clone att hämta ut toppen i grenen 'default'. Om\n"
+" flaggan -U/--noupdate används, kommer den nya klonen bara att innehålla\n"
+" ett arkiv (.hg) och igen arbetskopia (arbetskopians förälder är\n"
+" null-revisionen.\n"
+"\n"
+" Se 'hg help urls' för detaljer om giltiga källformat.\n"
+"\n"
+" Av effektivitestskäl används hårda länkar när källan och destinationen\n"
+" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
+" inte de uthämtade filerna). Vissa filsystem såsom AFS implementerar\n"
+" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
+" för att undvika användning av hårda länkar.\n"
+"\n"
+" I vissa fall kan du klona både arkiv och uthämtade filer, alla\n"
+" hårdlänkade, med ::\n"
+"\n"
+" $ cp -al ARKIV ARKIVKLON\n"
+"\n"
+" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
+" Operationen är inte atomisk (att ARKIV inte modifieras under\n"
+" operationen är upp till dig) och du måste se till att din editor bryter\n"
+" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
+" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
+" under katalogen .hg, som mq.\n"
+" "
+
+msgid ""
+"commit the specified files or all outstanding changes\n"
+"\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 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"
+" 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"
+"\n"
+" See 'hg help dates' for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+"arkivera de angivna filerna eller alla ändringar\n"
+"\n"
+" Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n"
+" från ett centralicerat RCS, är detta en lokal operation. Se hg push\n"
+" för ett sätt att aktivt distribuera dina ändringar.\n"
+"\n"
+" Om filer inte anges, kommer alla ändringar som \"hg status\"\n"
+" rapporterar att arkiveras.\n"
+"\n"
+" Om du arkiverar resultatet av en sammanfogning, ange inga filnamn\n"
+" eller flaggorna -I/-X.\n"
+"\n"
+" Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n"
+" att startas och fråga om meddelandet.\n"
+"\n"
+" Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
+" "
+
+msgid "nothing changed\n"
+msgstr ""
+
+msgid "created new head\n"
+msgstr ""
+
+#, python-format
+msgid "committed changeset %d:%s\n"
+msgstr ""
+
+msgid ""
+"mark files as copied for the next commit\n"
+"\n"
+" Mark dest as having copies of source files. If dest is a\n"
+" directory, copies are put in that directory. If dest is a file,\n"
+" the source must be a single file.\n"
+"\n"
+" By default, this command copies the contents of files as they\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 ""
+
+msgid "find the ancestor revision of two revisions in a given index"
+msgstr ""
+
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr ""
+
+msgid "either two or three arguments required"
+msgstr ""
+
+msgid "returns the completion list associated with the given command"
+msgstr ""
+
+msgid "rebuild the dirstate as it would look like for the given revision"
+msgstr ""
+
+msgid "validate the correctness of the current dirstate"
+msgstr ""
+
+#, python-format
+msgid "%s in state %s, but not in manifest1\n"
+msgstr ""
+
+#, python-format
+msgid "%s in state %s, but also in manifest1\n"
+msgstr ""
+
+#, python-format
+msgid "%s in state %s, but not in either manifest\n"
+msgstr ""
+
+#, python-format
+msgid "%s in manifest1, but listed as state %s"
+msgstr ""
+
+msgid ".hg/dirstate inconsistent with current parent's manifest"
+msgstr ""
+
+msgid ""
+"show combined config settings from all hgrc files\n"
+"\n"
+" With no arguments, print names and values of all config items.\n"
+"\n"
+" With one argument of the form section.name, print just the value\n"
+" of that config item.\n"
+"\n"
+" With multiple arguments, print names and values of all config\n"
+" items with matching section names.\n"
+"\n"
+" With --debug, the source (filename and line number) is printed\n"
+" for each config item.\n"
+" "
+msgstr ""
+
+msgid "only one config item permitted"
+msgstr ""
+
+msgid ""
+"manually set the parents of the current working directory\n"
+"\n"
+" This is useful for writing repository conversion tools, but should\n"
+" be used with care.\n"
+" "
+msgstr ""
+
+msgid "show the contents of the current dirstate"
+msgstr ""
+
+#, python-format
+msgid "copy: %s -> %s\n"
+msgstr ""
+
+msgid "dump the contents of a data file revision"
+msgstr ""
+
+#, python-format
+msgid "invalid revision identifier %s"
+msgstr ""
+
+msgid "parse and display a date"
+msgstr ""
+
+msgid "dump the contents of an index file"
+msgstr ""
+
+msgid "dump an index DAG as a graphviz dot file"
+msgstr ""
+
+msgid "test Mercurial installation"
+msgstr ""
+
+#, python-format
+msgid "Checking encoding (%s)...\n"
+msgstr ""
+
+msgid " (check that your locale is properly set)\n"
+msgstr ""
+
+msgid "Checking extensions...\n"
+msgstr ""
+
+msgid " One or more extensions could not be found"
+msgstr ""
+
+msgid " (check that you compiled the extensions)\n"
+msgstr ""
+
+msgid "Checking templates...\n"
+msgstr ""
+
+msgid " (templates seem to have been installed incorrectly)\n"
+msgstr ""
+
+msgid "Checking patch...\n"
+msgstr ""
+
+msgid " patch call failed:\n"
+msgstr ""
+
+msgid " unexpected patch output!\n"
+msgstr ""
+
+msgid " patch test failed!\n"
+msgstr ""
+
+msgid ""
+" (Current patch tool may be incompatible with patch, or misconfigured. "
+"Please check your .hgrc file)\n"
+msgstr ""
+
+msgid ""
+" Internal patcher failure, please report this error to http://mercurial."
+"selenic.com/bts/\n"
+msgstr ""
+
+msgid "Checking commit editor...\n"
+msgstr ""
+
+msgid " No commit editor set and can't find vi in PATH\n"
+msgstr ""
+
+msgid " (specify a commit editor in your .hgrc file)\n"
+msgstr ""
+
+#, python-format
+msgid " Can't find editor '%s' in PATH\n"
+msgstr ""
+
+msgid "Checking username...\n"
+msgstr ""
+
+msgid " (specify a username in your .hgrc file)\n"
+msgstr ""
+
+msgid "No problems detected\n"
+msgstr ""
+
+#, python-format
+msgid "%s problems detected, please check your install!\n"
+msgstr ""
+
+msgid "dump rename information"
+msgstr ""
+
+#, python-format
+msgid "%s renamed from %s:%s\n"
+msgstr ""
+
+#, python-format
+msgid "%s not renamed\n"
+msgstr ""
+
+msgid "show how files match on given patterns"
+msgstr ""
+
+msgid ""
+"diff repository (or selected files)\n"
+"\n"
+" Show differences between revisions for the specified files.\n"
+"\n"
+" Differences between files are shown using the unified diff format.\n"
+"\n"
+" NOTE: diff may generate unexpected results for merges, as it will\n"
+" default to comparing against the working directory's first parent\n"
+" changeset if no revisions are specified.\n"
+"\n"
+" When two revision arguments are given, then changes are shown\n"
+" between those revisions. If only one revision is specified then\n"
+" that revision is compared to the working directory, and, when no\n"
+" revisions are specified, the working directory files are compared\n"
+" to its parent.\n"
+"\n"
+" Without the -a/--text option, diff will avoid generating diffs of\n"
+" files it detects as binary. With -a, diff will generate a diff\n"
+" anyway, probably with undesirable results.\n"
+"\n"
+" Use the -g/--git option to generate diffs in the git extended diff\n"
+" format. For more information, read 'hg help diffs'.\n"
+" "
+msgstr ""
+"visa skillnader i arkivet (eller på valda filer)\n"
+"\n"
+" Visa skillnader mellan revisioner för specificerade filer.\n"
+"\n"
+" Skillnaderna mellan filerna visas i unified diff-format.\n"
+"\n"
+" NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n"
+" eftersom den som standard kommer att jämföra mot arbetskatalogens\n"
+" tidigare ändring om ingen revision anges.\n"
+"\n"
+" När två revisioner anges, visas ändringarna mellan dessa två\n"
+" revisioner. Om bara en revision anges kommer den att jämföras med\n"
+" arbetskatalogen, och om ingen revision anges, jämförs arbetskatalogens\n"
+" filer med dess förälder.\n"
+"\n"
+" Utan flaggan -a/--text, kommer diff att försöka undvika att visa\n"
+" skillnader mellan binära filer. Med -a, kommer en diff att skapas ändå,\n"
+" troligtvis med oönskade resultat.\n"
+"\n"
+" Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n"
+" mer information, läs 'hg help diffs'.\n"
+" "
+
+msgid ""
+"dump the header and diffs for one or more changesets\n"
+"\n"
+" Print the changeset header and diffs for one or more revisions.\n"
+"\n"
+" The information shown in the changeset header is: author,\n"
+" changeset hash, parent(s) and commit comment.\n"
+"\n"
+" NOTE: export may generate unexpected diff output for merge\n"
+" changesets, as it will compare the merge changeset against its\n"
+" 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"
+"\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. 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"
+" "
+msgstr ""
+"dumpa rubrik och diff för en eller fler ändringar\n"
+"\n"
+" Skriv ändringsrubriken och diffen för en eller fler revisioner.\n"
+"\n"
+" Informationen som visas i ändringsheadern är: författare, ändringens\n"
+" hash, föräldrar och arkiveringskommentar.\n"
+"\n"
+" NOTERA: export kan generera oväntade resultat för sammanfogningar,\n"
+" eftersom den som standard bara kommer att jämföra mot den första\n"
+" föräldern.\n"
+"\n"
+" Utmatning kan vara till en fil, och då anges namnet på filen med en\n"
+" formatsträng. Formateringsreglerna är som följer::\n"
+"\n"
+" %% ett \"%\"-tecken\n"
+" %H ändringshash (40 hexadecimala bytes)\n"
+" %N antal genererade patchar\n"
+" %R ändringens revisionsnummer\n"
+" %b basnamn för det exporterande arkivet\n"
+" %h kort ändringshash (12 hexadecimala bytes)\n"
+" %n nollpaddat sekvensnummer, börjar med 1\n"
+" %r nollpaddat ändringsrevisionsnummer\n"
+"\n"
+" Utan flaggan -a/--text, kommer export att undvika skapandet av diffar\n"
+" av filer som upptäcks vara binära. Med -a, kommer filen att exporteras\n"
+" ändå, även om resultatet antagligen inte kommer att vara användbart.\n"
+"\n"
+" Använd flaggan -g/--git för att generera diffar i gits utökade format.\n"
+" Se 'hg help diffs' för mer information.\n"
+"\n"
+" Med flaggan --switch-parent, kommer diffen att vara mot den andra\n"
+" föräldern. Det kan vara användbart för att granska en sammanfogning.\n"
+" "
+
+msgid "export requires at least one changeset"
+msgstr ""
+
+msgid "exporting patches:\n"
+msgstr ""
+
+msgid "exporting patch:\n"
+msgstr ""
+
+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 ""
+"glöm de specificerade filerna vid nästa arkivering\n"
+"\n"
+" Märk de specificerade filerna så att de inte längre kommer att spåras\n"
+" efter nästa arkivering.\n"
+"\n"
+" Detta tar bara bort filer från den nuvarande grenen, inte från hela\n"
+" projekthistoriken, och det raderar dem inte från arbetskatalogen.\n"
+"\n"
+" För att ångra en forget innan nästa arkivering, se hg add.\n"
+" "
+
+msgid "no files specified"
+msgstr ""
+
+#, python-format
+msgid "not removing %s: file is already untracked\n"
+msgstr ""
+
+msgid ""
+"search for a pattern in specified files and revisions\n"
+"\n"
+" Search revisions of files for a regular expression.\n"
+"\n"
+" This command behaves differently than Unix grep. It only accepts\n"
+" Python/Perl regexps. It searches repository history, not the\n"
+" working directory. It always prints the revision number in which a\n"
+" match appears.\n"
+"\n"
+" By default, grep only prints output for the first revision of a\n"
+" file in which it finds a match. To get it to print every revision\n"
+" that contains a change in match status (\"-\" for a match that\n"
+" becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
+" use the --all flag.\n"
+" "
+msgstr ""
+
+#, python-format
+msgid "grep: invalid match pattern: %s\n"
+msgstr ""
+
+msgid ""
+"show current repository heads or show branch heads\n"
+"\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"
+"\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 ""
+
+msgid "you must specify a branch to use --closed"
+msgstr ""
+
+#, python-format
+msgid "no open branch heads on branch %s\n"
+msgstr ""
+
+#, python-format
+msgid "no changes on branch %s containing %s are reachable from %s\n"
+msgstr ""
+
+#, python-format
+msgid "no changes on branch %s are reachable from %s\n"
+msgstr ""
+
+msgid ""
+"show help for a given topic or a help overview\n"
+"\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."
+msgstr ""
+"visa hjälp för ett givet ämne eller en hjälpöversikt\n"
+"\n"
+" Utan argument visas en kommandolista med korta hjälpmeddelanden.\n"
+"\n"
+" Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n"
+" "
+
+msgid "global options:"
+msgstr "globala flaggor:"
+
+msgid "use \"hg help\" for the full list of commands"
+msgstr "använd \"hg help\" för den fulla kommandolistan"
+
+msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
+msgstr ""
+"använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer"
+
+#, python-format
+msgid "use \"hg -v help%s\" to show aliases and global options"
+msgstr "använd \"hg -v help%s\" för att visa alias och globala flaggor"
+
+#, python-format
+msgid "use \"hg -v help %s\" to show global options"
+msgstr "använd \"hg -v help %s\" för att visa globala flaggor"
+
+msgid ""
+"list of commands:\n"
+"\n"
+msgstr ""
+"kommandolista:\n"
+"\n"
+
+#, python-format
+msgid ""
+"\n"
+"aliases: %s\n"
+msgstr ""
+"\n"
+"alias: %s\n"
+
+msgid "(no help text available)"
+msgstr ""
+
+msgid "options:\n"
+msgstr "flaggor:\n"
+
+msgid "no commands defined\n"
+msgstr ""
+
+msgid "enabled extensions:"
+msgstr "aktiverade utökningar:"
+
+msgid "no help text available"
+msgstr ""
+
+#, python-format
+msgid ""
+"%s extension - %s\n"
+"\n"
+msgstr ""
+
+msgid "Mercurial Distributed SCM\n"
+msgstr "Mercurial Distribuerad SCM\n"
+
+msgid ""
+"basic commands:\n"
+"\n"
+msgstr ""
+"grundläggande kommandon:\n"
+"\n"
+
+msgid ""
+"\n"
+"additional help topics:\n"
+"\n"
+msgstr ""
+"\n"
+"ytterligare hjälpämnen:\n"
+"\n"
+
+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"
+" 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"
+" uncommitted changes in the working directory, a list of tags for\n"
+" this revision and a branch name for non-default branches.\n"
+" "
+msgstr ""
+
+msgid ""
+"import an ordered set of patches\n"
+"\n"
+" Import a list of patches and commit them individually.\n"
+"\n"
+" If there are outstanding changes in the working directory, import\n"
+" 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 (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"
+"\n"
+" If the imported patch was generated by hg export, user and\n"
+" description from patch override values from message headers and\n"
+" body. Values given on command line with -m/--message and -u/--user\n"
+" override these.\n"
+"\n"
+" If --exact is specified, import will set the working directory to\n"
+" the parent of each patch before applying it, and will abort if the\n"
+" resulting changeset has a different ID than the one recorded in\n"
+" the patch. This may happen due to character set problems or other\n"
+" deficiencies in the text patch format.\n"
+"\n"
+" 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 \"-\" 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 ""
+
+msgid "applying patch from stdin\n"
+msgstr ""
+
+msgid "no diffs found"
+msgstr ""
+
+#, python-format
+msgid ""
+"message:\n"
+"%s\n"
+msgstr ""
+
+msgid "not a Mercurial patch"
+msgstr ""
+
+msgid "patch is damaged or loses information"
+msgstr ""
+
+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 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"
+"\n"
+" See pull for valid source format details.\n"
+" "
+msgstr ""
+
+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 will be created.\n"
+"\n"
+" If no directory is given, the current directory is used.\n"
+"\n"
+" It is possible to specify an ssh:// URL as the destination.\n"
+" See 'hg help urls' for more information.\n"
+" "
+msgstr ""
+"skapa ett nytt arkiv i den angivna katalogen\n"
+"\n"
+" Initialisera ett nytt arkiv i den angivna katalogen. Om den angivna\n"
+" katalogen inte existerar, kommer den att skapas.\n"
+"\n"
+" Om ingen katalog anges, används den nuvarande katalogen.\n"
+"\n"
+" Det är möjligt att specificera en URL med ssh:// som destination. Se\n"
+" 'hg help urls' för mer information.\n"
+" "
+
+msgid ""
+"locate files matching specific patterns\n"
+"\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 whitespace as multiple filenames.\n"
+" "
+msgstr ""
+
+msgid ""
+"show revision history of entire repository or files\n"
+"\n"
+" Print the revision history of the specified files or the entire\n"
+" project.\n"
+"\n"
+" File history is shown without following rename or copy history of\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"
+" If no revision range is specified, the default is tip:0 unless\n"
+" --follow is set, in which case the working directory parent is\n"
+" used as the starting revision.\n"
+"\n"
+" See 'hg help dates' for a list of formats valid for -d/--date.\n"
+"\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, only files different from BOTH parents\n"
+" will appear in files:.\n"
+" "
+msgstr ""
+"visa revisionshistorik för hela arkivet eller filer\n"
+"\n"
+" Skriv ut revisionshistoriken för de specificerade filerna eller hela\n"
+" projektet.\n"
+"\n"
+" Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n"
+" filer. Använd -f/--follow med ett filnamn för att följa historiken även\n"
+" vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n"
+" visa föräldrar eller ättlingar från startrevisionen. --follow-first\n"
+" följer bara den första föräldern i revisoner med sammanfogningar.\n"
+"\n"
+" Om ingen revisionsserie specificeras, används tip:0 som standard om\n"
+" inte --follow är satt, då arbetskatalogens förälder används som första\n"
+" revision.\n"
+"\n"
+" Se 'hg help dates' för giltiga format till -d/--date.\n"
+"\n"
+" Som standard skriver detta kommando ut revisionsnummer och ändrings-id,\n"
+" märken, icke-triviala föräldrar, användare, datum och tid, samt ett\n"
+" sammandrag för varje arkivering. När flaggan -v/--verbose används,\n"
+" visas listan med ändrade filer och fullständigt arkiveringsmeddelande.\n"
+"\n"
+" NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n"
+" sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n"
+" första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n"
+" föräldrarna att visas i filer:.\n"
+" "
+
+msgid ""
+"output the current or given revision of the project manifest\n"
+"\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 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 ""
+
+msgid ""
+"merge working directory with another revision\n"
+"\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 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 with which to merge with must be provided.\n"
+" "
+msgstr ""
+"sammanfoga arbetskatalogen med en annan revision\n"
+"\n"
+" Den aktuella arbetskatalogen uppdateras med alla ändringar som gjorts i\n"
+" den efterfrågade revisionen sedan den senaste gemensamma revisionen.\n"
+"\n"
+" Filerna som ändrats mellan föräldrarna markeras som förändrade till\n"
+" nästa arkivering och en arkivering måste utföras innan några andra\n"
+" arkivuppdateringar tillåts. Nästa arkivering kommer att ha två\n"
+" föräldrar.\n"
+"\n"
+" Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n"
+" och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n"
+" det andra huvudet som standard. Om inte, måste en explicit revision\n"
+" anges.\n"
+" "
+
+#, python-format
+msgid "branch '%s' has %d heads - please merge with an explicit rev"
+msgstr ""
+
+#, python-format
+msgid "branch '%s' has one head - please merge with an explicit rev"
+msgstr ""
+
+msgid "there is nothing to merge"
+msgstr ""
+
+#, python-format
+msgid "%s - use \"hg update\" instead"
+msgstr ""
+
+msgid ""
+"working dir not at a head rev - use \"hg update\" or merge with an explicit "
+"rev"
+msgstr ""
+
+msgid ""
+"show changesets not found in destination\n"
+"\n"
+" Show changesets not found in the specified destination repository\n"
+" or the default push location. These are the changesets that would\n"
+" be pushed if a push was requested.\n"
+"\n"
+" See pull for valid destination format details.\n"
+" "
+msgstr ""
+
+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, 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 ""
+"visa föräldrar till arbetskatalogen eller revision\n"
+"\n"
+" Visa revisioner för arbetskatalogens föräldrar. Om en revision anges\n"
+" via -r/--rev, kommer den revisionens föräldrar att visas. Om en fil\n"
+" anges, kommer revisionen då den filen sist ändrades (innan\n"
+" arbetskatalogens revision eller innan --rev om angiven) att visas.\n"
+" "
+
+msgid "can only specify an explicit filename"
+msgstr ""
+
+#, python-format
+msgid "'%s' not found in manifest!"
+msgstr ""
+
+msgid ""
+"show aliases for remote repositories\n"
+"\n"
+" Show definition of symbolic path name NAME. If no name is given,\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"
+"\n"
+" See 'hg help urls' for more information.\n"
+" "
+msgstr ""
+
+msgid "not found!\n"
+msgstr ""
+
+msgid "not updating, since new heads added\n"
+msgstr ""
+
+msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
+msgstr ""
+
+msgid "(run 'hg update' to get a working copy)\n"
+msgstr ""
+
+msgid ""
+"pull changes from the specified source\n"
+"\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 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"
+" "
+msgstr ""
+"dra ändringar från den specificerade källan"
+"\n"
+" Drar ändringar från ett annat arkiv till ett lokalt.\n"
+"\n"
+" Hittar alla ändringar från arkivet i den specificerade sökvägen eller\n"
+" URL:en och lägger till dem i det lokala arkivet (det nuvarande om inte\n"
+" -R är angivet). Som standard uppdaterar detta inte projektkopian i\n"
+" arbetskatalogen.\n"
+"\n"
+" Använd hg incoming om du vill se vad som skulle ha lagts till av en\n"
+" dragning vid det tillfället du kör kommandot. Om du bestämmer dig för\n"
+" att lägga till de ändringarna i arkivet, använd pull -r X där X -r den\n"
+" sista ändringen listad av hg incoming.\n"
+"\n"
+" Om KÄLLA inte är angivet, används 'default'-sökvägen.\n"
+" Se 'hg help urls' för mer information.\n"
+" "
+
+msgid ""
+"push changes to the specified destination\n"
+"\n"
+" Push changes from the local repository to the given destination.\n"
+"\n"
+" This is the symmetrical operation for pull. It moves changes from\n"
+" the current repository to a different one. If the destination is\n"
+" local this is identical to a pull in that directory from the\n"
+" current one.\n"
+"\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"
+" 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"
+" Please see 'hg help urls' for important details about ssh://\n"
+" URLs. If DESTINATION is omitted, a default path will be used.\n"
+" "
+msgstr ""
+"tryck ändringar till den specificerade destinationen"
+"\n"
+" Trycker ändringar från det lokala arkivet till den givna destinationen.\n"
+"\n"
+" Detta är en symmetriska operationen för pull. Den flyttar ändringar\n"
+" från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n"
+" är detta identiskt med en dragning i den katalogen från den nuvarande.\n"
+"\n"
+" Som standard vägrar push att utföra något om det upptäcks att antalet\n"
+" huvuden i destinationen ökar. Det brukar generellt sett indikera att\n"
+" användaren glömt att dra och sammanfoga innan tryckning.\n"
+"\n"
+" Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n"
+" tryckas till det andra arkivet.\n"
+"\n"
+" Se 'hg help urls' för viktiga detaljer om URL:er med ssh://. Om\n"
+" DESTINATION inte är angivet, används standardsökvägen."
+
+#, python-format
+msgid "pushing to %s\n"
+msgstr ""
+
+msgid ""
+"roll back an interrupted transaction\n"
+"\n"
+" Recover from an interrupted commit or pull.\n"
+"\n"
+" This command tries to fix the repository status after an\n"
+" interrupted operation. It should only be necessary when Mercurial\n"
+" suggests it.\n"
+" "
+msgstr ""
+
+msgid ""
+"remove the specified files on the next commit\n"
+"\n"
+" Schedule the indicated files for removal from the repository.\n"
+"\n"
+" This only removes files from the current branch, not from the\n"
+" 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 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 [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"
+" "
+msgstr ""
+"ta bort de specificerade filerna vid nästa arkivering\n"
+"\n"
+" Markera de indikerade filerna för borttagning från arkivet.\n"
+"\n"
+" Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n"
+" projektets historik. -A/--after kan användas för att bara ta bort filer\n"
+" som redan raderats, -f/--force kan användas för att tvinga radering, och\n"
+" -Af kan ta bort filer från nästa revision utan att radera dem från\n"
+" arbetskopian.\n"
+"\n"
+" Följande tabell visar hur remove uppför sig för olika filstatus\n"
+" (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n"
+" Modifierad [M] och Saknad [!] (som rapporteras av hg status). Aktionerna\n"
+" är Varna, Radera (från gren) och Ta bort (från disk)::\n"
+"\n"
+" A C M !\n"
+" ingen V RT V R\n"
+" -f R RT RT R\n"
+" -A V V V R\n"
+" -Af R R R R\n"
+"\n"
+" Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n"
+" att ångra en remove innan dess, se hg revert.\n"
+" "
+
+#, python-format
+msgid "not removing %s: file is untracked\n"
+msgstr ""
+
+#, python-format
+msgid "not removing %s: file %s (use -f to force removal)\n"
+msgstr ""
+
+msgid "still exists"
+msgstr ""
+
+msgid "is modified"
+msgstr ""
+
+msgid "has been marked for add"
+msgstr ""
+
+msgid ""
+"rename files; equivalent of copy + remove\n"
+"\n"
+" Mark dest as copies of sources; mark sources for deletion. If dest\n"
+" is a directory, copies are put in that directory. If dest is a\n"
+" file, there can only be one source.\n"
+"\n"
+" By default, this command copies the contents of files as they\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 at the next commit. To undo a rename\n"
+" before that, see hg revert.\n"
+" "
+msgstr ""
+
+msgid ""
+"retry file merges from a merge or update\n"
+"\n"
+" This command will cleanly retry unresolved file merges using file\n"
+" revisions preserved from the last update or merge. To attempt to\n"
+" resolve all unresolved files, use the -a/--all switch.\n"
+"\n"
+" If a conflict is resolved manually, please note that the changes\n"
+" 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 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 ""
+
+msgid "too many options specified"
+msgstr ""
+
+msgid "can't specify --all and patterns"
+msgstr ""
+
+msgid "no files or directories specified; use --all to remerge all files"
+msgstr ""
+
+msgid ""
+"restore individual files or directories to an earlier state\n"
+"\n"
+" (Use update -r to check out earlier revisions, revert does not\n"
+" change the working directory parents.)\n"
+"\n"
+" With no revision specified, revert the named files or directories\n"
+" to the contents they had in the parent of the working directory.\n"
+" This restores the contents of the affected files to an unmodified\n"
+" state and unschedules adds, removes, copies, and renames. If the\n"
+" working directory has two parents, you must explicitly specify the\n"
+" revision to revert to.\n"
+"\n"
+" Using the -r/--rev option, revert the given files or directories\n"
+" to their contents as of a specific revision. This can be helpful\n"
+" to \"roll back\" some or all of an earlier change. See 'hg help\n"
+" dates' for a list of formats valid for -d/--date.\n"
+"\n"
+" Revert modifies the working directory. It does not commit any\n"
+" changes, or change the parent of the working directory. If you\n"
+" revert to a revision other than the parent of the working\n"
+" directory, the reverted files will thus appear modified\n"
+" afterwards.\n"
+"\n"
+" If a file has been deleted, it is restored. If the executable mode\n"
+" of a file was changed, it is reset.\n"
+"\n"
+" If names are given, all files matching the names are reverted.\n"
+" If no arguments are given, no files are reverted.\n"
+"\n"
+" Modified files are saved with a .orig suffix before reverting.\n"
+" To disable these backups, use --no-backup.\n"
+" "
+msgstr ""
+
+msgid "you can't specify a revision and a date"
+msgstr ""
+
+msgid "no files or directories specified; use --all to revert the whole repo"
+msgstr ""
+
+#, python-format
+msgid "forgetting %s\n"
+msgstr ""
+
+#, python-format
+msgid "reverting %s\n"
+msgstr ""
+
+#, python-format
+msgid "undeleting %s\n"
+msgstr ""
+
+#, python-format
+msgid "saving current version of %s as %s\n"
+msgstr ""
+
+#, python-format
+msgid "file not managed: %s\n"
+msgstr ""
+
+#, python-format
+msgid "no changes needed to %s\n"
+msgstr ""
+
+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. 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"
+"\n"
+" commit\n"
+" import\n"
+" pull\n"
+" push (with this repository as destination)\n"
+" unbundle\n"
+"\n"
+" This command is not intended for use on public repositories. Once\n"
+" changes are visible for pull by other users, rolling a transaction\n"
+" back locally is ineffective (someone else may already have pulled\n"
+" the changes). Furthermore, a race is possible with readers of the\n"
+" repository; for example an in-progress pull from the repository\n"
+" may fail if a rollback is performed.\n"
+" "
+msgstr ""
+
+msgid ""
+"print the root (top) of the current working directory\n"
+"\n"
+" Print the root directory of the current repository.\n"
+" "
+msgstr ""
+
+msgid ""
+"export the repository via HTTP\n"
+"\n"
+" Start a local HTTP repository browser and pull server.\n"
+"\n"
+" By default, the server logs accesses to stdout and errors to\n"
+" stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
+" files.\n"
+" "
+msgstr ""
+"exportera arkivet via HTTP\n"
+"\n"
+" Startar en lokal HTTP-arkivbläddrare och pull-server.\n"
+"\n"
+" Som standard loggar servern anslutningar till stdout och fel till\n"
+" stderr. Använd flaggorna -A/--accesslog och -E/--errorlog för att logga\n"
+" till filer.\n"
+" "
+
+#, python-format
+msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
+msgstr ""
+
+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"
+" 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"
+"\n"
+" NOTE: status may appear to disagree with diff if permissions have\n"
+" changed or a merge has occurred. The standard diff format does not\n"
+" report permission changes and diff only reports changes relative\n"
+" 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 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 ""
+"visa ändrade filer i arbetskatalogen\n"
+"\n"
+" Visa status för filer i arkivet. Om namn anges, visas bara filer som\n"
+" matchar. FIler som är rena eller ignorerade eller källan för en flytt-\n"
+" eller kopieringsoperation, visas inte om förrän -c/--clean,\n"
+" -i/--ignored, -C/--copies eller -A/--all anges. Om inte flaggor med\n"
+" beskrivningen \"visa bara ...\" anges, används flaggorna -mardu.\n"
+"\n"
+" Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n"
+" inte bes om explicit med -u/--unknown eller -i/--ignored.\n"
+"\n"
+" NOTERA: status kan verka osams med diff om tillstånd har ändrat eller en\n"
+" sammanfogning har utförts. Det vanliga diff-formatet rapporterar inte\n"
+" förändringar av tillstånd och diff rapporterar bara ändringar relativt\n"
+" till en förälder vid sammanfogningar.\n"
+"\n"
+" Koderna som används för att visa filstatus är::\n"
+"\n"
+" M = modifierad\n"
+" A = adderad\n"
+" R = raderad\n"
+" C = ren\n"
+" ! = saknad (borttagen av icke-hg-kommando, men fortfarande spårad)\n"
+" ? = inte spårad\n"
+" I = ignorerad\n"
+" = källa för den tidigare filen listad som A (adderad)\n"
+" "
+
+msgid ""
+"add one or more tags for the current or given revision\n"
+"\n"
+" Name a particular revision using <name>.\n"
+"\n"
+" Tags are used to name particular revisions of the repository and are\n"
+" very useful to compare different revisions, to go back to significant\n"
+" earlier versions or to mark branch points as releases, etc.\n"
+"\n"
+" If no revision is given, the parent of the working directory is\n"
+" used, or tip if no revision is checked out.\n"
+"\n"
+" To facilitate version control, distribution, and merging of tags,\n"
+" they are stored as a file named \".hgtags\" which is managed\n"
+" similarly to other project files and can be hand-edited if\n"
+" necessary. The file '.hg/localtags' is used for local tags (not\n"
+" shared among repositories).\n"
+"\n"
+" See 'hg help dates' for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+
+msgid "tag names must be unique"
+msgstr ""
+
+#, python-format
+msgid "the name '%s' is reserved"
+msgstr ""
+
+msgid "--rev and --remove are incompatible"
+msgstr ""
+
+#, python-format
+msgid "tag '%s' does not exist"
+msgstr ""
+
+#, python-format
+msgid "tag '%s' is not a global tag"
+msgstr ""
+
+#, python-format
+msgid "tag '%s' is not a local tag"
+msgstr ""
+
+#, python-format
+msgid "tag '%s' already exists (use -f to force)"
+msgstr ""
+
+msgid ""
+"list repository tags\n"
+"\n"
+" This lists both regular and local tags. When the -v/--verbose\n"
+" switch is used, a third column \"local\" is printed for local tags.\n"
+" "
+msgstr ""
+
+msgid ""
+"show the tip revision\n"
+"\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"
+" that repository becomes the current tip. The \"tip\" tag is special\n"
+" and cannot be renamed or assigned to a different changeset.\n"
+" "
+msgstr ""
+
+msgid ""
+"apply one or more changegroup files\n"
+"\n"
+" Apply one or more compressed changegroup files generated by the\n"
+" bundle command.\n"
+" "
+msgstr ""
+
+msgid ""
+"update working directory\n"
+"\n"
+" Update the repository's working directory to the specified\n"
+" revision, or the tip of the current branch if none is specified.\n"
+" Use null as the revision to remove the working copy (like 'hg\n"
+" clone -U').\n"
+"\n"
+" When the working directory contains no uncommitted changes, it\n"
+" will be replaced by the state of the requested revision from the\n"
+" repository. When the requested revision is on a different branch,\n"
+" the working directory will additionally be switched to that\n"
+" branch.\n"
+"\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. 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"
+" same branch, and one of them is an ancestor of the other, then the\n"
+" new working directory will contain the requested revision merged\n"
+" with the uncommitted changes. Otherwise, the update will fail with\n"
+" a suggestion to use 'merge' or 'update -C' instead.\n"
+"\n"
+" If you want to update just one file to an older revision, use\n"
+" revert.\n"
+"\n"
+" See 'hg help dates' for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+"uppdatera arbetskatalog\n"
+"\n"
+" Uppdatera arkivets arbetskatalog till den specificerade revisionen\n"
+" eller toppen av den nuvarande grenen om ingen anges. Använd null som\n"
+" revision för att ta bort arbetskopian (som 'hg clone -U').\n"
+"\n"
+" När arbetskatalogen inte innehåller oarkiverade ändringar, ersätts\n"
+" den med tillståndet för den begärda revisionen från arkivet. När den\n"
+" begärda revisionen är i en annan gren, kommer arbetskatalogen att växla\n"
+" till den grenen.\n"
+"\n"
+" När det finns oarkiverade ändringar, använd flaggan -C/--clean för att\n"
+" kassera dem, och tvinga tillståndet i arbetskatalogen till den begärda\n"
+" revisionen. Alternativt, använd -c/--check för att avbryta.\n"
+"\n"
+" När det finns oarkiverade ändringar och flaggan -C/--clean inte används,\n"
+" och föräldrarevisionen och den begärda revisionen är på samma gren, och\n"
+" en av dem är en anfäder till den andre, kommer arbetskatalogen att\n"
+" innehålla den begärda revisionen sammanfogad med de oarkiverade\n"
+" ändringarna. Om inte, kommer uppdateringen att misslyckas med ett\n"
+" förslag att använda 'merge' eller 'update -C' istället.\n"
+"\n"
+" Om du vill uppdatera bara en fil till en äldre revision, använd revert.\n"
+"\n"
+" Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
+" "
+
+msgid "uncommitted local changes"
+msgstr ""
+
+msgid ""
+"verify the integrity of the repository\n"
+"\n"
+" Verify the integrity of the current repository.\n"
+"\n"
+" This will perform an extensive check of the repository's\n"
+" integrity, validating the hashes and checksums of each entry in\n"
+" the changelog, manifest, and tracked files, as well as the\n"
+" integrity of their crosslinks and indices.\n"
+" "
+msgstr ""
+
+msgid "output version and copyright information"
+msgstr ""
+
+#, python-format
+msgid "Mercurial Distributed SCM (version %s)\n"
+msgstr ""
+
+msgid ""
+"\n"
+"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"This is free software; see the source for copying conditions. There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+msgstr ""
+
+msgid "repository root directory or symbolic path name"
+msgstr "arkivrotkatalog eller symbolisk sökväg"
+
+msgid "change working directory"
+msgstr "ändra arbetskatalog"
+
+msgid "do not prompt, assume 'yes' for any required answers"
+msgstr "fråga inte, anta att svaret är 'ja' på alla frågor"
+
+msgid "suppress output"
+msgstr "förhindra utmatning"
+
+msgid "enable additional output"
+msgstr "aktivera ytterligare utmatning"
+
+msgid "set/override config option"
+msgstr "sätt/upphäv konfigurationsflagga"
+
+msgid "enable debugging output"
+msgstr "aktivera debugutmatning"
+
+msgid "start debugger"
+msgstr "starta debugger"
+
+msgid "set the charset encoding"
+msgstr "sätt teckenkodning"
+
+msgid "set the charset encoding mode"
+msgstr "sätt teckenkodningsläge"
+
+msgid "print traceback on exception"
+msgstr "visa bakåtspårning vid undantak"
+
+msgid "time how long the command takes"
+msgstr "ta tid på hud lång tid kommandot körs"
+
+msgid "print command execution profile"
+msgstr "visa kommandoexekveringens profil"
+
+msgid "output version information and exit"
+msgstr "skriv versionsinformation och avsluta"
+
+msgid "display help and exit"
+msgstr "visa hjälp och avsluta"
+
+msgid "do not perform actions, just print output"
+msgstr "utför inget, bara visa"
+
+msgid "specify ssh command to use"
+msgstr "specificera ssh-kommando att använda"
+
+msgid "specify hg command to run on the remote side"
+msgstr "specificera hg-kommando att köra på andra sidan"
+
+msgid "include names matching the given patterns"
+msgstr "inkludera namn som matchar de givna mönstren"
+
+msgid "exclude names matching the given patterns"
+msgstr "exkludera namn som matchar de givna mönstren"
+
+msgid "use <text> as commit message"
+msgstr "använd <text> som arkiveringsmeddelande"
+
+msgid "read commit message from <file>"
+msgstr "läs arkiveringsmeddelandet från <fil>"
+
+msgid "record datecode as commit date"
+msgstr "lagra datumkod som arkiveringsdatum"
+
+msgid "record the specified user as committer"
+msgstr "lagra den specificerade användaren som arkiverare"
+
+msgid "display using template map file"
+msgstr "visa med mallfil"
+
+msgid "display with template"
+msgstr "visa med mall"
+
+msgid "do not show merges"
+msgstr "visa inte sammanfogningar"
+
+msgid "treat all files as text"
+msgstr "behandla alla filer som text"
+
+msgid "don't include dates in diff headers"
+msgstr "inkludera inte datum i diff-rubriker"
+
+msgid "show which function each change is in"
+msgstr "visa vilken funktion varje ändring är i"
+
+msgid "ignore white space when comparing lines"
+msgstr "ignorera blanktecken när rader jämförs"
+
+msgid "ignore changes in the amount of white space"
+msgstr "ignorera ändringar av antalet blanktäcken"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "ignorera ändringar vars rader är tomma"
+
+msgid "number of lines of context to show"
+msgstr "antal sammanhangsrader att visa"
+
+msgid "guess renamed files by similarity (0<=s<=100)"
+msgstr ""
+
+msgid "[OPTION]... [FILE]..."
+msgstr "[FLAGGA]... [FIL]..."
+
+msgid "annotate the specified revision"
+msgstr "annotera den specificerade revisionen"
+
+msgid "follow file copies and renames"
+msgstr "följ filkopior och namnbyten"
+
+msgid "list the author (long with -v)"
+msgstr "visa skapare (lång med -v)"
+
+msgid "list the date (short with -q)"
+msgstr "visa datum (kort med -q)"
+
+msgid "list the revision number (default)"
+msgstr "visa revisionsnummer (standard)"
+
+msgid "list the changeset"
+msgstr "visa ändring"
+
+msgid "show line number at the first appearance"
+msgstr "visa radnummer för första förekomsten"
+
+msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
+msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..."
+
+msgid "do not pass files through decoders"
+msgstr ""
+
+msgid "directory prefix for files in archive"
+msgstr ""
+
+msgid "revision to distribute"
+msgstr ""
+
+msgid "type of distribution to create"
+msgstr ""
+
+msgid "[OPTION]... DEST"
+msgstr ""
+
+msgid "merge with old dirstate parent after backout"
+msgstr ""
+
+msgid "parent to choose when backing out merge"
+msgstr ""
+
+msgid "revision to backout"
+msgstr ""
+
+msgid "[OPTION]... [-r] REV"
+msgstr ""
+
+msgid "reset bisect state"
+msgstr ""
+
+msgid "mark changeset good"
+msgstr ""
+
+msgid "mark changeset bad"
+msgstr ""
+
+msgid "skip testing changeset"
+msgstr ""
+
+msgid "use command to check changeset state"
+msgstr ""
+
+msgid "do not update to target"
+msgstr ""
+
+msgid "[-gbsr] [-c CMD] [REV]"
+msgstr ""
+
+msgid "set branch name even if it shadows an existing branch"
+msgstr ""
+
+msgid "reset branch name to parent branch name"
+msgstr ""
+
+msgid "[-fC] [NAME]"
+msgstr ""
+
+msgid "show only branches that have unmerged heads"
+msgstr ""
+
+msgid "show normal and closed branches"
+msgstr ""
+
+msgid "[-a]"
+msgstr ""
+
+msgid "run even when remote repository is unrelated"
+msgstr "kör även när fjärrarkivet är orelaterat"
+
+msgid "a changeset up to which you would like to bundle"
+msgstr ""
+
+msgid "a base changeset to specify instead of a destination"
+msgstr ""
+
+msgid "bundle all changesets in the repository"
+msgstr ""
+
+msgid "bundle compression type to use"
+msgstr ""
+
+msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+msgstr ""
+
+msgid "print output to file with formatted name"
+msgstr "skriv utmatning till fil med formatterat namn"
+
+msgid "print the given revision"
+msgstr ""
+
+msgid "apply any matching decode filter"
+msgstr ""
+
+msgid "[OPTION]... FILE..."
+msgstr "[FLAGGA]... FIL..."
+
+msgid "the clone will only contain a repository (no working copy)"
+msgstr "klonen kommer bara att ha arkivet (ingen arbetskopia)"
+
+msgid "a changeset you would like to have after cloning"
+msgstr "en ändring du skulle vilja ha efter kloning"
+
+msgid "[OPTION]... SOURCE [DEST]"
+msgstr "[FLAGGA]... KÄLLA [DEST]"
+
+msgid "mark new/missing files as added/removed before committing"
+msgstr "märk nya/saknade filer som tillagda/borttagna innan arkivering"
+
+msgid "mark a branch as closed, hiding it from the branch list"
+msgstr "markera en gren som stängd, och göm den från grenlistan"
+
+msgid "record a copy that has already occurred"
+msgstr ""
+
+msgid "forcibly copy over an existing managed file"
+msgstr ""
+
+msgid "[OPTION]... [SOURCE]... DEST"
+msgstr ""
+
+msgid "[INDEX] REV1 REV2"
+msgstr ""
+
+msgid "[COMMAND]"
+msgstr ""
+
+msgid "show the command options"
+msgstr ""
+
+msgid "[-o] CMD"
+msgstr ""
+
+msgid "try extended date formats"
+msgstr ""
+
+msgid "[-e] DATE [RANGE]"
+msgstr ""
+
+msgid "FILE REV"
+msgstr ""
+
+msgid "[PATH]"
+msgstr ""
+
+msgid "FILE"
+msgstr ""
+
+msgid "revision to rebuild to"
+msgstr ""
+
+msgid "[-r REV] [REV]"
+msgstr ""
+
+msgid "revision to debug"
+msgstr ""
+
+msgid "[-r REV] FILE"
+msgstr ""
+
+msgid "REV1 [REV2]"
+msgstr ""
+
+msgid "do not display the saved mtime"
+msgstr ""
+
+msgid "[OPTION]..."
+msgstr "[FLAGGA]..."
+
+msgid "revision to check"
+msgstr ""
+
+msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
+msgstr "[FLAGGA]... [-r REV1 [-r REV2]] [FIL]..."
+
+msgid "diff against the second parent"
+msgstr "diffa mot den andra föräldern"
+
+msgid "[OPTION]... [-o OUTFILESPEC] REV..."
+msgstr "[FLAGGA]... [-o UTFILSPEC] REV..."
+
+msgid "end fields with NUL"
+msgstr ""
+
+msgid "print all revisions that match"
+msgstr ""
+
+msgid "follow changeset history, or file history across copies and renames"
+msgstr "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
+
+msgid "ignore case when matching"
+msgstr ""
+
+msgid "print only filenames and revisions that match"
+msgstr ""
+
+msgid "print matching line numbers"
+msgstr ""
+
+msgid "search in given revision range"
+msgstr ""
+
+msgid "[OPTION]... PATTERN [FILE]..."
+msgstr ""
+
+msgid "show only heads which are descendants of REV"
+msgstr ""
+
+msgid "show only the active branch heads from open branches"
+msgstr ""
+
+msgid "show normal and closed branch heads"
+msgstr ""
+
+msgid "[-r STARTREV] [REV]..."
+msgstr ""
+
+msgid "[TOPIC]"
+msgstr "[ÄMNE]"
+
+msgid "identify the specified revision"
+msgstr ""
+
+msgid "show local revision number"
+msgstr ""
+
+msgid "show global revision id"
+msgstr ""
+
+msgid "show branch"
+msgstr ""
+
+msgid "show tags"
+msgstr ""
+
+msgid "[-nibt] [-r REV] [SOURCE]"
+msgstr ""
+
+msgid ""
+"directory strip option for patch. This has the same meaning as the "
+"corresponding patch option"
+msgstr ""
+
+msgid "base path"
+msgstr ""
+
+msgid "skip check for outstanding uncommitted changes"
+msgstr ""
+
+msgid "don't commit, just update the working directory"
+msgstr ""
+
+msgid "apply patch to the nodes from which it was generated"
+msgstr ""
+
+msgid "use any branch information in patch (implied by --exact)"
+msgstr ""
+
+msgid "[OPTION]... PATCH..."
+msgstr ""
+
+msgid "show newest record first"
+msgstr ""
+
+msgid "file to store the bundles into"
+msgstr ""
+
+msgid "a specific revision up to which you would like to pull"
+msgstr "en specifik revision upp till vilken du vill dra"
+
+msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
+msgstr ""
+
+msgid "[-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-e KMD] [--remotecmd KMD] [DEST]"
+
+msgid "search the repository as it stood at REV"
+msgstr ""
+
+msgid "end filenames with NUL, for use with xargs"
+msgstr "filnamn slutar med NUL, för användning med xargs"
+
+msgid "print complete paths from the filesystem root"
+msgstr ""
+
+msgid "[OPTION]... [PATTERN]..."
+msgstr ""
+
+msgid "only follow the first parent of merge changesets"
+msgstr "följ bara den första föräldern vid sammanfogningar"
+
+msgid "show revisions matching date spec"
+msgstr "visa revisioner som matchar datumspecen"
+
+msgid "show copied files"
+msgstr "visa kopierade filer"
+
+msgid "do case-insensitive search for a keyword"
+msgstr "gör versalokänslig sökning efter nyckelord"
+
+msgid "include revisions where files were removed"
+msgstr "inkludera revisioner där filer togs bort"
+
+msgid "show only merges"
+msgstr "visa bara sammanfogningar"
+
+msgid "revisions committed by user"
+msgstr "revisioner arkiverade av användare"
+
+msgid "show only changesets within the given named branch"
+msgstr "visa bara ändringar i den namngivda grenen"
+
+msgid "do not display revision or any of its ancestors"
+msgstr "visa inte revision eller någon av dess föräldrar"
+
+msgid "[OPTION]... [FILE]"
+msgstr ""
+
+msgid "revision to display"
+msgstr ""
+
+msgid "[-r REV]"
+msgstr ""
+
+msgid "force a merge with outstanding changes"
+msgstr "tvinga en sammanfogning med utestående ändringar"
+
+msgid "revision to merge"
+msgstr "revision att sammanfoga"
+
+msgid "review revisions to merge (no merge is performed)"
+msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)"
+
+msgid "[-f] [[-r] REV]"
+msgstr "[-f] [[-r] REV]"
+
+msgid "a specific revision up to which you would like to push"
+msgstr "en specifik revision upp till vilken du vill trycka"
+
+msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
+msgstr ""
+
+msgid "show parents from the specified revision"
+msgstr "visa föräldrar från den angivna revisionen"
+
+msgid "[-r REV] [FILE]"
+msgstr "[-r REV] [FIL]"
+
+msgid "[NAME]"
+msgstr ""
+
+msgid "update to new tip if changesets were pulled"
+msgstr "uppdatera till ny topp om ändringar drogs"
+
+msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
+msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]"
+
+msgid "force push"
+msgstr "tvinga tryckning"
+
+msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]"
+
+msgid "record delete for missing files"
+msgstr "markera saknade filer för radering"
+
+msgid "remove (and delete) file even if added or modified"
+msgstr "radera (och ta bort) filer även om tillagda eller modifierade"
+
+msgid "record a rename that has already occurred"
+msgstr ""
+
+msgid "[OPTION]... SOURCE... DEST"
+msgstr ""
+
+msgid "remerge all unresolved files"
+msgstr ""
+
+msgid "list state of files needing merge"
+msgstr ""
+
+msgid "mark files as resolved"
+msgstr ""
+
+msgid "unmark files as resolved"
+msgstr ""
+
+msgid "revert all changes when no arguments given"
+msgstr ""
+
+msgid "tipmost revision matching date"
+msgstr "senaste revision matchande datum"
+
+msgid "revision to revert to"
+msgstr ""
+
+msgid "do not save backup copies of files"
+msgstr ""
+
+msgid "[OPTION]... [-r REV] [NAME]..."
+msgstr ""
+
+msgid "name of access log file to write to"
+msgstr "namn på åtkomstlogg att skriva till"
+
+msgid "name of error log file to write to"
+msgstr "namn på fellogg att skriva till"
+
+msgid "port to listen on (default: 8000)"
+msgstr "port att lyssna på (standard: 8000)"
+
+msgid "address to listen on (default: all interfaces)"
+msgstr "adress att lyssna på (standard alla gränssnitt)"
+
+msgid "prefix path to serve from (default: server root)"
+msgstr "sökvägsprefix att dela ut från (standard: serverrot)"
+
+msgid "name to show in web pages (default: working directory)"
+msgstr "namn att visa i webbsidor (standard: arbetskatalogen)"
+
+msgid "name of the webdir config file (serve more than one repository)"
+msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)"
+
+msgid "for remote clients"
+msgstr "för fjärrklienter"
+
+msgid "web templates to use"
+msgstr "webbmallar att använda"
+
+msgid "template style to use"
+msgstr "mallstil att använda"
+
+msgid "use IPv6 in addition to IPv4"
+msgstr "använd IPv6 förutom IPv4"
+
+msgid "SSL certificate file"
+msgstr "SSL-certifikatsfil"
+
+msgid "show untrusted configuration options"
+msgstr ""
+
+msgid "[-u] [NAME]..."
+msgstr ""
+
+msgid "show status of all files"
+msgstr "visa status för alla filer"
+
+msgid "show only modified files"
+msgstr "visa bara modifierade filer"
+
+msgid "show only added files"
+msgstr "visa bara adderade filer"
+
+msgid "show only removed files"
+msgstr "visa bara raderade filer"
+
+msgid "show only deleted (but tracked) files"
+msgstr "visa bara borttagna (men spårade) filer"
+
+msgid "show only files without changes"
+msgstr "visa bara filer utan ändringar"
+
+msgid "show only unknown (not tracked) files"
+msgstr "visa bara okända (ospårade) filer"
+
+msgid "show only ignored files"
+msgstr "visa bara ignorerade filer"
+
+msgid "hide status prefix"
+msgstr "göm statusprefix"
+
+msgid "show source of copied files"
+msgstr "visa källan för kopierade filer"
+
+msgid "show difference from revision"
+msgstr "visa differens från revision"
+
+msgid "replace existing tag"
+msgstr ""
+
+msgid "make the tag local"
+msgstr ""
+
+msgid "revision to tag"
+msgstr ""
+
+msgid "remove a tag"
+msgstr ""
+
+msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+msgstr ""
+
+msgid "[-p]"
+msgstr ""
+
+msgid "update to new tip if changesets were unbundled"
+msgstr ""
+
+msgid "[-u] FILE..."
+msgstr ""
+
+msgid "overwrite locally modified files (no backup)"
+msgstr "skriv över lokalt modifierade filer (ingen backup)"
+
+msgid "check for uncommitted changes"
+msgstr "leta efter icke arkiverade ändringar"
+
+msgid "[-C] [-d DATE] [[-r] REV]"
+msgstr "[-C] [-d DATUM] [[-r] REV]"
+
+#, python-format
+msgid "config error at %s:%d: '%s'"
+msgstr ""
+
+msgid "not found in manifest"
+msgstr ""
+
+msgid "branch name not in UTF-8!"
+msgstr ""
+
+#, python-format
+msgid " searching for copies back to rev %d\n"
+msgstr ""
+
+#, python-format
+msgid ""
+" unmatched files in local:\n"
+" %s\n"
+msgstr ""
+
+#, python-format
+msgid ""
+" unmatched files in other:\n"
+" %s\n"
+msgstr ""
+
+msgid " all copies found (* = to merge, ! = divergent):\n"
+msgstr ""
+
+msgid " checking for directory renames\n"
+msgstr ""
+
+#, python-format
+msgid " dir %s -> %s\n"
+msgstr ""
+
+#, python-format
+msgid " file %s -> %s\n"
+msgstr ""
+
+msgid "working directory state appears damaged!"
+msgstr ""
+
+#, python-format
+msgid "'\\n' and '\\r' disallowed in filenames: %r"
+msgstr ""
+
+#, python-format
+msgid "directory %r already in dirstate"
+msgstr ""
+
+#, python-format
+msgid "file %r in dirstate clashes with %r"
+msgstr ""
+
+#, python-format
+msgid "not in dirstate: %s\n"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "character device"
+msgstr ""
+
+msgid "block device"
+msgstr ""
+
+msgid "fifo"
+msgstr ""
+
+msgid "socket"
+msgstr ""
+
+msgid "directory"
+msgstr ""
+
+#, python-format
+msgid "unsupported file type (type is %s)"
+msgstr ""
+
+#, python-format
+msgid "abort: %s\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"hg: command '%s' is ambiguous:\n"
+" %s\n"
+msgstr ""
+
+#, python-format
+msgid "hg: %s\n"
+msgstr ""
+
+#, python-format
+msgid "timed out waiting for lock held by %s"
+msgstr ""
+
+#, python-format
+msgid "lock held by %s"
+msgstr ""
+
+#, python-format
+msgid "abort: %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "abort: could not lock %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "hg %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "abort: %s!\n"
+msgstr ""
+
+#, python-format
+msgid "abort: %s"
+msgstr ""
+
+msgid " empty string\n"
+msgstr ""
+
+msgid "killed!\n"
+msgstr ""
+
+#, python-format
+msgid "hg: unknown command '%s'\n"
+msgstr ""
+
+#, python-format
+msgid "abort: could not import module %s!\n"
+msgstr ""
+
+msgid "(did you forget to compile extensions?)\n"
+msgstr ""
+
+msgid "(is your Python install correct?)\n"
+msgstr ""
+
+#, python-format
+msgid "abort: error: %s\n"
+msgstr ""
+
+msgid "broken pipe\n"
+msgstr ""
+
+msgid "interrupted!\n"
+msgstr ""
+
+msgid ""
+"\n"
+"broken pipe\n"
+msgstr ""
+
+msgid "abort: out of memory\n"
+msgstr ""
+
+msgid "** unknown exception encountered, details follow\n"
+msgstr ""
+
+msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
+msgstr ""
+
+msgid "** or mercurial@selenic.com\n"
+msgstr ""
+
+#, python-format
+msgid "** Mercurial Distributed SCM (version %s)\n"
+msgstr ""
+
+#, python-format
+msgid "** Extensions loaded: %s\n"
+msgstr ""
+
+#, python-format
+msgid "no definition for alias '%s'\n"
+msgstr ""
+
+#, python-format
+msgid "alias '%s' resolves to unknown command '%s'\n"
+msgstr ""
+
+#, python-format
+msgid "alias '%s' resolves to ambiguous command '%s'\n"
+msgstr ""
+
+#, python-format
+msgid "alias '%s' shadows command\n"
+msgstr ""
+
+#, python-format
+msgid "malformed --config option: %s"
+msgstr ""
+
+#, python-format
+msgid "extension '%s' overrides commands: %s\n"
+msgstr ""
+
+msgid "Option --config may not be abbreviated!"
+msgstr ""
+
+msgid "Option --cwd may not be abbreviated!"
+msgstr ""
+
+msgid ""
+"Option -R has to be separated from other options (e.g. not -qR) and --"
+"repository may only be abbreviated as --repo!"
+msgstr ""
+
+#, python-format
+msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
+msgstr ""
+
+#, python-format
+msgid "repository '%s' is not local"
+msgstr ""
+
+msgid "invalid arguments"
+msgstr ""
+
+#, python-format
+msgid "unrecognized profiling format '%s' - Ignored\n"
+msgstr ""
+
+msgid ""
+"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
+"misc/lsprof/"
+msgstr ""
+
+#, python-format
+msgid "*** failed to import extension %s from %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "*** failed to import extension %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "couldn't find merge tool %s\n"
+msgstr ""
+
+#, python-format
+msgid "tool %s can't handle symlinks\n"
+msgstr ""
+
+#, python-format
+msgid "tool %s can't handle binary\n"
+msgstr ""
+
+#, python-format
+msgid "tool %s requires a GUI\n"
+msgstr ""
+
+#, python-format
+msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
+msgstr ""
+
+#, python-format
+msgid ""
+" no tool found to merge %s\n"
+"keep (l)ocal or take (o)ther?"
+msgstr ""
+
+msgid "&Local"
+msgstr ""
+
+msgid "&Other"
+msgstr ""
+
+#, python-format
+msgid "merging %s and %s to %s\n"
+msgstr ""
+
+#, python-format
+msgid "merging %s\n"
+msgstr ""
+
+#, python-format
+msgid "my %s other %s ancestor %s\n"
+msgstr ""
+
+msgid " premerge successful\n"
+msgstr ""
+
+#, python-format
+msgid ""
+" output file %s appears unchanged\n"
+"was merge successful (yn)?"
+msgstr ""
+
+msgid "&No"
+msgstr ""
+
+msgid "&Yes"
+msgstr ""
+
+#, python-format
+msgid "merging %s failed!\n"
+msgstr ""
+
+#, python-format
+msgid "Inconsistent state, %s:%s is good and bad"
+msgstr ""
+
+#, python-format
+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 ""
+
+msgid "Date Formats"
+msgstr ""
+
+msgid ""
+"\n"
+" Some commands allow the user to specify a date, e.g.:\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 ""
+
+msgid "File Name Patterns"
+msgstr ""
+
+msgid ""
+"\n"
+" Mercurial accepts several notations for identifying one or more\n"
+" files at a time.\n"
+"\n"
+" By default, Mercurial treats filenames as shell-style extended\n"
+" glob patterns.\n"
+"\n"
+" Alternate pattern notations must be specified explicitly.\n"
+"\n"
+" To use a plain path name without any pattern matching, start it\n"
+" with \"path:\". These path names must completely match starting at\n"
+" 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\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\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 ""
+
+msgid "Environment Variables"
+msgstr ""
+
+msgid ""
+"\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"
+" This is the name of the editor to run when committing. See EDITOR.\n"
+"\n"
+" (deprecated, use .hgrc)\n"
+"\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"
+" 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"
+" settings include \"replace\", which replaces unknown characters, and\n"
+" \"ignore\", which drops them. This setting can be overridden with\n"
+" the --encodingmode command-line option.\n"
+"\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"
+" 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"
+"\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"
+"\n"
+" (deprecated, use .hgrc)\n"
+"\n"
+"EMAIL\n"
+" May be used as the author of a commit; see HGUSER.\n"
+"\n"
+"LOGNAME\n"
+" May be used as the author of a commit; see HGUSER.\n"
+"\n"
+"VISUAL\n"
+" This is the name of the editor to use when committing. See EDITOR.\n"
+"\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"
+" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
+" non-empty one is chosen. If all of them are empty, the editor\n"
+" defaults to 'vi'.\n"
+"\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 ""
+
+msgid "Specifying Single Revisions"
+msgstr ""
+
+msgid ""
+"\n"
+" 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 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 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 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"
+"\n"
+" The reserved name \"null\" indicates the null revision. This is the\n"
+" revision of an empty repository, and the parent of revision 0.\n"
+"\n"
+" The reserved name \".\" indicates the working directory parent. If\n"
+" no working directory is checked out, it is equivalent to null. If\n"
+" an uncommitted merge is in progress, \".\" is the revision of the\n"
+" first parent.\n"
+" "
+msgstr ""
+
+msgid "Specifying Multiple Revisions"
+msgstr ""
+
+msgid ""
+"\n"
+" When Mercurial accepts more than one revision, they may be\n"
+" specified individually, or provided as a topologically continuous\n"
+" range, separated by the \":\" character.\n"
+"\n"
+" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
+" are revision identifiers. Both BEGIN and END are optional. If\n"
+" BEGIN is not specified, it defaults to revision number 0. If END\n"
+" is not specified, it defaults to the tip. The range \":\" thus means\n"
+" \"all revisions\".\n"
+"\n"
+" If BEGIN is greater than END, revisions are treated in reverse\n"
+" order.\n"
+"\n"
+" A range acts as a closed interval. This means that a range of 3:5\n"
+" gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
+" "
+msgstr ""
+
+msgid "Diff Formats"
+msgstr ""
+
+msgid ""
+"\n"
+" Mercurial's default format for showing changes between two\n"
+" versions of a file is compatible with the unified format of GNU\n"
+" diff, which can be used by GNU patch and many other standard\n"
+" tools.\n"
+"\n"
+" 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"
+"\n"
+" Mercurial also supports the extended diff format from the git VCS\n"
+" which addresses these limitations. The git diff format is not\n"
+" produced by default because a few widespread tools still do not\n"
+" understand this format.\n"
+"\n"
+" This means that when generating diffs from a Mercurial repository\n"
+" (e.g. with \"hg export\"), you should be careful about things like\n"
+" file copies and renames or other things mentioned above, because\n"
+" when applying a standard diff to a different repository, this\n"
+" extra information is lost. Mercurial's internal operations (like\n"
+" push and pull) are not affected by this, because they use an\n"
+" internal binary format for communicating changes.\n"
+"\n"
+" To make Mercurial produce the git extended diff format, use the\n"
+" --git option available for many commands, or set 'git = True' in\n"
+" the [diff] section of your hgrc. You do not need to set this\n"
+" option when importing diffs in this format or using them in the mq\n"
+" extension.\n"
+" "
+msgstr ""
+
+msgid "Template Usage"
+msgstr ""
+
+msgid ""
+"\n"
+" Mercurial allows you to customize output of commands through\n"
+" templates. You can either pass in a template from the command\n"
+" line, via the --template option, or select an existing\n"
+" template-style (--style).\n"
+"\n"
+" You can customize output for any \"log-like\" command: log,\n"
+" outgoing, incoming, tip, parents, heads and glog.\n"
+"\n"
+" Three styles are packaged with Mercurial: default (the style used\n"
+" when no explicit preference is passed), compact and changelog.\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"
+"\n"
+" $ hg log -r1 --template \"{node}\\n\"\n"
+" b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
+"\n"
+" Strings in curly braces are called keywords. The availability of\n"
+" 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\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"
+"\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\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 <user@example.com>' becomes\n"
+" 'example.com'.\n"
+" :email: Any text. Extracts the first string that looks like\n"
+" an email address. Example: 'User <user@example.com>'\n"
+" becomes 'user@example.com'.\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 in\n"
+" 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\n"
+" address.\n"
+" "
+msgstr ""
+
+msgid "URL Paths"
+msgstr ""
+
+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 '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"
+" 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\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"
+"\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"
+"\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"
+"\n"
+" Two path aliases are special because they are used as defaults\n"
+" when you do not provide the URL to a command:\n"
+"\n"
+" default:\n"
+" When you create a repository with hg clone, the clone command\n"
+" saves the location of the source repository as the new\n"
+" repository's 'default' path. This is then used when you omit\n"
+" path from push- and pull-like commands (including incoming and\n"
+" outgoing).\n"
+"\n"
+" default-push:\n"
+" The push command will look for a path named 'default-push', and\n"
+" prefer it over 'default' if both are defined.\n"
+" "
+msgstr ""
+
+msgid "Using additional features"
+msgstr ""
+
+msgid "can only share local repositories"
+msgstr ""
+
+msgid "destination already exists"
+msgstr ""
+
+msgid "updating working directory\n"
+msgstr ""
+
+#, python-format
+msgid "destination directory: %s\n"
+msgstr ""
+
+#, python-format
+msgid "destination '%s' already exists"
+msgstr ""
+
+#, python-format
+msgid "destination '%s' is not empty"
+msgstr ""
+
+msgid ""
+"src repository does not support revision lookup and so doesn't support clone "
+"by revision"
+msgstr ""
+
+msgid "clone from remote to remote not supported"
+msgstr ""
+
+msgid "updated"
+msgstr ""
+
+msgid "merged"
+msgstr ""
+
+msgid "removed"
+msgstr ""
+
+msgid "unresolved"
+msgstr ""
+
+#, python-format
+msgid "%d files %s"
+msgstr ""
+
+msgid "use 'hg resolve' to retry unresolved file merges\n"
+msgstr ""
+
+msgid ""
+"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
+"abandon\n"
+msgstr ""
+
+msgid "(branch merge, don't forget to commit)\n"
+msgstr ""
+
+#, python-format
+msgid "error reading %s/.hg/hgrc: %s\n"
+msgstr ""
+
+msgid "SSL support is unavailable"
+msgstr ""
+
+msgid "IPv6 is not available on this system"
+msgstr ""
+
+#, python-format
+msgid "cannot start server at '%s:%d': %s"
+msgstr ""
+
+#, python-format
+msgid "calling hook %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s hook is invalid (\"%s\" not in a module)"
+msgstr ""
+
+#, python-format
+msgid "%s hook is invalid (import of \"%s\" failed)"
+msgstr ""
+
+#, python-format
+msgid "%s hook is invalid (\"%s\" is not defined)"
+msgstr ""
+
+#, python-format
+msgid "%s hook is invalid (\"%s\" is not callable)"
+msgstr ""
+
+#, python-format
+msgid "error: %s hook failed: %s\n"
+msgstr ""
+
+#, python-format
+msgid "error: %s hook raised an exception: %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s hook failed"
+msgstr ""
+
+#, python-format
+msgid "warning: %s hook failed\n"
+msgstr ""
+
+#, python-format
+msgid "running hook %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s hook %s"
+msgstr ""
+
+#, python-format
+msgid "warning: %s hook %s\n"
+msgstr ""
+
+msgid "connection ended unexpectedly"
+msgstr ""
+
+#, python-format
+msgid "unsupported URL component: \"%s\""
+msgstr ""
+
+#, python-format
+msgid "using %s\n"
+msgstr ""
+
+#, python-format
+msgid "capabilities: %s\n"
+msgstr ""
+
+msgid "operation not supported over http"
+msgstr ""
+
+#, python-format
+msgid "sending %s command\n"
+msgstr ""
+
+#, python-format
+msgid "sending %s bytes\n"
+msgstr ""
+
+msgid "authorization failed"
+msgstr ""
+
+#, python-format
+msgid "http error while sending %s command\n"
+msgstr ""
+
+msgid "http error, possibly caused by proxy setting"
+msgstr ""
+
+#, python-format
+msgid "real URL is %s\n"
+msgstr ""
+
+#, python-format
+msgid "requested URL: '%s'\n"
+msgstr ""
+
+#, python-format
+msgid "'%s' does not appear to be an hg repository"
+msgstr ""
+
+#, python-format
+msgid "'%s' sent a broken Content-Type header (%s)"
+msgstr ""
+
+#, python-format
+msgid "'%s' uses newer protocol %s"
+msgstr ""
+
+msgid "look up remote revision"
+msgstr ""
+
+msgid "unexpected response:"
+msgstr ""
+
+msgid "look up remote changes"
+msgstr ""
+
+msgid "push failed (unexpected response):"
+msgstr ""
+
+#, python-format
+msgid "push failed: %s"
+msgstr ""
+
+msgid "Python support for SSL and HTTPS is not installed"
+msgstr ""
+
+msgid "cannot create new http repository"
+msgstr ""
+
+#, python-format
+msgid "ignoring invalid syntax '%s'"
+msgstr ""
+
+#, python-format
+msgid "skipping unreadable ignore file '%s': %s\n"
+msgstr ""
+
+#, python-format
+msgid "repository %s not found"
+msgstr ""
+
+#, python-format
+msgid "repository %s already exists"
+msgstr ""
+
+#, python-format
+msgid "requirement '%s' not supported"
+msgstr ""
+
+#, python-format
+msgid ".hg/sharedpath points to nonexistent directory %s"
+msgstr ""
+
+#, python-format
+msgid "%r cannot be used in a tag name"
+msgstr ""
+
+msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
+msgstr ""
+
+#, python-format
+msgid "working directory has unknown parent '%s'!"
+msgstr ""
+
+#, python-format
+msgid "unknown revision '%s'"
+msgstr ""
+
+#, python-format
+msgid "filtering %s through %s\n"
+msgstr ""
+
+msgid "journal already exists - run hg recover"
+msgstr ""
+
+msgid "rolling back interrupted transaction\n"
+msgstr ""
+
+msgid "no interrupted transaction available\n"
+msgstr ""
+
+msgid "rolling back last transaction\n"
+msgstr ""
+
+#, python-format
+msgid "Named branch could not be reset, current branch still is: %s\n"
+msgstr ""
+
+msgid "no rollback information available\n"
+msgstr ""
+
+#, python-format
+msgid "waiting for lock on %s held by %r\n"
+msgstr ""
+
+#, python-format
+msgid "repository %s"
+msgstr ""
+
+#, python-format
+msgid "working directory of %s"
+msgstr ""
+
+#, python-format
+msgid " %s: searching for copy revision for %s\n"
+msgstr ""
+
+#, python-format
+msgid " %s: copy %s:%s\n"
+msgstr ""
+
+msgid "cannot partially commit a merge (do not specify files or patterns)"
+msgstr ""
+
+msgid "file not found!"
+msgstr ""
+
+msgid "no match under directory!"
+msgstr ""
+
+msgid "file not tracked!"
+msgstr ""
+
+msgid "unresolved merge conflicts (see hg resolve)"
+msgstr ""
+
+#, python-format
+msgid "committing subrepository %s\n"
+msgstr ""
+
+#, python-format
+msgid "trouble committing %s!\n"
+msgstr ""
+
+#, python-format
+msgid "%s does not exist!\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"%s: files over 10MB may cause memory and performance problems\n"
+"(use 'hg revert %s' to unadd the file)\n"
+msgstr ""
+
+#, python-format
+msgid "%s not added: only files and symlinks supported currently\n"
+msgstr ""
+
+#, python-format
+msgid "%s already tracked!\n"
+msgstr ""
+
+#, python-format
+msgid "%s not added!\n"
+msgstr ""
+
+#, python-format
+msgid "%s still exists!\n"
+msgstr ""
+
+#, python-format
+msgid "%s not tracked!\n"
+msgstr ""
+
+#, python-format
+msgid "%s not removed!\n"
+msgstr ""
+
+#, python-format
+msgid "copy failed: %s is not a file or a symbolic link\n"
+msgstr ""
+
+msgid "searching for changes\n"
+msgstr ""
+
+#, python-format
+msgid "examining %s:%s\n"
+msgstr ""
+
+msgid "branch already found\n"
+msgstr ""
+
+#, python-format
+msgid "found incomplete branch %s:%s\n"
+msgstr ""
+
+#, python-format
+msgid "found new changeset %s\n"
+msgstr ""
+
+#, python-format
+msgid "request %d: %s\n"
+msgstr ""
+
+#, python-format
+msgid "received %s:%s\n"
+msgstr ""
+
+#, python-format
+msgid "narrowing %d:%d %s\n"
+msgstr ""
+
+#, python-format
+msgid "found new branch changeset %s\n"
+msgstr ""
+
+#, python-format
+msgid "narrowed branch search to %s:%s\n"
+msgstr ""
+
+msgid "already have changeset "
+msgstr ""
+
+msgid "warning: repository is unrelated\n"
+msgstr ""
+
+msgid "repository is unrelated"
+msgstr ""
+
+msgid "found new changesets starting at "
+msgstr ""
+
+#, python-format
+msgid "%d total queries\n"
+msgstr ""
+
+msgid "common changesets up to "
+msgstr ""
+
+msgid "requesting all changes\n"
+msgstr ""
+
+msgid ""
+"Partial pull cannot be done because other repository doesn't support "
+"changegroupsubset."
+msgstr ""
+
+#, python-format
+msgid "abort: push creates new remote branch '%s'!\n"
+msgstr ""
+
+msgid "abort: push creates new remote heads!\n"
+msgstr ""
+
+msgid "(did you forget to merge? use push -f to force)\n"
+msgstr ""
+
+msgid "note: unsynced remote changes!\n"
+msgstr ""
+
+#, python-format
+msgid "%d changesets found\n"
+msgstr ""
+
+msgid "list of changesets:\n"
+msgstr ""
+
+#, python-format
+msgid "empty or missing revlog for %s"
+msgstr ""
+
+#, python-format
+msgid "add changeset %s\n"
+msgstr ""
+
+msgid "adding changesets\n"
+msgstr ""
+
+msgid "received changelog group is empty"
+msgstr ""
+
+msgid "adding manifests\n"
+msgstr ""
+
+msgid "adding file changes\n"
+msgstr ""
+
+#, python-format
+msgid "adding %s revisions\n"
+msgstr ""
+
+msgid "received file revlog group is empty"
+msgstr ""
+
+#, python-format
+msgid " (%+d heads)"
+msgstr ""
+
+#, python-format
+msgid "added %d changesets with %d changes to %d files%s\n"
+msgstr ""
+
+msgid "updating the branch cache\n"
+msgstr ""
+
+msgid "Unexpected response from remote server:"
+msgstr ""
+
+msgid "operation forbidden by server"
+msgstr ""
+
+msgid "locking the remote repository failed"
+msgstr ""
+
+msgid "the server sent an unknown error code"
+msgstr ""
+
+msgid "streaming all changes\n"
+msgstr ""
+
+#, python-format
+msgid "%d files to transfer, %s of data\n"
+msgstr ""
+
+#, python-format
+msgid "adding %s (%s)\n"
+msgstr ""
+
+#, python-format
+msgid "transferred %s in %.1f seconds (%s/sec)\n"
+msgstr ""
+
+msgid "no [smtp]host in hgrc - cannot send mail"
+msgstr ""
+
+#, python-format
+msgid "sending mail: smtp host %s, port %s\n"
+msgstr ""
+
+msgid "can't use TLS: Python SSL support not installed"
+msgstr ""
+
+msgid "(using tls)\n"
+msgstr ""
+
+#, python-format
+msgid "(authenticating to mail server as %s)\n"
+msgstr ""
+
+#, python-format
+msgid "sending mail: %s\n"
+msgstr ""
+
+msgid "smtp specified as email transport, but no smtp host configured"
+msgstr ""
+
+#, python-format
+msgid "%r specified as email transport, but not in PATH"
+msgstr ""
+
+#, python-format
+msgid "ignoring invalid sendcharset: %s\n"
+msgstr ""
+
+#, python-format
+msgid "invalid email address: %s"
+msgstr ""
+
+#, python-format
+msgid "invalid local address: %s"
+msgstr ""
+
+#, python-format
+msgid "failed to remove %s from manifest"
+msgstr ""
+
+#, python-format
+msgid "diff context lines count must be an integer, not %r"
+msgstr ""
+
+#, python-format
+msgid ""
+"untracked file in working directory differs from file in requested revision: "
+"'%s'"
+msgstr ""
+
+#, python-format
+msgid "case-folding collision between %s and %s"
+msgstr ""
+
+#, python-format
+msgid ""
+" conflicting flags for %s\n"
+"(n)one, e(x)ec or sym(l)ink?"
+msgstr ""
+
+msgid "&None"
+msgstr ""
+
+msgid "E&xec"
+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"
+"use (c)hanged version or (d)elete?"
+msgstr ""
+
+msgid "&Changed"
+msgstr ""
+
+msgid "&Delete"
+msgstr ""
+
+#, python-format
+msgid ""
+"remote changed %s which local deleted\n"
+"use (c)hanged version or leave (d)eleted?"
+msgstr ""
+
+msgid "&Deleted"
+msgstr ""
+
+#, python-format
+msgid "preserving %s for resolve of %s\n"
+msgstr ""
+
+#, python-format
+msgid "update failed to remove %s: %s!\n"
+msgstr ""
+
+#, python-format
+msgid "getting %s\n"
+msgstr ""
+
+#, python-format
+msgid "getting %s to %s\n"
+msgstr ""
+
+#, python-format
+msgid "warning: detected divergent renames of %s to:\n"
+msgstr ""
+
+#, python-format
+msgid "branch %s not found"
+msgstr ""
+
+msgid "can't merge with ancestor"
+msgstr ""
+
+msgid "nothing to merge (use 'hg update' or check 'hg heads')"
+msgstr ""
+
+msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
+msgstr ""
+
+msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
+msgstr ""
+
+msgid "crosses branches (use 'hg merge' or 'hg update -C')"
+msgstr ""
+
+msgid "crosses named branches (use 'hg update -C' to discard changes)"
+msgstr ""
+
+#, python-format
+msgid "cannot create %s: destination already exists"
+msgstr ""
+
+#, python-format
+msgid "cannot create %s: unable to create destination directory"
+msgstr ""
+
+#, python-format
+msgid "found patch at byte %d\n"
+msgstr ""
+
+msgid "patch generated by hg export\n"
+msgstr ""
+
+#, python-format
+msgid "unable to find '%s' for patching\n"
+msgstr ""
+
+#, python-format
+msgid "patching file %s\n"
+msgstr ""
+
+#, python-format
+msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
+msgstr ""
+
+#, python-format
+msgid "bad hunk #%d %s (%d %d %d %d)"
+msgstr ""
+
+#, python-format
+msgid "file %s already exists\n"
+msgstr ""
+
+#, python-format
+msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
+msgstr ""
+
+#, python-format
+msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
+msgstr ""
+
+#, python-format
+msgid "Hunk #%d FAILED at %d\n"
+msgstr ""
+
+#, python-format
+msgid "bad hunk #%d"
+msgstr ""
+
+#, python-format
+msgid "bad hunk #%d old text line %d"
+msgstr ""
+
+msgid "could not extract binary patch"
+msgstr ""
+
+#, python-format
+msgid "binary patch is %d bytes, not %d"
+msgstr ""
+
+#, python-format
+msgid "unable to strip away %d dirs from %s"
+msgstr ""
+
+msgid "undefined source and destination files"
+msgstr ""
+
+#, python-format
+msgid "malformed patch %s %s"
+msgstr ""
+
+#, python-format
+msgid "unsupported parser state: %s"
+msgstr ""
+
+#, python-format
+msgid "patch command failed: %s"
+msgstr ""
+
+#, python-format
+msgid "Unsupported line endings type: %s"
+msgstr ""
+
+#, 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 ""
+
+#, python-format
+msgid "killed by signal %d"
+msgstr ""
+
+#, python-format
+msgid "stopped by signal %d"
+msgstr ""
+
+msgid "invalid exit code"
+msgstr ""
+
+#, python-format
+msgid "saving bundle to %s\n"
+msgstr ""
+
+msgid "adding branch\n"
+msgstr ""
+
+#, python-format
+msgid "cannot %s; remote repository does not support the %r capability"
+msgstr ""
+
+#, python-format
+msgid "unknown compression type %r"
+msgstr ""
+
+#, python-format
+msgid "index %s unknown flags %#04x for format v0"
+msgstr ""
+
+#, python-format
+msgid "index %s unknown flags %#04x for revlogng"
+msgstr ""
+
+#, python-format
+msgid "index %s unknown format %d"
+msgstr ""
+
+#, python-format
+msgid "index %s is corrupted"
+msgstr ""
+
+msgid "no node"
+msgstr ""
+
+msgid "ambiguous identifier"
+msgstr ""
+
+msgid "no match found"
+msgstr ""
+
+#, python-format
+msgid "incompatible revision flag %x"
+msgstr ""
+
+#, python-format
+msgid "%s not found in the transaction"
+msgstr ""
+
+msgid "unknown base"
+msgstr ""
+
+msgid "consistency error adding group"
+msgstr ""
+
+#, python-format
+msgid "%s looks like a binary file."
+msgstr ""
+
+msgid "can only specify two labels."
+msgstr ""
+
+msgid "warning: conflicts during merge.\n"
+msgstr ""
+
+#, python-format
+msgid "couldn't parse location %s"
+msgstr ""
+
+msgid "could not create remote repo"
+msgstr ""
+
+msgid "remote: "
+msgstr ""
+
+msgid "no suitable response from remote hg"
+msgstr ""
+
+#, python-format
+msgid "push refused: %s"
+msgstr ""
+
+msgid "unsynced changes"
+msgstr ""
+
+msgid "cannot lock static-http repository"
+msgstr ""
+
+msgid "cannot create new static-http repository"
+msgstr ""
+
+#, python-format
+msgid "invalid entry in fncache, line %s"
+msgstr ""
+
+msgid "scanning\n"
+msgstr ""
+
+#, python-format
+msgid "%d files, %d bytes to transfer\n"
+msgstr ""
+
+#, python-format
+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 ""
+
+#, python-format
+msgid "pulling subrepo %s\n"
+msgstr ""
+
+#, python-format
+msgid "pushing subrepo %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s, line %s: %s\n"
+msgstr ""
+
+msgid "cannot parse entry"
+msgstr ""
+
+#, python-format
+msgid "node '%s' is not well formed"
+msgstr ""
+
+msgid "unmatched quotes"
+msgstr ""
+
+#, python-format
+msgid "error expanding '%s%%%s'"
+msgstr ""
+
+#, python-format
+msgid "unknown filter '%s'"
+msgstr ""
+
+#, python-format
+msgid "style not found: %s"
+msgstr ""
+
+#, python-format
+msgid "template file %s: %s"
+msgstr ""
+
+msgid "cannot use transaction when it is already committed/aborted"
+msgstr ""
+
+#, python-format
+msgid "failed to truncate %s\n"
+msgstr ""
+
+msgid "transaction abort!\n"
+msgstr ""
+
+msgid "rollback completed\n"
+msgstr ""
+
+msgid "rollback failed - please run hg recover\n"
+msgstr ""
+
+#, python-format
+msgid "Not trusting file %s from untrusted user %s, group %s\n"
+msgstr ""
+
+#, python-format
+msgid "Ignored: %s\n"
+msgstr ""
+
+#, python-format
+msgid "ignoring untrusted configuration option %s.%s = %s\n"
+msgstr ""
+
+#, python-format
+msgid "%s.%s not a boolean ('%s')"
+msgstr ""
+
+msgid "enter a commit username:"
+msgstr ""
+
+#, python-format
+msgid "No username found, using '%s' instead\n"
+msgstr ""
+
+msgid "Please specify a username."
+msgstr ""
+
+#, python-format
+msgid "username %s contains a newline\n"
+msgstr ""
+
+msgid "response expected"
+msgstr ""
+
+msgid "unrecognized response\n"
+msgstr ""
+
+msgid "password: "
+msgstr ""
+
+msgid "edit failed"
+msgstr ""
+
+msgid "http authorization required"
+msgstr ""
+
+msgid "http authorization required\n"
+msgstr ""
+
+#, python-format
+msgid "realm: %s\n"
+msgstr ""
+
+#, python-format
+msgid "user: %s\n"
+msgstr ""
+
+msgid "user:"
+msgstr ""
+
+#, python-format
+msgid "http auth: user %s, password %s\n"
+msgstr ""
+
+#, python-format
+msgid "proxying through http://%s:%s\n"
+msgstr ""
+
+#, python-format
+msgid "command '%s' failed: %s"
+msgstr ""
+
+#, python-format
+msgid "path contains illegal component: %s"
+msgstr ""
+
+#, python-format
+msgid "path %r is inside repo %r"
+msgstr ""
+
+#, python-format
+msgid "path %r traverses symbolic link %r"
+msgstr ""
+
+msgid "Hardlinks not supported"
+msgstr ""
+
+#, python-format
+msgid "could not symlink to %r: %s"
+msgstr ""
+
+#, python-format
+msgid "invalid date: %r "
+msgstr ""
+
+#, python-format
+msgid "date exceeds 32 bits: %d"
+msgstr ""
+
+#, python-format
+msgid "impossible time zone offset: %d"
+msgstr ""
+
+#, python-format
+msgid "invalid day spec: %s"
+msgstr ""
+
+#, python-format
+msgid "%.0f GB"
+msgstr ""
+
+#, python-format
+msgid "%.1f GB"
+msgstr ""
+
+#, python-format
+msgid "%.2f GB"
+msgstr ""
+
+#, python-format
+msgid "%.0f MB"
+msgstr ""
+
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#, python-format
+msgid "%.2f MB"
+msgstr ""
+
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#, python-format
+msgid "%.1f KB"
+msgstr ""
+
+#, python-format
+msgid "%.2f KB"
+msgstr ""
+
+#, python-format
+msgid "%.0f bytes"
+msgstr ""
+
+msgid "cannot verify bundle or remote repos"
+msgstr ""
+
+msgid "interrupted"
+msgstr ""
+
+#, python-format
+msgid "empty or missing %s"
+msgstr ""
+
+#, python-format
+msgid "data length off by %d bytes"
+msgstr ""
+
+#, python-format
+msgid "index contains %d extra bytes"
+msgstr ""
+
+#, python-format
+msgid "warning: `%s' uses revlog format 1"
+msgstr ""
+
+#, python-format
+msgid "warning: `%s' uses revlog format 0"
+msgstr ""
+
+#, python-format
+msgid "rev %d points to nonexistent changeset %d"
+msgstr ""
+
+#, python-format
+msgid "rev %d points to unexpected changeset %d"
+msgstr ""
+
+#, python-format
+msgid " (expected %s)"
+msgstr ""
+
+#, python-format
+msgid "unknown parent 1 %s of %s"
+msgstr ""
+
+#, python-format
+msgid "unknown parent 2 %s of %s"
+msgstr ""
+
+#, python-format
+msgid "checking parents of %s"
+msgstr ""
+
+#, python-format
+msgid "duplicate revision %d (%d)"
+msgstr ""
+
+#, python-format
+msgid "repository uses revlog format %d\n"
+msgstr ""
+
+msgid "checking changesets\n"
+msgstr ""
+
+#, python-format
+msgid "unpacking changeset %s"
+msgstr ""
+
+msgid "checking manifests\n"
+msgstr ""
+
+#, python-format
+msgid "%s not in changesets"
+msgstr ""
+
+msgid "file without name in manifest"
+msgstr ""
+
+#, python-format
+msgid "reading manifest delta %s"
+msgstr ""
+
+msgid "crosschecking files in changesets and manifests\n"
+msgstr ""
+
+#, python-format
+msgid "changeset refers to unknown manifest %s"
+msgstr ""
+
+msgid "in changeset but not in manifest"
+msgstr ""
+
+msgid "in manifest but not in changeset"
+msgstr ""
+
+msgid "checking files\n"
+msgstr ""
+
+#, python-format
+msgid "cannot decode filename '%s'"
+msgstr ""
+
+#, python-format
+msgid "broken revlog! (%s)"
+msgstr ""
+
+msgid "missing revlog!"
+msgstr ""
+
+#, python-format
+msgid "%s not in manifests"
+msgstr ""
+
+#, python-format
+msgid "unpacked size is %s, %s expected"
+msgstr ""
+
+#, python-format
+msgid "unpacking %s"
+msgstr ""
+
+#, python-format
+msgid "empty or missing copy source revlog %s:%s"
+msgstr ""
+
+#, python-format
+msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
+msgstr ""
+
+#, python-format
+msgid "checking rename of %s"
+msgstr ""
+
+#, python-format
+msgid "%s in manifests not found"
+msgstr ""
+
+#, python-format
+msgid "warning: orphan revlog '%s'"
+msgstr ""
+
+#, python-format
+msgid "%d files, %d changesets, %d total revisions\n"
+msgstr ""
+
+#, python-format
+msgid "%d warnings encountered!\n"
+msgstr ""
+
+#, python-format
+msgid "%d integrity errors encountered!\n"
+msgstr ""
+
+#, python-format
+msgid "(first damaged changeset appears to be %d)\n"
+msgstr ""
+
+msgid "user name not available - set USERNAME environment variable"
+msgstr ""
--- a/mercurial/bdiff.c Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/bdiff.c Fri Oct 16 11:19:39 2009 +0200
@@ -151,7 +151,7 @@
}
/* compute popularity threshold */
- t = (bn >= 4000) ? bn / 1000 : bn + 1;
+ t = (bn >= 31000) ? bn / 1000 : 1000000 / (bn + 1);
/* match items in a to their equivalence class in b */
for (i = 0; i < an; i++) {
--- a/mercurial/cmdutil.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/cmdutil.py Fri Oct 16 11:19:39 2009 +0200
@@ -546,24 +546,26 @@
return errors
-def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None):
+def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
+ runargs=None):
'''Run a command as a service.'''
if opts['daemon'] and not opts['daemon_pipefds']:
rfd, wfd = os.pipe()
- args = sys.argv[:]
- args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
+ if not runargs:
+ runargs = sys.argv[:]
+ runargs.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
# Don't pass --cwd to the child process, because we've already
# changed directory.
- for i in xrange(1,len(args)):
- if args[i].startswith('--cwd='):
- del args[i]
+ for i in xrange(1,len(runargs)):
+ if runargs[i].startswith('--cwd='):
+ del runargs[i]
break
- elif args[i].startswith('--cwd'):
- del args[i:i+2]
+ elif runargs[i].startswith('--cwd'):
+ del runargs[i:i+2]
break
pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
- args[0], args)
+ runargs[0], runargs)
os.close(wfd)
os.read(rfd, 1)
if parentfn:
@@ -650,9 +652,8 @@
return
log = self.repo.changelog
- changes = log.read(changenode)
- date = util.datestr(changes[2])
- extra = changes[5]
+ date = util.datestr(ctx.date())
+ extra = ctx.extra()
branch = extra.get("branch")
hexfunc = self.ui.debugflag and hex or short
@@ -672,9 +673,10 @@
self.ui.write(_("parent: %d:%s\n") % parent)
if self.ui.debugflag:
+ mnode = ctx.manifestnode()
self.ui.write(_("manifest: %d:%s\n") %
- (self.repo.manifest.rev(changes[0]), hex(changes[0])))
- self.ui.write(_("user: %s\n") % changes[1])
+ (self.repo.manifest.rev(mnode), hex(mnode)))
+ self.ui.write(_("user: %s\n") % ctx.user())
self.ui.write(_("date: %s\n") % date)
if self.ui.debugflag:
@@ -683,8 +685,8 @@
files):
if value:
self.ui.write("%-12s %s\n" % (key, " ".join(value)))
- elif changes[3] and self.ui.verbose:
- self.ui.write(_("files: %s\n") % " ".join(changes[3]))
+ elif ctx.files() and self.ui.verbose:
+ self.ui.write(_("files: %s\n") % " ".join(ctx.files()))
if copies and self.ui.verbose:
copies = ['%s (%s)' % c for c in copies]
self.ui.write(_("copies: %s\n") % ' '.join(copies))
@@ -694,7 +696,7 @@
self.ui.write(_("extra: %s=%s\n")
% (key, value.encode('string_escape')))
- description = changes[4].strip()
+ description = ctx.description().strip()
if description:
if self.ui.verbose:
self.ui.write(_("description:\n"))
@@ -743,6 +745,9 @@
'parent': '{rev}:{node|formatnode} ',
'manifest': '{rev}:{node|formatnode}',
'filecopy': '{name} ({source})'})
+ # Cache mapping from rev to a tuple with tag date, tag
+ # distance and tag name
+ self._latesttagcache = {-1: (0, 0, 'null')}
def use_template(self, t):
'''set template string to use'''
@@ -760,6 +765,30 @@
return []
return parents
+ def _latesttaginfo(self, rev):
+ '''return date, distance and name for the latest tag of rev'''
+ todo = [rev]
+ while todo:
+ rev = todo.pop()
+ if rev in self._latesttagcache:
+ continue
+ ctx = self.repo[rev]
+ tags = [t for t in ctx.tags() if self.repo.tagtype(t) == 'global']
+ if tags:
+ self._latesttagcache[rev] = ctx.date()[0], 0, ':'.join(sorted(tags))
+ continue
+ try:
+ # The tuples are laid out so the right one can be found by comparison.
+ pdate, pdist, ptag = max(
+ self._latesttagcache[p.rev()] for p in ctx.parents())
+ except KeyError:
+ # Cache miss - recurse
+ todo.append(rev)
+ todo.extend(p.rev() for p in ctx.parents())
+ continue
+ self._latesttagcache[rev] = pdate, pdist + 1, ptag
+ return self._latesttagcache[rev]
+
def _show(self, ctx, copies, props):
'''show a single changeset or file revision'''
@@ -877,6 +906,11 @@
removes += i[2]
return '%s: +%s/-%s' % (files, adds, removes)
+ def showlatesttag(**args):
+ return self._latesttaginfo(ctx.rev())[2]
+ def showlatesttagdistance(**args):
+ return self._latesttaginfo(ctx.rev())[1]
+
defprops = {
'author': ctx.user(),
'branches': showbranches,
@@ -894,6 +928,8 @@
'tags': showtags,
'extras': showextras,
'diffstat': showdiffstat,
+ 'latesttag': showlatesttag,
+ 'latesttagdistance': showlatesttagdistance,
}
props = props.copy()
props.update(defprops)
--- a/mercurial/commands.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/commands.py Fri Oct 16 11:19:39 2009 +0200
@@ -340,14 +340,11 @@
state = hbisect.load_state(repo)
if command:
- commandpath = util.find_exe(command)
- if commandpath is None:
- raise util.Abort(_("cannot find executable: %s") % command)
changesets = 1
try:
while changesets:
# update state
- status = subprocess.call([commandpath])
+ status = util.system(command)
if status == 125:
transition = "skip"
elif status == 0:
@@ -370,7 +367,7 @@
hg.clean(repo, nodes[0], show_stats=False)
finally:
hbisect.save_state(repo, state)
- return print_result(nodes, not status)
+ return print_result(nodes, good)
# update state
node = repo.lookup(rev or '.')
@@ -1356,23 +1353,25 @@
With no arguments, show all repository head changesets.
- Repository "heads" are changesets that don't have child
- changesets. They are where development generally takes place and
- are the usual targets for update and merge operations.
+ Repository "heads" are changesets with no child changesets. They are
+ where development generally takes place and are the usual targets
+ for update and merge operations.
If one or more REV is given, the "branch heads" will be shown for
- the named branch associated with that revision. The name of the
- branch is called the revision's branch tag.
-
- Branch heads are revisions on a given named branch that do not have
- any descendants on the same branch. A branch head could be a true head
- or it could be the last changeset on a branch before a new branch
- was created. If none of the branch heads are true heads, the branch
- is considered inactive. If -c/--closed is specified, also show branch
- heads marked closed (see hg commit --close-branch).
-
- If STARTREV is specified only those heads (or branch heads) that
- are descendants of STARTREV will be displayed.
+ the named branch associated with the specified changeset(s).
+
+ Branch heads are changesets on a named branch with no descendants on
+ the same branch. A branch head could be a "true" (repository) head,
+ or it could be the last changeset on that branch before it was
+ merged into another branch, or it could be the last changeset on the
+ branch before a new branch was created. If none of the branch heads
+ are true heads, the branch is considered inactive.
+
+ If -c/--closed is specified, also show branch heads marked closed
+ (see hg commit --close-branch).
+
+ If STARTREV is specified, only those heads that are descendants of
+ STARTREV will be displayed.
"""
if opts.get('rev'):
start = repo.lookup(opts['rev'])
@@ -1546,7 +1545,7 @@
doc = doc()
ui.write("%s\n\n" % header)
- ui.write("%s\n" % minirst.format(doc, textwidth))
+ ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
def helpext(name):
try:
@@ -1617,9 +1616,7 @@
ui.write(_("\nadditional help topics:\n\n"))
topics = []
for names, header, doc in help.helptable:
- names = [(-len(name), name) for name in names]
- names.sort()
- topics.append((names[0][1], header))
+ topics.append((sorted(names, key=len, reverse=True)[0], header))
topics_len = max([len(s[0]) for s in topics])
for t, desc in topics:
ui.write(" %-*s %s\n" % (topics_len, t, desc))
@@ -1789,7 +1786,7 @@
else:
# launch the editor
message = None
- ui.debug(_('message:\n%s\n') % message)
+ ui.debug('message:\n%s\n' % message)
wp = repo.parents()
if opts.get('exact'):
@@ -3093,7 +3090,7 @@
globalopts = [
('R', 'repository', '',
- _('repository root directory or symbolic path name')),
+ _('repository root directory or name of overlay bundle file')),
('', 'cwd', '', _('change working directory')),
('y', 'noninteractive', None,
_('do not prompt, assume \'yes\' for any required answers')),
--- a/mercurial/config.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/config.py Fri Oct 16 11:19:39 2009 +0200
@@ -93,6 +93,7 @@
self.set(section, item, v, "%s:%d" % (src, line))
continue
item = None
+ cont = False
m = includere.match(l)
if m:
inc = m.group(1)
--- a/mercurial/context.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/context.py Fri Oct 16 11:19:39 2009 +0200
@@ -299,6 +299,7 @@
def files(self): return self._changectx.files()
def description(self): return self._changectx.description()
def branch(self): return self._changectx.branch()
+ def extra(self): return self._changectx.extra()
def manifest(self): return self._changectx.manifest()
def changectx(self): return self._changectx
--- a/mercurial/copies.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/copies.py Fri Oct 16 11:19:39 2009 +0200
@@ -144,16 +144,16 @@
elif of in ma:
diverge.setdefault(of, []).append(f)
- repo.ui.debug(_(" searching for copies back to rev %d\n") % limit)
+ repo.ui.debug(" searching for copies back to rev %d\n" % limit)
u1 = _nonoverlap(m1, m2, ma)
u2 = _nonoverlap(m2, m1, ma)
if u1:
- repo.ui.debug(_(" unmatched files in local:\n %s\n")
+ repo.ui.debug(" unmatched files in local:\n %s\n"
% "\n ".join(u1))
if u2:
- repo.ui.debug(_(" unmatched files in other:\n %s\n")
+ repo.ui.debug(" unmatched files in other:\n %s\n"
% "\n ".join(u2))
for f in u1:
@@ -169,7 +169,7 @@
diverge2.update(fl) # reverse map for below
if fullcopy:
- repo.ui.debug(_(" all copies found (* = to merge, ! = divergent):\n"))
+ repo.ui.debug(" all copies found (* = to merge, ! = divergent):\n")
for f in fullcopy:
note = ""
if f in copy: note += "*"
@@ -180,7 +180,7 @@
if not fullcopy or not checkdirs:
return copy, diverge
- repo.ui.debug(_(" checking for directory renames\n"))
+ repo.ui.debug(" checking for directory renames\n")
# generate a directory move map
d1, d2 = _dirs(m1), _dirs(m2)
@@ -216,7 +216,7 @@
return copy, diverge
for d in dirmove:
- repo.ui.debug(_(" dir %s -> %s\n") % (d, dirmove[d]))
+ repo.ui.debug(" dir %s -> %s\n" % (d, dirmove[d]))
# check unaccounted nonoverlapping files against directory moves
for f in u1 + u2:
@@ -227,7 +227,7 @@
df = dirmove[d] + f[len(d):]
if df not in copy:
copy[f] = df
- repo.ui.debug(_(" file %s -> %s\n") % (f, copy[f]))
+ repo.ui.debug(" file %s -> %s\n" % (f, copy[f]))
break
return copy, diverge
--- a/mercurial/dirstate.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/dirstate.py Fri Oct 16 11:19:39 2009 +0200
@@ -38,6 +38,9 @@
class dirstate(object):
def __init__(self, opener, ui, root):
+ '''Create a new dirstate object. opener is an open()-like callable
+ that can be used to open the dirstate file; root is the root of the
+ directory tracked by the dirstate.'''
self._opener = opener
self._root = root
self._rootdir = os.path.join(root, '')
@@ -47,6 +50,8 @@
@propertycache
def _map(self):
+ '''Return the dirstate contents as a map from filename to
+ (state, mode, size, time).'''
self._read()
return self._map
@@ -169,12 +174,14 @@
return path
def __getitem__(self, key):
- ''' current states:
- n normal
- m needs merging
- r marked for removal
- a marked for addition
- ? not tracked'''
+ '''Return the current state of key (a filename) in the dirstate.
+ States are:
+ n normal
+ m needs merging
+ r marked for removal
+ a marked for addition
+ ? not tracked
+ '''
return self._map.get(key, ("?",))[0]
def __contains__(self, key):
@@ -373,13 +380,9 @@
return
st = self._opener("dirstate", "w", atomictemp=True)
- try:
- gran = int(self._ui.config('dirstate', 'granularity', 1))
- except ValueError:
- gran = 1
- if gran > 0:
- hlimit = util.fstat(st).st_mtime
- llimit = hlimit - gran
+ # use the modification time of the newly created temporary file as the
+ # filesystem's notion of 'now'
+ now = int(util.fstat(st).st_mtime)
cs = cStringIO.StringIO()
copymap = self._copymap
@@ -389,9 +392,19 @@
for f, e in self._map.iteritems():
if f in copymap:
f = "%s\0%s" % (f, copymap[f])
- if gran > 0 and e[0] == 'n' and llimit < e[3] <= hlimit:
- # file was updated too recently, ignore stat data
- e = (e[0], 0, -1, -1)
+
+ if e[0] == 'n' and e[3] == now:
+ # The file was last modified "simultaneously" with the current
+ # write to dirstate (i.e. within the same second for file-
+ # systems with a granularity of 1 sec). This commonly happens
+ # for at least a couple of files on 'update'.
+ # The user could change the file without changing its size
+ # within the same second. Invalidate the file's stat data in
+ # dirstate, forcing future 'status' calls to compare the
+ # contents of the file. This prevents mistakenly treating such
+ # files as clean.
+ e = (e[0], 0, -1, -1) # mark entry as 'unset'
+
e = pack(_format, e[0], e[1], e[2], e[3], len(f))
write(e)
write(f)
@@ -411,11 +424,11 @@
def walk(self, match, unknown, ignored):
'''
- walk recursively through the directory tree, finding all files
- matched by the match function
+ Walk recursively through the directory tree, finding all files
+ matched by match.
- results are yielded in a tuple (filename, stat), where stat
- and st is the stat result if the file was found in the directory.
+ Return a dict mapping filename to stat-like object (either
+ mercurial.osutil.stat instance or return value of os.stat()).
'''
def fwarn(f, msg):
@@ -553,12 +566,38 @@
return results
def status(self, match, ignored, clean, unknown):
+ '''Determine the status of the working copy relative to the
+ dirstate and return a tuple of lists (unsure, modified, added,
+ removed, deleted, unknown, ignored, clean), where:
+
+ unsure:
+ files that might have been modified since the dirstate was
+ written, but need to be read to be sure (size is the same
+ but mtime differs)
+ modified:
+ files that have definitely been modified since the dirstate
+ was written (different size or mode)
+ added:
+ files that have been explicitly added with hg add
+ removed:
+ files that have been explicitly removed with hg remove
+ deleted:
+ files that have been deleted through other means ("missing")
+ unknown:
+ files not in the dirstate that are not ignored
+ ignored:
+ files not in the dirstate that are ignored
+ (by _dirignore())
+ clean:
+ files that have definitely not been modified since the
+ dirstate was written
+ '''
listignored, listclean, listunknown = ignored, clean, unknown
lookup, modified, added, unknown, ignored = [], [], [], [], []
removed, deleted, clean = [], [], []
dmap = self._map
- ladd = lookup.append
+ ladd = lookup.append # aka "unsure"
madd = modified.append
aadd = added.append
uadd = unknown.append
--- a/mercurial/dispatch.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/dispatch.py Fri Oct 16 11:19:39 2009 +0200
@@ -24,6 +24,9 @@
except util.Abort, inst:
sys.stderr.write(_("abort: %s\n") % inst)
return -1
+ except error.ConfigError, inst:
+ sys.stderr.write(_("hg: %s\n") % inst)
+ return -1
return _runcatch(u, args)
def _runcatch(ui, args):
@@ -214,7 +217,7 @@
def __call__(self, ui, *args, **opts):
if self.shadows:
- ui.debug(_("alias '%s' shadows command\n") % self.name)
+ ui.debug("alias '%s' shadows command\n" % self.name)
return self.fn(ui, *args, **opts)
--- a/mercurial/encoding.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/encoding.py Fri Oct 16 11:19:39 2009 +0200
@@ -16,7 +16,9 @@
# On darwin, getpreferredencoding ignores the locale environment and
# always returns mac-roman. We override this if the environment is
# not C (has been customized by the user).
- locale.setlocale(locale.LC_CTYPE, '')
+ lc = locale.setlocale(locale.LC_CTYPE, '')
+ if lc == 'UTF-8':
+ locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
encoding = locale.getlocale()[1]
if not encoding:
encoding = locale.getpreferredencoding() or 'ascii'
--- a/mercurial/filemerge.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/filemerge.py Fri Oct 16 11:19:39 2009 +0200
@@ -140,7 +140,7 @@
binary = isbin(fcd) or isbin(fco) or isbin(fca)
symlink = 'l' in fcd.flags() + fco.flags()
tool, toolpath = _picktool(repo, ui, fd, binary, symlink)
- ui.debug(_("picked tool '%s' for %s (binary %s symlink %s)\n") %
+ ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" %
(tool, fd, binary, symlink))
if not tool or tool == 'internal:prompt':
@@ -170,13 +170,13 @@
else:
ui.status(_("merging %s\n") % fd)
- ui.debug(_("my %s other %s ancestor %s\n") % (fcd, fco, fca))
+ ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
# do we attempt to simplemerge first?
if _toolbool(ui, tool, "premerge", not (binary or symlink)):
r = simplemerge.simplemerge(ui, a, b, c, quiet=True)
if not r:
- ui.debug(_(" premerge successful\n"))
+ ui.debug(" premerge successful\n")
os.unlink(back)
os.unlink(b)
os.unlink(c)
--- a/mercurial/hbisect.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/hbisect.py Fri Oct 16 11:19:39 2009 +0200
@@ -31,8 +31,16 @@
# only the earliest bad revision matters
badrev = min([changelog.rev(n) for n in bad])
goodrevs = [changelog.rev(n) for n in good]
- # build ancestors array
- ancestors = [[]] * (len(changelog) + 1) # an extra for [-1]
+ goodrev = min(goodrevs)
+ # build visit array
+ ancestors = [None] * (len(changelog) + 1) # an extra for [-1]
+
+ # set nodes descended from goodrev
+ ancestors[goodrev] = []
+ for rev in xrange(goodrev + 1, len(changelog)):
+ for prev in clparents(rev):
+ if ancestors[prev] == []:
+ ancestors[rev] = []
# clear good revs from array
for node in goodrevs:
--- a/mercurial/help.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/help.py Fri Oct 16 11:19:39 2009 +0200
@@ -5,7 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
+from i18n import gettext, _
+import sys, os
import extensions, util
@@ -49,41 +50,7 @@
return result
def extshelp():
- doc = _(r'''
- Mercurial has the ability to add new features through the use of
- extensions. Extensions may add new commands, add options to
- existing commands, change the default behavior of commands, or
- implement hooks.
-
- Extensions are not loaded by default for a variety of reasons:
- they can increase startup overhead; they may be meant for advanced
- usage only; they may provide potentially dangerous abilities (such
- as letting you destroy or modify history); they might not be ready
- for prime time; or they may alter some usual behaviors of stock
- Mercurial. It is thus up to the user to activate extensions as
- needed.
-
- To enable the "foo" extension, either shipped with Mercurial or in
- the Python search path, create an entry for it in your hgrc, like
- this::
-
- [extensions]
- foo =
-
- You may also specify the full path to an extension::
-
- [extensions]
- myfeature = ~/.hgext/myfeature.py
-
- To explicitly disable an extension enabled in an hgrc of broader
- scope, prepend its path with !::
-
- [extensions]
- # disabling extension bar residing in /path/to/extension/bar.py
- hgext.bar = !/path/to/extension/bar.py
- # ditto, but no path was supplied for extension baz
- hgext.baz = !
- ''')
+ doc = loaddoc('extensions')()
exts, maxlength = extensions.enabled()
doc += listexts(_('enabled extensions:'), exts, maxlength)
@@ -93,441 +60,33 @@
return doc
-helptable = (
- (["dates"], _("Date Formats"),
- _(r'''
- Some commands allow the user to specify a date, e.g.:
-
- - backout, commit, import, tag: Specify the commit date.
- - log, revert, update: Select revision(s) by date.
-
- Many date formats are valid. Here are some examples::
-
- "Wed Dec 6 13:18:29 2006" (local timezone assumed)
- "Dec 6 13:18 -0600" (year assumed, time offset provided)
- "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
- "Dec 6" (midnight)
- "13:18" (today assumed)
- "3:39" (3:39AM assumed)
- "3:39pm" (15:39)
- "2006-12-06 13:18:29" (ISO 8601 format)
- "2006-12-6 13:18"
- "2006-12-6"
- "12-6"
- "12/6"
- "12/6/6" (Dec 6 2006)
-
- Lastly, there is Mercurial's internal format::
-
- "1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)
-
- This is the internal representation format for dates. unixtime is
- the number of seconds since the epoch (1970-01-01 00:00 UTC).
- offset is the offset of the local timezone, in seconds west of UTC
- (negative if the timezone is east of UTC).
-
- The log command also accepts date ranges::
-
- "<{datetime}" - at or before a given date/time
- ">{datetime}" - on or after a given date/time
- "{datetime} to {datetime}" - a date range, inclusive
- "-{days}" - within a given number of days of today
- ''')),
-
- (["patterns"], _("File Name Patterns"),
- _(r'''
- Mercurial accepts several notations for identifying one or more
- files at a time.
-
- By default, Mercurial treats filenames as shell-style extended
- glob patterns.
-
- Alternate pattern notations must be specified explicitly.
-
- To use a plain path name without any pattern matching, start it
- with "path:". These path names must completely match starting at
- the current repository root.
-
- To use an extended glob, start a name with "glob:". Globs are
- rooted at the current directory; a glob such as "``*.c``" will
- only match files in the current directory ending with ".c".
-
- The supported glob syntax extensions are "``**``" to match any
- string across path separators and "{a,b}" to mean "a or b".
-
- To use a Perl/Python regular expression, start a name with "re:".
- Regexp pattern matching is anchored at the root of the repository.
-
- Plain examples::
-
- path:foo/bar a name bar in a directory named foo in the root
- of the repository
- path:path:name a file or directory named "path:name"
-
- Glob examples::
-
- glob:*.c any name ending in ".c" in the current directory
- *.c any name ending in ".c" in the current directory
- **.c any name ending in ".c" in any subdirectory of the
- current directory including itself.
- foo/*.c any name ending in ".c" in the directory foo
- foo/**.c any name ending in ".c" in any subdirectory of foo
- including itself.
-
- Regexp examples::
-
- re:.*\.c$ any name ending in ".c", anywhere in the repository
-
- ''')),
-
- (['environment', 'env'], _('Environment Variables'),
- _(r'''
-HG
- Path to the 'hg' executable, automatically passed when running
- hooks, extensions or external tools. If unset or empty, this is
- the hg executable's name if it's frozen, or an executable named
- 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
- Windows) is searched.
-
-HGEDITOR
- This is the name of the editor to run when committing. See EDITOR.
-
- (deprecated, use .hgrc)
-
-HGENCODING
- This overrides the default locale setting detected by Mercurial.
- This setting is used to convert data including usernames,
- changeset descriptions, tag names, and branches. This setting can
- be overridden with the --encoding command-line option.
+def loaddoc(topic):
+ """Return a delayed loader for help/topic.txt."""
-HGENCODINGMODE
- This sets Mercurial's behavior for handling unknown characters
- while transcoding user input. The default is "strict", which
- causes Mercurial to abort if it can't map a character. Other
- settings include "replace", which replaces unknown characters, and
- "ignore", which drops them. This setting can be overridden with
- the --encodingmode command-line option.
-
-HGMERGE
- An executable to use for resolving merge conflicts. The program
- will be executed with three arguments: local file, remote file,
- ancestor file.
-
- (deprecated, use .hgrc)
-
-HGRCPATH
- A list of files or directories to search for hgrc files. Item
- separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set,
- platform default search path is used. If empty, only the .hg/hgrc
- from the current repository is read.
-
- For each element in HGRCPATH:
-
- - if it's a directory, all files ending with .rc are added
- - otherwise, the file itself will be added
-
-HGUSER
- This is the string used as the author of a commit. If not set,
- available values will be considered in this order:
-
- - HGUSER (deprecated)
- - hgrc files from the HGRCPATH
- - EMAIL
- - interactive prompt
- - LOGNAME (with '@hostname' appended)
-
- (deprecated, use .hgrc)
-
-EMAIL
- May be used as the author of a commit; see HGUSER.
-
-LOGNAME
- May be used as the author of a commit; see HGUSER.
-
-VISUAL
- This is the name of the editor to use when committing. See EDITOR.
-
-EDITOR
- Sometimes Mercurial needs to open a text file in an editor for a
- user to modify, for example when writing commit messages. The
- editor it uses is determined by looking at the environment
- variables HGEDITOR, VISUAL and EDITOR, in that order. The first
- non-empty one is chosen. If all of them are empty, the editor
- defaults to 'vi'.
-
-PYTHONPATH
- This is used by Python to find imported modules and may need to be
- set appropriately if this Mercurial is not installed system-wide.
- ''')),
-
- (['revs', 'revisions'], _('Specifying Single Revisions'),
- _(r'''
- Mercurial supports several ways to specify individual revisions.
-
- A plain integer is treated as a revision number. Negative integers
- are treated as sequential offsets from the tip, with -1 denoting
- the tip, -2 denoting the revision prior to the tip, and so forth.
-
- A 40-digit hexadecimal string is treated as a unique revision
- identifier.
-
- A hexadecimal string less than 40 characters long is treated as a
- unique revision identifier and is referred to as a short-form
- identifier. A short-form identifier is only valid if it is the
- prefix of exactly one full-length identifier.
-
- Any other string is treated as a tag or branch name. A tag name is
- a symbolic name associated with a revision identifier. A branch
- name denotes the tipmost revision of that branch. Tag and branch
- names must not contain the ":" character.
-
- The reserved name "tip" is a special tag that always identifies
- the most recent revision.
-
- The reserved name "null" indicates the null revision. This is the
- revision of an empty repository, and the parent of revision 0.
-
- The reserved name "." indicates the working directory parent. If
- no working directory is checked out, it is equivalent to null. If
- an uncommitted merge is in progress, "." is the revision of the
- first parent.
- ''')),
-
- (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'),
- _(r'''
- When Mercurial accepts more than one revision, they may be
- specified individually, or provided as a topologically continuous
- range, separated by the ":" character.
-
- The syntax of range notation is [BEGIN]:[END], where BEGIN and END
- are revision identifiers. Both BEGIN and END are optional. If
- BEGIN is not specified, it defaults to revision number 0. If END
- is not specified, it defaults to the tip. The range ":" thus means
- "all revisions".
-
- If BEGIN is greater than END, revisions are treated in reverse
- order.
+ def loader():
+ if hasattr(sys, 'frozen'):
+ module = sys.executable
+ else:
+ module = __file__
+ base = os.path.dirname(module)
- A range acts as a closed interval. This means that a range of 3:5
- gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
- ''')),
-
- (['diffs'], _('Diff Formats'),
- _(r'''
- Mercurial's default format for showing changes between two
- versions of a file is compatible with the unified format of GNU
- diff, which can be used by GNU patch and many other standard
- tools.
-
- While this standard format is often enough, it does not encode the
- following information:
-
- - executable status and other permission bits
- - copy or rename information
- - changes in binary files
- - creation or deletion of empty files
-
- Mercurial also supports the extended diff format from the git VCS
- which addresses these limitations. The git diff format is not
- produced by default because a few widespread tools still do not
- understand this format.
-
- This means that when generating diffs from a Mercurial repository
- (e.g. with "hg export"), you should be careful about things like
- file copies and renames or other things mentioned above, because
- when applying a standard diff to a different repository, this
- extra information is lost. Mercurial's internal operations (like
- push and pull) are not affected by this, because they use an
- internal binary format for communicating changes.
-
- To make Mercurial produce the git extended diff format, use the
- --git option available for many commands, or set 'git = True' in
- the [diff] section of your hgrc. You do not need to set this
- option when importing diffs in this format or using them in the mq
- extension.
- ''')),
- (['templating', 'templates'], _('Template Usage'),
- _(r'''
- Mercurial allows you to customize output of commands through
- templates. You can either pass in a template from the command
- line, via the --template option, or select an existing
- template-style (--style).
-
- You can customize output for any "log-like" command: log,
- outgoing, incoming, tip, parents, heads and glog.
+ for dir in ('.', '..'):
+ docdir = os.path.join(base, dir, 'help')
+ if os.path.isdir(docdir):
+ break
- Three styles are packaged with Mercurial: default (the style used
- when no explicit preference is passed), compact and changelog.
- Usage::
-
- $ hg log -r1 --style changelog
-
- A template is a piece of text, with markup to invoke variable
- expansion::
-
- $ hg log -r1 --template "{node}\n"
- b56ce7b07c52de7d5fd79fb89701ea538af65746
-
- Strings in curly braces are called keywords. The availability of
- keywords depends on the exact context of the templater. These
- keywords are usually available for templating a log-like command:
-
- :author: String. The unmodified author of the changeset.
- :branches: String. The name of the branch on which the changeset
- was committed. Will be empty if the branch name was
- default.
- :date: Date information. The date when the changeset was
- committed.
- :desc: String. The text of the changeset description.
- :diffstat: String. Statistics of changes with the following
- format: "modified files: +added/-removed lines"
- :files: List of strings. All files modified, added, or removed
- by this changeset.
- :file_adds: List of strings. Files added by this changeset.
- :file_mods: List of strings. Files modified by this changeset.
- :file_dels: List of strings. Files removed by this changeset.
- :node: String. The changeset identification hash, as a
- 40-character hexadecimal string.
- :parents: List of strings. The parents of the changeset.
- :rev: Integer. The repository-local changeset revision
- number.
- :tags: List of strings. Any tags associated with the
- changeset.
-
- The "date" keyword does not produce human-readable output. If you
- want to use a date in your output, you can use a filter to process
- it. Filters are functions which return a string based on the input
- variable. You can also use a chain of filters to get the desired
- output::
-
- $ hg tip --template "{date|isodate}\n"
- 2008-08-21 18:22 +0000
-
- List of filters:
+ path = os.path.join(docdir, topic + ".txt")
+ return gettext(open(path).read())
+ return loader
- :addbreaks: Any text. Add an XHTML "<br />" tag before the end of
- every line except the last.
- :age: Date. Returns a human-readable date/time difference
- between the given date/time and the current
- date/time.
- :basename: Any text. Treats the text as a path, and returns the
- last component of the path after splitting by the
- path separator (ignoring trailing separators). For
- example, "foo/bar/baz" becomes "baz" and "foo/bar//"
- becomes "bar".
- :stripdir: Treat the text as path and strip a directory level,
- if possible. For example, "foo" and "foo/bar" becomes
- "foo".
- :date: Date. Returns a date in a Unix date format, including
- the timezone: "Mon Sep 04 15:13:13 2006 0700".
- :domain: Any text. Finds the first string that looks like an
- email address, and extracts just the domain
- component. Example: 'User <user@example.com>' becomes
- 'example.com'.
- :email: Any text. Extracts the first string that looks like
- an email address. Example: 'User <user@example.com>'
- becomes 'user@example.com'.
- :escape: Any text. Replaces the special XML/XHTML characters
- "&", "<" and ">" with XML entities.
- :fill68: Any text. Wraps the text to fit in 68 columns.
- :fill76: Any text. Wraps the text to fit in 76 columns.
- :firstline: Any text. Returns the first line of text.
- :nonempty: Any text. Returns '(none)' if the string is empty.
- :hgdate: Date. Returns the date as a pair of numbers:
- "1157407993 25200" (Unix timestamp, timezone offset).
- :isodate: Date. Returns the date in ISO 8601 format:
- "2009-08-18 13:00 +0200".
- :isodatesec: Date. Returns the date in ISO 8601 format, including
- seconds: "2009-08-18 13:00:13 +0200". See also the
- rfc3339date filter.
- :localdate: Date. Converts a date to local date.
- :obfuscate: Any text. Returns the input text rendered as a
- sequence of XML entities.
- :person: Any text. Returns the text before an email address.
- :rfc822date: Date. Returns a date using the same format used in
- email headers: "Tue, 18 Aug 2009 13:00:13 +0200".
- :rfc3339date: Date. Returns a date using the Internet date format
- specified in RFC 3339: "2009-08-18T13:00:13+02:00".
- :short: Changeset hash. Returns the short form of a changeset
- hash, i.e. a 12-byte hexadecimal string.
- :shortdate: Date. Returns a date like "2006-09-18".
- :strip: Any text. Strips all leading and trailing whitespace.
- :tabindent: Any text. Returns the text, with every line except
- the first starting with a tab character.
- :urlescape: Any text. Escapes all "special" characters. For
- example, "foo bar" becomes "foo%20bar".
- :user: Any text. Returns the user portion of an email
- address.
- ''')),
-
- (['urls'], _('URL Paths'),
- _(r'''
- Valid URLs are of the form::
-
- local/filesystem/path[#revision]
- file://local/filesystem/path[#revision]
- http://[user[:pass]@]host[:port]/[path][#revision]
- https://[user[:pass]@]host[:port]/[path][#revision]
- ssh://[user[:pass]@]host[:port]/[path][#revision]
-
- Paths in the local filesystem can either point to Mercurial
- repositories or to bundle files (as created by 'hg bundle' or 'hg
- incoming --bundle').
-
- An optional identifier after # indicates a particular branch, tag,
- or changeset to use from the remote repository. See also 'hg help
- revisions'.
-
- Some features, such as pushing to http:// and https:// URLs are
- only possible if the feature is explicitly enabled on the remote
- Mercurial server.
-
- Some notes about using SSH with Mercurial:
-
- - SSH requires an accessible shell account on the destination
- machine and a copy of hg in the remote path or specified with as
- remotecmd.
- - path is relative to the remote user's home directory by default.
- Use an extra slash at the start of a path to specify an absolute
- path::
-
- ssh://example.com//tmp/repository
-
- - Mercurial doesn't use its own compression via SSH; the right
- thing to do is to configure it in your ~/.ssh/config, e.g.::
-
- Host *.mylocalnetwork.example.com
- Compression no
- Host *
- Compression yes
-
- Alternatively specify "ssh -C" as your ssh command in your hgrc
- or with the --ssh command line option.
-
- These URLs can all be stored in your hgrc with path aliases under
- the [paths] section like so::
-
- [paths]
- alias1 = URL1
- alias2 = URL2
- ...
-
- You can then use the alias for any command that uses a URL (for
- example 'hg pull alias1' would pull from the 'alias1' path).
-
- Two path aliases are special because they are used as defaults
- when you do not provide the URL to a command:
-
- default:
- When you create a repository with hg clone, the clone command
- saves the location of the source repository as the new
- repository's 'default' path. This is then used when you omit
- path from push- and pull-like commands (including incoming and
- outgoing).
-
- default-push:
- The push command will look for a path named 'default-push', and
- prefer it over 'default' if both are defined.
- ''')),
+helptable = (
+ (["dates"], _("Date Formats"), loaddoc('dates')),
+ (["patterns"], _("File Name Patterns"), loaddoc('patterns')),
+ (['environment', 'env'], _('Environment Variables'), loaddoc('environment')),
+ (['revs', 'revisions'], _('Specifying Single Revisions'), loaddoc('revisions')),
+ (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'), loaddoc('multirevs')),
+ (['diffs'], _('Diff Formats'), loaddoc('diffs')),
+ (['templating', 'templates'], _('Template Usage'), loaddoc('templates')),
+ (['urls'], _('URL Paths'), loaddoc('urls')),
(["extensions"], _("Using additional features"), extshelp),
)
--- a/mercurial/hg.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/hg.py Fri Oct 16 11:19:39 2009 +0200
@@ -353,7 +353,7 @@
_showstats(repo, stats)
if stats[3]:
repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
- "or 'hg up --clean' to abandon\n"))
+ "or 'hg update -C' to abandon\n"))
elif remind:
repo.ui.status(_("(branch merge, don't forget to commit)\n"))
return stats[3] > 0
--- a/mercurial/httprepo.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/httprepo.py Fri Oct 16 11:19:39 2009 +0200
@@ -35,7 +35,7 @@
self._url, authinfo = url.getauthinfo(path)
self.ui = ui
- self.ui.debug(_('using %s\n') % self._url)
+ self.ui.debug('using %s\n' % self._url)
self.urlopener = url.opener(ui, authinfo)
@@ -56,7 +56,7 @@
self.caps = set(self.do_read('capabilities').split())
except error.RepoError:
self.caps = set()
- self.ui.debug(_('capabilities: %s\n') %
+ self.ui.debug('capabilities: %s\n' %
(' '.join(self.caps or ['none'])))
return self.caps
@@ -68,21 +68,21 @@
def do_cmd(self, cmd, **args):
data = args.pop('data', None)
headers = args.pop('headers', {})
- self.ui.debug(_("sending %s command\n") % cmd)
+ self.ui.debug("sending %s command\n" % cmd)
q = {"cmd": cmd}
q.update(args)
qs = '?%s' % urllib.urlencode(q)
cu = "%s%s" % (self._url, qs)
try:
if data:
- self.ui.debug(_("sending %s bytes\n") % len(data))
+ self.ui.debug("sending %s bytes\n" % len(data))
resp = self.urlopener.open(urllib2.Request(cu, data, headers))
except urllib2.HTTPError, inst:
if inst.code == 401:
raise util.Abort(_('authorization failed'))
raise
except httplib.HTTPException, inst:
- self.ui.debug(_('http error while sending %s command\n') % cmd)
+ self.ui.debug('http error while sending %s command\n' % cmd)
self.ui.traceback()
raise IOError(None, inst)
except IndexError:
@@ -105,7 +105,7 @@
if not (proto.startswith('application/mercurial-') or
proto.startswith('text/plain') or
proto.startswith('application/hg-changegroup')):
- self.ui.debug(_("requested URL: '%s'\n") % url.hidepassword(cu))
+ self.ui.debug("requested URL: '%s'\n" % url.hidepassword(cu))
raise error.RepoError(_("'%s' does not appear to be an hg repository")
% safeurl)
--- a/mercurial/i18n.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/i18n.py Fri Oct 16 11:19:39 2009 +0200
@@ -16,7 +16,7 @@
base = os.path.dirname(module)
for dir in ('.', '..'):
- localedir = os.path.normpath(os.path.join(base, dir, 'locale'))
+ localedir = os.path.join(base, dir, 'locale')
if os.path.isdir(localedir):
break
--- a/mercurial/localrepo.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/localrepo.py Fri Oct 16 11:19:39 2009 +0200
@@ -527,7 +527,7 @@
for mf, fn, cmd in self.filterpats[filter]:
if mf(filename):
- self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
+ self.ui.debug("filtering %s through %s\n" % (filename, cmd))
data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
break
@@ -724,14 +724,14 @@
# find source in nearest ancestor if we've lost track
if not crev:
- self.ui.debug(_(" %s: searching for copy revision for %s\n") %
+ self.ui.debug(" %s: searching for copy revision for %s\n" %
(fname, cfname))
for ancestor in self['.'].ancestors():
if cfname in ancestor:
crev = ancestor[cfname].filenode()
break
- self.ui.debug(_(" %s: copy %s:%s\n") % (fname, cfname, hex(crev)))
+ self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
meta["copy"] = cfname
meta["copyrev"] = hex(crev)
fparent1, fparent2 = nullid, newfparent
@@ -1159,17 +1159,24 @@
return [n for (r, n) in sorted(heads)]
def branchheads(self, branch=None, start=None, closed=False):
+ '''return a (possibly filtered) list of heads for the given branch
+
+ Heads are returned in topological order, from newest to oldest.
+ If branch is None, use the dirstate branch.
+ If start is not None, return only heads reachable from start.
+ If closed is True, return heads that are marked as closed as well.
+ '''
if branch is None:
branch = self[None].branch()
branches = self.branchmap()
if branch not in branches:
return []
- bheads = branches[branch]
# the cache returns heads ordered lowest to highest
- bheads.reverse()
+ bheads = list(reversed(branches[branch]))
if start is not None:
# filter out the heads that cannot be reached from startrev
- bheads = self.changelog.nodesbetween([start], bheads)[2]
+ fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
+ bheads = [h for h in bheads if h in fbheads]
if not closed:
bheads = [h for h in bheads if
('close' not in self.changelog.read(h)[5])]
@@ -1287,22 +1294,22 @@
if n[0] in seen:
continue
- self.ui.debug(_("examining %s:%s\n")
+ self.ui.debug("examining %s:%s\n"
% (short(n[0]), short(n[1])))
if n[0] == nullid: # found the end of the branch
pass
elif n in seenbranch:
- self.ui.debug(_("branch already found\n"))
+ self.ui.debug("branch already found\n")
continue
elif n[1] and n[1] in m: # do we know the base?
- self.ui.debug(_("found incomplete branch %s:%s\n")
+ self.ui.debug("found incomplete branch %s:%s\n"
% (short(n[0]), short(n[1])))
search.append(n[0:2]) # schedule branch range for scanning
seenbranch.add(n)
else:
if n[1] not in seen and n[1] not in fetch:
if n[2] in m and n[3] in m:
- self.ui.debug(_("found new changeset %s\n") %
+ self.ui.debug("found new changeset %s\n" %
short(n[1]))
fetch.add(n[1]) # earliest unknown
for p in n[2:4]:
@@ -1317,11 +1324,11 @@
if r:
reqcnt += 1
- self.ui.debug(_("request %d: %s\n") %
+ self.ui.debug("request %d: %s\n" %
(reqcnt, " ".join(map(short, r))))
for p in xrange(0, len(r), 10):
for b in remote.branches(r[p:p+10]):
- self.ui.debug(_("received %s:%s\n") %
+ self.ui.debug("received %s:%s\n" %
(short(b[0]), short(b[1])))
unknown.append(b)
@@ -1334,15 +1341,15 @@
p = n[0]
f = 1
for i in l:
- self.ui.debug(_("narrowing %d:%d %s\n") % (f, len(l), short(i)))
+ self.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i)))
if i in m:
if f <= 2:
- self.ui.debug(_("found new branch changeset %s\n") %
+ self.ui.debug("found new branch changeset %s\n" %
short(p))
fetch.add(p)
base[i] = 1
else:
- self.ui.debug(_("narrowed branch search to %s:%s\n")
+ self.ui.debug("narrowed branch search to %s:%s\n"
% (short(p), short(i)))
newsearch.append((p, i))
break
@@ -1361,10 +1368,10 @@
else:
raise util.Abort(_("repository is unrelated"))
- self.ui.debug(_("found new changesets starting at ") +
+ self.ui.debug("found new changesets starting at " +
" ".join([short(f) for f in fetch]) + "\n")
- self.ui.debug(_("%d total queries\n") % reqcnt)
+ self.ui.debug("%d total queries\n" % reqcnt)
return base.keys(), list(fetch), heads
@@ -1381,7 +1388,7 @@
base = {}
self.findincoming(remote, base, heads, force=force)
- self.ui.debug(_("common changesets up to ")
+ self.ui.debug("common changesets up to "
+ " ".join(map(short, base.keys())) + "\n")
remain = set(self.changelog.nodemap)
@@ -1468,19 +1475,16 @@
inc = self.findincoming(remote, common, remote_heads, force=force)
update, updated_heads = self.findoutgoing(remote, common, remote_heads)
- if revs is not None:
- msng_cl, bases, heads = self.changelog.nodesbetween(update, revs)
- else:
- bases, heads = update, self.changelog.heads()
+ msng_cl, bases, heads = self.changelog.nodesbetween(update, revs)
- def checkbranch(lheads, rheads, updatelh):
+ def checkbranch(lheads, rheads, updatelb):
'''
check whether there are more local heads than remote heads on
a specific branch.
lheads: local branch heads
rheads: remote branch heads
- updatelh: outgoing local branch heads
+ updatelb: outgoing local branch bases
'''
warn = 0
@@ -1488,13 +1492,15 @@
if not revs and len(lheads) > len(rheads):
warn = 1
else:
+ # add local heads involved in the push
updatelheads = [self.changelog.heads(x, lheads)
- for x in updatelh]
+ for x in updatelb]
newheads = set(sum(updatelheads, [])) & set(lheads)
if not newheads:
return True
+ # add heads we don't have or that are not involved in the push
for r in rheads:
if r in self.changelog.nodemap:
desc = self.changelog.heads(r, heads)
@@ -1510,7 +1516,7 @@
if not rheads: # new branch requires --force
self.ui.warn(_("abort: push creates new"
" remote branch '%s'!\n") %
- self[updatelh[0]].branch())
+ self[updatelb[0]].branch())
else:
self.ui.warn(_("abort: push creates new remote heads!\n"))
@@ -1553,11 +1559,11 @@
else:
rheads = []
lheads = localhds[lh]
- updatelh = [upd for upd in update
+ updatelb = [upd for upd in update
if self[upd].branch() == lh]
- if not updatelh:
+ if not updatelb:
continue
- if not checkbranch(lheads, rheads, updatelh):
+ if not checkbranch(lheads, rheads, updatelb):
return None, 0
else:
if not checkbranch(heads, remote_heads, update):
@@ -1602,7 +1608,7 @@
if self.ui.verbose or source == 'bundle':
self.ui.status(_("%d changesets found\n") % len(nodes))
if self.ui.debugflag:
- self.ui.debug(_("list of changesets:\n"))
+ self.ui.debug("list of changesets:\n")
for node in nodes:
self.ui.debug("%s\n" % hex(node))
@@ -1988,7 +1994,7 @@
- number of heads stays the same: 1
"""
def csmap(x):
- self.ui.debug(_("add changeset %s\n") % short(x))
+ self.ui.debug("add changeset %s\n" % short(x))
return len(cl)
def revmap(x):
@@ -2034,7 +2040,7 @@
f = changegroup.getchunk(source)
if not f:
break
- self.ui.debug(_("adding %s revisions\n") % f)
+ self.ui.debug("adding %s revisions\n" % f)
fl = self.file(f)
o = len(fl)
chunkiter = changegroup.chunkiter(source)
@@ -2067,7 +2073,7 @@
if changesets > 0:
# forcefully update the on-disk branch cache
- self.ui.debug(_("updating the branch cache\n"))
+ self.ui.debug("updating the branch cache\n")
self.branchtags()
self.hook("changegroup", node=hex(cl.node(clstart)),
source=srctype, url=url)
@@ -2116,7 +2122,7 @@
except (ValueError, TypeError):
raise error.ResponseError(
_('Unexpected response from remote server:'), l)
- self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size)))
+ self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size)))
# for backwards compat, name was partially encoded
ofp = self.sopener(store.decodedir(name), 'w')
for chunk in util.filechunkiter(fp, limit=size):
--- a/mercurial/merge.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/merge.py Fri Oct 16 11:19:39 2009 +0200
@@ -161,8 +161,8 @@
act("divergent renames", "dr", of, fl)
repo.ui.note(_("resolving manifests\n"))
- repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial)))
- repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2))
+ repo.ui.debug(" overwrite %s partial %s\n" % (overwrite, bool(partial)))
+ repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2))
m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
copied = set(copy.values())
@@ -252,7 +252,7 @@
f2, fd, flags, move = a[2:]
if f == '.hgsubstate': # merged internally
continue
- repo.ui.debug(_("preserving %s for resolve of %s\n") % (f, fd))
+ repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd))
fcl = wctx[f]
fco = mctx[f2]
fca = fcl.ancestor(fco) or repo.filectx(f, fileid=nullrev)
@@ -263,7 +263,7 @@
# remove renamed files after safely stored
for f in moves:
if util.lexists(repo.wjoin(f)):
- repo.ui.debug(_("removing %s\n") % f)
+ repo.ui.debug("removing %s\n" % f)
os.unlink(repo.wjoin(f))
audit_path = util.path_auditor(repo.root)
@@ -299,7 +299,7 @@
merged += 1
util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags)
if f != fd and move and util.lexists(repo.wjoin(f)):
- repo.ui.debug(_("removing %s\n") % f)
+ repo.ui.debug("removing %s\n" % f)
os.unlink(repo.wjoin(f))
elif m == "g": # get
flags = a[2]
--- a/mercurial/minirst.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/minirst.py Fri Oct 16 11:19:39 2009 +0200
@@ -310,9 +310,11 @@
subsequent_indent=subindent)
-def format(text, width):
+def format(text, width, indent=0):
"""Parse and format the text according to width."""
blocks = findblocks(text)
+ for b in blocks:
+ b['indent'] += indent
blocks = findliteralblocks(blocks)
blocks = findsections(blocks)
blocks = findbulletlists(blocks)
--- a/mercurial/patch.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/patch.py Fri Oct 16 11:19:39 2009 +0200
@@ -63,6 +63,10 @@
subject = msg['Subject']
user = msg['From']
+ if not subject and not user:
+ # Not an email, restore parsed headers if any
+ subject = '\n'.join(': '.join(h) for h in msg.items()) + '\n'
+
gitsendmail = 'git-send-email' in msg.get('X-Mailer', '')
# should try to parse msg['Date']
date = None
@@ -93,12 +97,12 @@
hgpatch = False
ignoretext = False
- ui.debug(_('found patch at byte %d\n') % m.start(0))
+ ui.debug('found patch at byte %d\n' % m.start(0))
diffs_seen += 1
cfp = cStringIO.StringIO()
for line in payload[:m.start(0)].splitlines():
if line.startswith('# HG changeset patch'):
- ui.debug(_('patch generated by hg export\n'))
+ ui.debug('patch generated by hg export\n')
hgpatch = True
# drop earlier commit message content
cfp.seek(0)
@@ -288,14 +292,23 @@
self.hunks = 0
def readlines(self, fname):
+ if os.path.islink(fname):
+ return [os.readlink(fname)]
fp = self.opener(fname, 'r')
try:
return list(linereader(fp, self.eol is not None))
finally:
fp.close()
- def writelines(self, fname, lines):
- fp = self.opener(fname, 'w')
+ def writelines(self, fname, lines):
+ # Ensure supplied data ends in fname, being a regular file or
+ # a symlink. updatedir() will -too magically- take care of
+ # setting it to the proper type afterwards.
+ islink = os.path.islink(fname)
+ if islink:
+ fp = cStringIO.StringIO()
+ else:
+ fp = self.opener(fname, 'w')
try:
if self.eol and self.eol != '\n':
for l in lines:
@@ -304,6 +317,8 @@
fp.write(l)
else:
fp.writelines(lines)
+ if islink:
+ self.opener.symlink(fp.getvalue(), fname)
finally:
fp.close()
@@ -395,7 +410,7 @@
self.rej.append(h)
return -1
- if isinstance(h, githunk):
+ if isinstance(h, binhunk):
if h.rmfile():
self.unlink(self.fname)
else:
@@ -661,12 +676,12 @@
def new(self, fuzz=0, toponly=False):
return self.fuzzit(self.b, fuzz, toponly)
-class githunk(object):
- """A git hunk"""
+class binhunk:
+ 'A binary patch file. Only understands literals so far.'
def __init__(self, gitpatch):
self.gitpatch = gitpatch
self.text = None
- self.hunk = []
+ self.hunk = ['GIT binary patch\n']
def createfile(self):
return self.gitpatch.op in ('ADD', 'RENAME', 'COPY')
@@ -680,12 +695,6 @@
def new(self):
return [self.text]
-class binhunk(githunk):
- 'A binary patch file. Only understands literals so far.'
- def __init__(self, gitpatch):
- super(binhunk, self).__init__(gitpatch)
- self.hunk = ['GIT binary patch\n']
-
def extract(self, lr):
line = lr.readline()
self.hunk.append(line)
@@ -713,18 +722,6 @@
len(text), size)
self.text = text
-class symlinkhunk(githunk):
- """A git symlink hunk"""
- def __init__(self, gitpatch, hunk):
- super(symlinkhunk, self).__init__(gitpatch)
- self.hunk = hunk
-
- def complete(self):
- return True
-
- def fix_newline(self):
- return
-
def parsefilename(str):
# --- filename \t|space stuff
s = str[4:].rstrip('\r\n')
@@ -871,10 +868,6 @@
create = afile == '/dev/null' or gpatch and gpatch.op == 'ADD'
remove = bfile == '/dev/null' or gpatch and gpatch.op == 'DELETE'
current_hunk = hunk(x, hunknum + 1, lr, context, create, remove)
- if remove:
- gpatch = changed.get(afile[2:])
- if gpatch and gpatch.mode[0]:
- current_hunk = symlinkhunk(gpatch, current_hunk)
except PatchError, err:
ui.debug(err)
current_hunk = None
@@ -1155,7 +1148,7 @@
return internalpatch(patchname, ui, strip, cwd, files, eolmode)
except NoHunks:
patcher = util.find_exe('gpatch') or util.find_exe('patch') or 'patch'
- ui.debug(_('no valid hunks found; trying with %r instead\n') %
+ ui.debug('no valid hunks found; trying with %r instead\n' %
patcher)
if util.needbinarypatch():
args.append('--binary')
--- a/mercurial/posix.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/posix.py Fri Oct 16 11:19:39 2009 +0200
@@ -13,6 +13,7 @@
nulldev = '/dev/null'
normpath = os.path.normpath
samestat = os.path.samestat
+rename = os.rename
expandglobs = False
umask = os.umask(0)
@@ -165,17 +166,11 @@
return inst.errno != errno.ESRCH
def explain_exit(code):
- """return a 2-tuple (desc, code) describing a process's status"""
- if os.WIFEXITED(code):
- val = os.WEXITSTATUS(code)
- return _("exited with status %d") % val, val
- elif os.WIFSIGNALED(code):
- val = os.WTERMSIG(code)
- return _("killed by signal %d") % val, val
- elif os.WIFSTOPPED(code):
- val = os.WSTOPSIG(code)
- return _("stopped by signal %d") % val, val
- raise ValueError(_("invalid exit code"))
+ """return a 2-tuple (desc, code) describing a subprocess status
+ (codes from kill are negative - not os.system/wait encoding)"""
+ if code >= 0:
+ return _("exited with status %d") % code, code
+ return _("killed by signal %d") % -code, -code
def isowner(st):
"""Return True if the stat object st is from the current user."""
--- a/mercurial/sshrepo.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/sshrepo.py Fri Oct 16 11:19:39 2009 +0200
@@ -75,7 +75,7 @@
if lines[-1] == "1\n" and l == "\n":
break
if l:
- ui.debug(_("remote: "), l)
+ ui.debug("remote: ", l)
lines.append(l)
max_noise -= 1
else:
@@ -113,7 +113,7 @@
__del__ = cleanup
def do_cmd(self, cmd, **args):
- self.ui.debug(_("sending %s command\n") % cmd)
+ self.ui.debug("sending %s command\n" % cmd)
self.pipeo.write("%s\n" % cmd)
for k, v in args.iteritems():
self.pipeo.write("%s %d\n" % (k, len(v)))
--- a/mercurial/streamclone.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/streamclone.py Fri Oct 16 11:19:39 2009 +0200
@@ -46,10 +46,9 @@
# get consistent snapshot of repo, lock during scan
lock = repo.lock()
try:
- repo.ui.debug(_('scanning\n'))
+ repo.ui.debug('scanning\n')
for name, ename, size in repo.store.walk():
- # for backwards compat, name was partially encoded
- entries.append((store.encodedir(name), size))
+ entries.append((name, size))
total_bytes += size
finally:
lock.release()
@@ -57,11 +56,12 @@
raise StreamException(2)
yield '0\n'
- repo.ui.debug(_('%d files, %d bytes to transfer\n') %
+ repo.ui.debug('%d files, %d bytes to transfer\n' %
(len(entries), total_bytes))
yield '%d %d\n' % (len(entries), total_bytes)
for name, size in entries:
- repo.ui.debug(_('sending %s (%d bytes)\n') % (name, size))
- yield '%s\0%d\n' % (name, size)
+ repo.ui.debug('sending %s (%d bytes)\n' % (name, size))
+ # partially encode name over the wire for backwards compat
+ yield '%s\0%d\n' % (store.encodedir(name), size)
for chunk in util.filechunkiter(repo.sopener(name), limit=size):
yield chunk
--- a/mercurial/subrepo.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/subrepo.py Fri Oct 16 11:19:39 2009 +0200
@@ -167,7 +167,7 @@
self._repo.ui.note(_('removing subrepo %s\n') % self._path)
hg.clean(self._repo, node.nullid, False)
- def get(self, state):
+ def _get(self, state):
source, revision = state
try:
self._repo.lookup(revision)
@@ -178,9 +178,13 @@
other = hg.repository(self._repo.ui, srcurl)
self._repo.pull(other)
+ def get(self, state):
+ self._get(state)
+ source, revision = state
hg.clean(self._repo, revision, False)
def merge(self, state):
+ self._get(state)
hg.merge(self._repo, state[1], remind=False)
def push(self, force):
--- a/mercurial/url.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/url.py Fri Oct 16 11:19:39 2009 +0200
@@ -197,7 +197,7 @@
proxyuser, proxypasswd or ''),
proxypath, proxyquery, proxyfrag))
proxies = {'http': proxyurl, 'https': proxyurl}
- ui.debug(_('proxying through http://%s:%s\n') %
+ ui.debug('proxying through http://%s:%s\n' %
(proxyhost, proxyport))
else:
proxies = {}
@@ -504,7 +504,7 @@
if authinfo is not None:
passmgr.add_password(*authinfo)
user, passwd = authinfo[2:4]
- ui.debug(_('http auth: user %s, password %s\n') %
+ ui.debug('http auth: user %s, password %s\n' %
(user, passwd and '*' * len(passwd) or 'not set'))
handlers.extend((urllib2.HTTPBasicAuthHandler(passmgr),
--- a/mercurial/util.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/util.py Fri Oct 16 11:19:39 2009 +0200
@@ -14,9 +14,9 @@
"""
from i18n import _
-import error, osutil
+import error, osutil, encoding
import cStringIO, errno, re, shutil, sys, tempfile, traceback
-import os, stat, time, calendar, random, textwrap
+import os, stat, time, calendar, textwrap
import imp
# Python compatibility
@@ -357,41 +357,26 @@
if val is True:
return '1'
return str(val)
- oldenv = {}
- for k in environ:
- oldenv[k] = os.environ.get(k)
- if cwd is not None:
- oldcwd = os.getcwd()
origcmd = cmd
if os.name == 'nt':
cmd = '"%s"' % cmd
- try:
- for k, v in environ.iteritems():
- os.environ[k] = py2shell(v)
- os.environ['HG'] = hgexecutable()
- if cwd is not None and oldcwd != cwd:
- os.chdir(cwd)
- rc = os.system(cmd)
- if sys.platform == 'OpenVMS' and rc & 1:
- rc = 0
- if rc and onerr:
- errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
- explain_exit(rc)[0])
- if errprefix:
- errmsg = '%s: %s' % (errprefix, errmsg)
- try:
- onerr.warn(errmsg + '\n')
- except AttributeError:
- raise onerr(errmsg)
- return rc
- finally:
- for k, v in oldenv.iteritems():
- if v is None:
- del os.environ[k]
- else:
- os.environ[k] = v
- if cwd is not None and oldcwd != cwd:
- os.chdir(oldcwd)
+ env = dict(os.environ)
+ env.update((k, py2shell(v)) for k, v in environ.iteritems())
+ env['HG'] = hgexecutable()
+ rc = subprocess.call(cmd, shell=True, close_fds=closefds,
+ env=env, cwd=cwd)
+ if sys.platform == 'OpenVMS' and rc & 1:
+ rc = 0
+ if rc and onerr:
+ errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
+ explain_exit(rc)[0])
+ if errprefix:
+ errmsg = '%s: %s' % (errprefix, errmsg)
+ try:
+ onerr.warn(errmsg + '\n')
+ except AttributeError:
+ raise onerr(errmsg)
+ return rc
def checksignature(func):
'''wrap a function with code to check for calling errors'''
@@ -414,37 +399,6 @@
return False
return True
-def rename(src, dst):
- """forcibly rename a file"""
- try:
- os.rename(src, dst)
- except OSError, err: # FIXME: check err (EEXIST ?)
-
- # On windows, rename to existing file is not allowed, so we
- # must delete destination first. But if a file is open, unlink
- # schedules it for delete but does not delete it. Rename
- # happens immediately even for open files, so we rename
- # destination to a temporary name, then delete that. Then
- # rename is safe to do.
- # The temporary name is chosen at random to avoid the situation
- # where a file is left lying around from a previous aborted run.
- # The usual race condition this introduces can't be avoided as
- # we need the name to rename into, and not the file itself. Due
- # to the nature of the operation however, any races will at worst
- # lead to the rename failing and the current operation aborting.
-
- def tempname(prefix):
- for tries in xrange(10):
- temp = '%s-%08x' % (prefix, random.randint(0, 0xffffffff))
- if not os.path.exists(temp):
- return temp
- raise IOError, (errno.EEXIST, "No usable temporary filename found")
-
- temp = tempname(dst)
- os.rename(dst, temp)
- os.unlink(temp)
- os.rename(src, dst)
-
def unlink(f):
"""unlink and remove the directory if it is empty"""
os.unlink(f)
@@ -1267,6 +1221,11 @@
return array.array('h', arri)[1]
except ValueError:
pass
+ except IOError, e:
+ if e[0] == errno.EINVAL:
+ pass
+ else:
+ raise
except ImportError:
pass
return 80
@@ -1278,7 +1237,14 @@
# adjust for weird terminal size
width = max(78, hangindent + 1)
padding = '\n' + ' ' * hangindent
- return padding.join(textwrap.wrap(line, width=width - hangindent))
+ # To avoid corrupting multi-byte characters in line, we must wrap
+ # a Unicode string instead of a bytestring.
+ try:
+ u = line.decode(encoding.encoding)
+ w = padding.join(textwrap.wrap(u, width=width - hangindent))
+ return w.encode(encoding.encoding)
+ except UnicodeDecodeError:
+ return padding.join(textwrap.wrap(line, width=width - hangindent))
def iterlines(iterator):
for chunk in iterator:
--- a/mercurial/verify.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/verify.py Fri Oct 16 11:19:39 2009 +0200
@@ -173,6 +173,7 @@
elif size > 0:
storefiles.add(f)
+ lrugetctx = util.lrucachefunc(repo.changectx)
files = sorted(set(filenodes) | set(filelinkrevs))
for f in files:
try:
@@ -224,6 +225,16 @@
# check renames
try:
if rp:
+ if lr is not None and ui.verbose:
+ ctx = lrugetctx(lr)
+ found = False
+ for pctx in ctx.parents():
+ if rp[0] in pctx:
+ found = True
+ break
+ if not found:
+ warn(_("warning: copy source of '%s' not"
+ " in parents of %s") % (f, ctx))
fl2 = repo.file(rp[0])
if not len(fl2):
err(lr, _("empty or missing copy source revlog %s:%s")
--- a/mercurial/windows.py Fri Oct 16 11:18:38 2009 +0200
+++ b/mercurial/windows.py Fri Oct 16 11:19:39 2009 +0200
@@ -7,7 +7,7 @@
from i18n import _
import osutil, error
-import errno, msvcrt, os, re, sys
+import errno, msvcrt, os, re, sys, random
nulldev = 'NUL:'
umask = 002
@@ -267,7 +267,7 @@
head, tail = os.path.split(head)
while head and tail:
try:
- if osutil.listdir(name):
+ if osutil.listdir(head):
return
os.rmdir(head)
except:
@@ -283,6 +283,44 @@
except OSError:
pass
+def rename(src, dst):
+ '''atomically rename file src to dst, replacing dst if it exists'''
+ try:
+ os.rename(src, dst)
+ except OSError, err: # FIXME: check err (EEXIST ?)
+
+ # On windows, rename to existing file is not allowed, so we
+ # must delete destination first. But if a file is open, unlink
+ # schedules it for delete but does not delete it. Rename
+ # happens immediately even for open files, so we rename
+ # destination to a temporary name, then delete that. Then
+ # rename is safe to do.
+ # The temporary name is chosen at random to avoid the situation
+ # where a file is left lying around from a previous aborted run.
+ # The usual race condition this introduces can't be avoided as
+ # we need the name to rename into, and not the file itself. Due
+ # to the nature of the operation however, any races will at worst
+ # lead to the rename failing and the current operation aborting.
+
+ def tempname(prefix):
+ for tries in xrange(10):
+ temp = '%s-%08x' % (prefix, random.randint(0, 0xffffffff))
+ if not os.path.exists(temp):
+ return temp
+ raise IOError, (errno.EEXIST, "No usable temporary filename found")
+
+ temp = tempname(dst)
+ os.rename(dst, temp)
+ try:
+ os.unlink(temp)
+ except:
+ # Some rude AV-scanners on Windows may cause the unlink to
+ # fail. Not aborting here just leaks the temp file, whereas
+ # aborting at this point may leave serious inconsistencies.
+ # Ideally, we would notify the user here.
+ pass
+ os.rename(src, dst)
+
try:
# override functions with win32 versions if possible
from win32 import *
--- a/setup.py Fri Oct 16 11:18:38 2009 +0200
+++ b/setup.py Fri Oct 16 11:19:39 2009 +0200
@@ -246,7 +246,7 @@
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
datafiles = []
-for root in ('templates', 'i18n'):
+for root in ('templates', 'i18n', 'help'):
for dir, dirs, files in os.walk(root):
dirs[:] = [x for x in dirs if not x.startswith('.')]
files = [x for x in files if not x.startswith('.')]
--- a/templates/atom/changelogentry.tmpl Fri Oct 16 11:18:38 2009 +0200
+++ b/templates/atom/changelogentry.tmpl Fri Oct 16 11:19:39 2009 +0200
@@ -1,7 +1,7 @@
<entry>
<title>{desc|strip|firstline|strip|escape|nonempty}</title>
<id>{urlbase}{url}#changeset-{node}</id>
- <link href="{urlbase}{url}rev/{node}"/>
+ <link href="{urlbase}{url}rev/{node|short}"/>
<author>
<name>{author|person|escape}</name>
<email>{author|email|obfuscate}</email>
--- a/templates/atom/tagentry.tmpl Fri Oct 16 11:18:38 2009 +0200
+++ b/templates/atom/tagentry.tmpl Fri Oct 16 11:19:39 2009 +0200
@@ -1,6 +1,6 @@
<entry>
<title>{tag|escape}</title>
- <link rel="alternate" href="{urlbase}{url}rev/{node}"/>
+ <link rel="alternate" href="{urlbase}{url}rev/{node|short}"/>
<id>{urlbase}{url}#tag-{node}</id>
<updated>{date|rfc3339date}</updated>
<published>{date|rfc3339date}</published>
--- a/tests/hghave Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/hghave Fri Oct 16 11:19:39 2009 +0200
@@ -47,9 +47,6 @@
re = r'Concurrent Versions System.*?server'
return matchoutput('cvs --version 2>&1', re)
-def has_cvsps():
- return matchoutput('cvsps -h -q 2>&1', r'cvsps version', True)
-
def has_darcs():
return matchoutput('darcs --version', r'2\.[2-9]', True)
@@ -128,8 +125,10 @@
matchoutput('rst2html.py --version', r'^rst2html.py \(Docutils')
def has_svn():
- return matchoutput('svn --version 2>&1', r'^svn, version') and \
- matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
+ #return matchoutput('svn --version 2>&1', r'^svn, version') and \
+ #matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
+ # disabled until licensing issue is resolved
+ return False
def has_svn_bindings():
try:
@@ -184,7 +183,6 @@
"bzr": (has_bzr, "Canonical's Bazaar client"),
"bzr114": (has_bzr114, "Canonical's Bazaar client >= 1.14"),
"cvs": (has_cvs, "cvs client/server"),
- "cvsps": (has_cvsps, "cvsps utility"),
"darcs": (has_darcs, "darcs client"),
"eol-in-paths": (has_eol_in_paths, "end-of-lines in paths"),
"execbit": (has_executablebit, "executable bit"),
--- a/tests/run-tests.py Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/run-tests.py Fri Oct 16 11:19:39 2009 +0200
@@ -90,6 +90,8 @@
parser.add_option("-j", "--jobs", type="int",
help="number of jobs to run in parallel"
" (default: $%s or %d)" % defaults['jobs'])
+ parser.add_option("-k", "--keywords",
+ help="run tests matching keywords")
parser.add_option("--keep-tmpdir", action="store_true",
help="keep temporary directory after running tests"
" (best used with --tmpdir)")
@@ -102,6 +104,8 @@
help="retest failed tests")
parser.add_option("-s", "--cover_stdlib", action="store_true",
help="print a test coverage report inc. standard libraries")
+ parser.add_option("-S", "--noskips", action="store_true",
+ help="don't report skip tests verbosely")
parser.add_option("-t", "--timeout", type="int",
help="kill errant tests after TIMEOUT seconds"
" (default: $%s or %d)" % defaults['timeout'])
@@ -640,8 +644,9 @@
vlog('pid %d exited, status %d' % (pid, status))
failures |= status
print
- for s in skips:
- print "Skipped %s: %s" % (s[0], s[1])
+ if not options.noskips:
+ for s in skips:
+ print "Skipped %s: %s" % (s[0], s[1])
for s in fails:
print "Failed %s: %s" % (s[0], s[1])
@@ -685,10 +690,21 @@
skips = []
fails = []
+
for test in tests:
if options.retest and not os.path.exists(test + ".err"):
skipped += 1
continue
+
+ if options.keywords:
+ t = open(test).read().lower() + test.lower()
+ for k in options.keywords.lower().split():
+ if k in t:
+ break
+ else:
+ skipped +=1
+ continue
+
ret = runone(options, test, skips, fails)
if ret is None:
skipped += 1
--- a/tests/test-add.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-add.out Fri Oct 16 11:19:39 2009 +0200
@@ -20,7 +20,7 @@
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
M a
? a.orig
% should fail
--- a/tests/test-bheads.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-bheads.out Fri Oct 16 11:19:39 2009 +0200
@@ -68,8 +68,8 @@
3: Adding b branch head 1
0
-------
+6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
-6: Merging b branch head 2 and b branch head 3
0
-------
no changes on branch b containing . are reachable from 7
--- a/tests/test-bisect.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-bisect.out Fri Oct 16 11:19:39 2009 +0200
@@ -304,7 +304,8 @@
summary: msg 6
% test invalid command
-abort: cannot find executable: foobar
+/bin/sh: foobar: command not found
+abort: failed to execute foobar
% test bisecting command
Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-bisect2.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-bisect2.out Fri Oct 16 11:19:39 2009 +0200
@@ -201,12 +201,12 @@
summary: merge 10,13
% complex bisect test 4
-Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests)
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-Testing changeset 13:b0a32c86eb31 (6 changesets remaining, ~2 tests)
+Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests)
+2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+Testing changeset 10:429fcd26f52d (5 changesets remaining, ~2 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests)
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Due to skipped revisions, the first good revision could be any of:
--- a/tests/test-command-template Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-command-template Fri Oct 16 11:19:39 2009 +0200
@@ -127,4 +127,49 @@
echo 'x = "f' >> t
hg log
+cd ..
+
+echo '# latesttag'
+hg init latesttag
+cd latesttag
+
+echo a > file
+hg ci -Am a -d '0 0'
+
+echo b >> file
+hg ci -m b -d '1 0'
+
+echo c >> head1
+hg ci -Am h1c -d '2 0'
+
+hg update -q 1
+echo d >> head2
+hg ci -Am h2d -d '3 0'
+
+echo e >> head2
+hg ci -m h2e -d '4 0'
+
+hg merge -q
+hg ci -m merge -d '5 0'
+
+echo '# No tag set'
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
+echo '# one common tag: longuest path wins'
+hg tag -r 1 -m t1 -d '6 0' t1
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
+echo '# one ancestor tag: more recent wins'
+hg tag -r 2 -m t2 -d '7 0' t2
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
+echo '# two branch tags: more recent wins'
+hg tag -r 3 -m t3 -d '8 0' t3
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
+echo '# merged tag overrides'
+hg tag -r 5 -m t5 -d '9 0' t5
+hg tag -r 3 -m at3 -d '10 0' at3
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
echo '# done'
--- a/tests/test-command-template.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-command-template.out Fri Oct 16 11:19:39 2009 +0200
@@ -672,4 +672,55 @@
1e4e1b8f71e05681d422154f5421e385fec3454f
# error on syntax
abort: t:3: unmatched quotes
+# latesttag
+adding file
+adding head1
+adding head2
+created new head
+# No tag set
+5: null+5
+4: null+4
+3: null+3
+2: null+3
+1: null+2
+0: null+1
+# one common tag: longuest path wins
+6: t1+4
+5: t1+3
+4: t1+2
+3: t1+1
+2: t1+1
+1: t1+0
+0: null+1
+# one ancestor tag: more recent wins
+7: t2+3
+6: t2+2
+5: t2+1
+4: t1+2
+3: t1+1
+2: t2+0
+1: t1+0
+0: null+1
+# two branch tags: more recent wins
+8: t3+5
+7: t3+4
+6: t3+3
+5: t3+2
+4: t3+1
+3: t3+0
+2: t2+0
+1: t1+0
+0: null+1
+# merged tag overrides
+10: t5+5
+9: t5+4
+8: t5+3
+7: t5+2
+6: t5+1
+5: t5+0
+4: at3:t3+1
+3: at3:t3+0
+2: t2+0
+1: t1+0
+0: null+1
# done
--- a/tests/test-commit-unresolved.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-commit-unresolved.out Fri Oct 16 11:19:39 2009 +0200
@@ -6,7 +6,7 @@
warning: conflicts during merge.
merging A failed!
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)
--- a/tests/test-conflict.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-conflict.out Fri Oct 16 11:19:39 2009 +0200
@@ -4,7 +4,7 @@
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
--- a/tests/test-convert-cvs Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvs Fri Oct 16 11:19:39 2009 +0200
@@ -1,10 +1,10 @@
#!/bin/sh
-"$TESTDIR/hghave" cvs cvsps || exit 80
+"$TESTDIR/hghave" cvs || exit 80
cvscall()
{
- cvs -f $@
+ cvs -f "$@"
}
hgcat()
@@ -12,12 +12,9 @@
hg --cwd src-hg cat -r tip "$1"
}
-# Test legacy configuration with external cvsps
echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH
echo "graphlog = " >> $HGRCPATH
-echo "[convert]" >> $HGRCPATH
-echo "cvsps=cvsps -A -u --cvs-direct -q" >> $HGRCPATH
echo % create cvs repository
mkdir cvsrepo
@@ -95,11 +92,29 @@
echo % convert again
hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-hgcat a
hgcat b/c
echo % convert again with --filemap
hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
hgcat b/c
hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
+
+echo % commit a new revision with funny log message
+cd src
+sleep 1
+echo e >> a
+cvscall -q commit -m'funny
+----------------------------
+log message' . | grep '<--' |\
+ sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
+cd ..
+
+echo % convert again
+hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
+
+echo "graphlog = " >> $HGRCPATH
hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'
+
+echo % testing debugcvsps
+cd src
+hg debugcvsps | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
--- a/tests/test-convert-cvs-branch Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvs-branch Fri Oct 16 11:19:39 2009 +0200
@@ -14,7 +14,6 @@
echo "convert = " >> $HGRCPATH
echo "graphlog = " >> $HGRCPATH
echo "[convert]" >> $HGRCPATH
-echo "cvsps=builtin" >> $HGRCPATH
echo "cvsps.cache=0" >> $HGRCPATH
echo % create cvs repository
--- a/tests/test-convert-cvs-branch.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvs-branch.out Fri Oct 16 11:19:39 2009 +0200
@@ -25,7 +25,6 @@
initializing destination src-hg repository
connecting to cvsrepo
scanning source...
-using builtin cvsps
collecting CVS rlog
7 log entries
creating changesets
--- a/tests/test-convert-cvs-builtincvsps Fri Oct 16 11:18:38 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-#!/bin/sh
-
-"$TESTDIR/hghave" cvs || exit 80
-
-cvscall()
-{
- cvs -f "$@"
-}
-
-hgcat()
-{
- hg --cwd src-hg cat -r tip "$1"
-}
-
-echo "[extensions]" >> $HGRCPATH
-echo "convert = " >> $HGRCPATH
-echo "graphlog = " >> $HGRCPATH
-echo "[convert]" >> $HGRCPATH
-echo "cvsps=builtin" >> $HGRCPATH
-
-echo % create cvs repository
-mkdir cvsrepo
-cd cvsrepo
-CVSROOT=`pwd`
-export CVSROOT
-CVS_OPTIONS=-f
-export CVS_OPTIONS
-cd ..
-
-cvscall -q -d "$CVSROOT" init
-
-echo % create source directory
-mkdir src-temp
-cd src-temp
-echo a > a
-mkdir b
-cd b
-echo c > c
-cd ..
-
-echo % import source directory
-cvscall -q import -m import src INITIAL start
-cd ..
-
-echo % checkout source directory
-cvscall -q checkout src
-
-echo % commit a new revision changing b/c
-cd src
-sleep 1
-echo c >> b/c
-cvscall -q commit -mci0 . | grep '<--' |\
- sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
-cd ..
-
-echo % convert fresh repo
-hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-hgcat a
-hgcat b/c
-
-echo % convert fresh repo with --filemap
-echo include b/c > filemap
-hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-hgcat b/c
-hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
-
-echo % commit new file revisions
-cd src
-echo a >> a
-echo c >> b/c
-cvscall -q commit -mci1 . | grep '<--' |\
- sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
-cd ..
-
-echo % convert again
-hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-hgcat a
-hgcat b/c
-
-echo % convert again with --filemap
-hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-hgcat b/c
-hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
-
-echo % commit branch
-cd src
-cvs -q update -r1.1 b/c
-cvs -q tag -b branch
-cvs -q update -r branch > /dev/null
-echo d >> b/c
-cvs -q commit -mci2 . | grep '<--' |\
- sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
-cd ..
-
-echo % convert again
-hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-hgcat b/c
-
-echo % convert again with --filemap
-hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-hgcat b/c
-hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
-
-echo % commit a new revision with funny log message
-cd src
-sleep 1
-echo e >> a
-cvscall -q commit -m'funny
-----------------------------
-log message' . | grep '<--' |\
- sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
-cd ..
-
-echo % convert again
-hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-
-echo "graphlog = " >> $HGRCPATH
-hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'
-
-echo % testing debugcvsps
-cd src
-hg debugcvsps | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
--- a/tests/test-convert-cvs-builtincvsps.out Fri Oct 16 11:18:38 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,261 +0,0 @@
-% create cvs repository
-% create source directory
-% import source directory
-N src/a
-N src/b/c
-
-No conflicts created by this import
-
-% checkout source directory
-U src/a
-U src/b/c
-% commit a new revision changing b/c
-checking in src/b/c,v
-% convert fresh repo
-initializing destination src-hg repository
-connecting to cvsrepo
-scanning source...
-using builtin cvsps
-collecting CVS rlog
-5 log entries
-creating changesets
-3 changeset entries
-sorting...
-converting...
-2 Initial revision
-1 import
-0 ci0
-updating tags
-a
-c
-c
-% convert fresh repo with --filemap
-initializing destination src-filemap repository
-connecting to cvsrepo
-scanning source...
-using builtin cvsps
-collecting CVS rlog
-5 log entries
-creating changesets
-3 changeset entries
-sorting...
-converting...
-2 Initial revision
-1 import
-filtering out empty revision
-rolling back last transaction
-0 ci0
-updating tags
-c
-c
-2 update tags files: .hgtags
-1 ci0 files: b/c
-0 Initial revision files: b/c
-% commit new file revisions
-checking in src/a,v
-checking in src/b/c,v
-% convert again
-connecting to cvsrepo
-scanning source...
-using builtin cvsps
-collecting CVS rlog
-7 log entries
-creating changesets
-4 changeset entries
-sorting...
-converting...
-0 ci1
-a
-a
-c
-c
-c
-% convert again with --filemap
-connecting to cvsrepo
-scanning source...
-using builtin cvsps
-collecting CVS rlog
-7 log entries
-creating changesets
-4 changeset entries
-sorting...
-converting...
-0 ci1
-c
-c
-c
-3 ci1 files: b/c
-2 update tags files: .hgtags
-1 ci0 files: b/c
-0 Initial revision files: b/c
-% commit branch
-U b/c
-T a
-T b/c
-checking in src/b/c,v
-% convert again
-connecting to cvsrepo
-scanning source...
-using builtin cvsps
-collecting CVS rlog
-8 log entries
-creating changesets
-5 changeset entries
-sorting...
-converting...
-0 ci2
-c
-d
-% convert again with --filemap
-connecting to cvsrepo
-scanning source...
-using builtin cvsps
-collecting CVS rlog
-8 log entries
-creating changesets
-5 changeset entries
-sorting...
-converting...
-0 ci2
-c
-d
-4 ci2 files: b/c
-3 ci1 files: b/c
-2 update tags files: .hgtags
-1 ci0 files: b/c
-0 Initial revision files: b/c
-% commit a new revision with funny log message
-checking in src/a,v
-% convert again
-connecting to cvsrepo
-scanning source...
-using builtin cvsps
-collecting CVS rlog
-9 log entries
-creating changesets
-6 changeset entries
-sorting...
-converting...
-0 funny
-o 6 (branch) funny
-| ----------------------------
-| log message files: a
-o 5 (branch) ci2 files: b/c
-
-o 4 () ci1 files: a b/c
-|
-o 3 () update tags files: .hgtags
-|
-o 2 () ci0 files: b/c
-|
-| o 1 (INITIAL) import files:
-|/
-o 0 () Initial revision files: a b/c
-
-% testing debugcvsps
-collecting CVS rlog
-9 log entries
-creating changesets
-8 changeset entries
----------------------
-PatchSet 1
-Date:
-Author:
-Branch: HEAD
-Tag: (none)
-Branchpoints: INITIAL
-Log:
-Initial revision
-
-Members:
- a:INITIAL->1.1
-
----------------------
-PatchSet 2
-Date:
-Author:
-Branch: HEAD
-Tag: (none)
-Branchpoints: INITIAL, branch
-Log:
-Initial revision
-
-Members:
- b/c:INITIAL->1.1
-
----------------------
-PatchSet 3
-Date:
-Author:
-Branch: INITIAL
-Tag: start
-Log:
-import
-
-Members:
- a:1.1->1.1.1.1
- b/c:1.1->1.1.1.1
-
----------------------
-PatchSet 4
-Date:
-Author:
-Branch: HEAD
-Tag: (none)
-Log:
-ci0
-
-Members:
- b/c:1.1->1.2
-
----------------------
-PatchSet 5
-Date:
-Author:
-Branch: HEAD
-Tag: (none)
-Branchpoints: branch
-Log:
-ci1
-
-Members:
- a:1.1->1.2
-
----------------------
-PatchSet 6
-Date:
-Author:
-Branch: HEAD
-Tag: (none)
-Log:
-ci1
-
-Members:
- b/c:1.2->1.3
-
----------------------
-PatchSet 7
-Date:
-Author:
-Branch: branch
-Tag: (none)
-Log:
-ci2
-
-Members:
- b/c:1.1->1.1.2.1
-
----------------------
-PatchSet 8
-Date:
-Author:
-Branch: branch
-Tag: (none)
-Log:
-funny
-----------------------------
-log message
-
-Members:
- a:1.2->1.2.2.1
-
--- a/tests/test-convert-cvs-detectmerge Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvs-detectmerge Fri Oct 16 11:19:39 2009 +0200
@@ -34,7 +34,6 @@
echo "convert = " >> $HGRCPATH
echo "graphlog = " >> $HGRCPATH
echo "[convert]" >> $HGRCPATH
-echo "cvsps=builtin" >> $HGRCPATH
echo "cvsps.cache=0" >> $HGRCPATH
echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH
--- a/tests/test-convert-cvs-detectmerge.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvs-detectmerge.out Fri Oct 16 11:19:39 2009 +0200
@@ -77,7 +77,6 @@
initializing destination proj.hg repository
connecting to *REPO*
scanning source...
-using builtin cvsps
collecting CVS rlog
12 log entries
creating changesets
--- a/tests/test-convert-cvs-synthetic Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvs-synthetic Fri Oct 16 11:19:39 2009 +0200
@@ -8,8 +8,6 @@
echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH
echo "graphlog = " >> $HGRCPATH
-echo "[convert]" >> $HGRCPATH
-echo "cvsps=builtin" >> $HGRCPATH
echo % create cvs repository with one project
mkdir cvsrepo
--- a/tests/test-convert-cvs-synthetic.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvs-synthetic.out Fri Oct 16 11:19:39 2009 +0200
@@ -66,7 +66,6 @@
initializing destination proj.hg repository
connecting to *REPO*
scanning source...
-using builtin cvsps
collecting CVS rlog
15 log entries
creating changesets
@@ -102,7 +101,6 @@
initializing destination proj.hg2 repository
connecting to *REPO*
scanning source...
-using builtin cvsps
collecting CVS rlog
15 log entries
creating changesets
--- a/tests/test-convert-cvs.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvs.out Fri Oct 16 11:19:39 2009 +0200
@@ -12,10 +12,13 @@
% commit a new revision changing b/c
checking in src/b/c,v
% convert fresh repo
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
initializing destination src-hg repository
connecting to cvsrepo
scanning source...
+collecting CVS rlog
+5 log entries
+creating changesets
+3 changeset entries
sorting...
converting...
2 Initial revision
@@ -26,10 +29,13 @@
c
c
% convert fresh repo with --filemap
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
initializing destination src-filemap repository
connecting to cvsrepo
scanning source...
+collecting CVS rlog
+5 log entries
+creating changesets
+3 changeset entries
sorting...
converting...
2 Initial revision
@@ -47,9 +53,12 @@
checking in src/a,v
checking in src/b/c,v
% convert again
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
connecting to cvsrepo
scanning source...
+collecting CVS rlog
+7 log entries
+creating changesets
+4 changeset entries
sorting...
converting...
0 ci1
@@ -59,9 +68,12 @@
c
c
% convert again with --filemap
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
connecting to cvsrepo
scanning source...
+collecting CVS rlog
+7 log entries
+creating changesets
+4 changeset entries
sorting...
converting...
0 ci1
@@ -78,19 +90,24 @@
T b/c
checking in src/b/c,v
% convert again
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
connecting to cvsrepo
scanning source...
+collecting CVS rlog
+8 log entries
+creating changesets
+5 changeset entries
sorting...
converting...
0 ci2
-a
c
d
% convert again with --filemap
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
connecting to cvsrepo
scanning source...
+collecting CVS rlog
+8 log entries
+creating changesets
+5 changeset entries
sorting...
converting...
0 ci2
@@ -101,15 +118,137 @@
2 update tags files: .hgtags
1 ci0 files: b/c
0 Initial revision files: b/c
+% commit a new revision with funny log message
+checking in src/a,v
+% convert again
+connecting to cvsrepo
+scanning source...
+collecting CVS rlog
+9 log entries
+creating changesets
+6 changeset entries
+sorting...
+converting...
+0 funny
+o 6 (branch) funny
+| ----------------------------
+| log message files: a
o 5 (branch) ci2 files: b/c
+
+o 4 () ci1 files: a b/c
|
-| o 4 () ci1 files: a b/c
-| |
-| o 3 () update tags files: .hgtags
-| |
-| o 2 () ci0 files: b/c
-|/
+o 3 () update tags files: .hgtags
+|
+o 2 () ci0 files: b/c
+|
| o 1 (INITIAL) import files:
|/
o 0 () Initial revision files: a b/c
+% testing debugcvsps
+collecting CVS rlog
+9 log entries
+creating changesets
+8 changeset entries
+---------------------
+PatchSet 1
+Date:
+Author:
+Branch: HEAD
+Tag: (none)
+Branchpoints: INITIAL
+Log:
+Initial revision
+
+Members:
+ a:INITIAL->1.1
+
+---------------------
+PatchSet 2
+Date:
+Author:
+Branch: HEAD
+Tag: (none)
+Branchpoints: INITIAL, branch
+Log:
+Initial revision
+
+Members:
+ b/c:INITIAL->1.1
+
+---------------------
+PatchSet 3
+Date:
+Author:
+Branch: INITIAL
+Tag: start
+Log:
+import
+
+Members:
+ a:1.1->1.1.1.1
+ b/c:1.1->1.1.1.1
+
+---------------------
+PatchSet 4
+Date:
+Author:
+Branch: HEAD
+Tag: (none)
+Log:
+ci0
+
+Members:
+ b/c:1.1->1.2
+
+---------------------
+PatchSet 5
+Date:
+Author:
+Branch: HEAD
+Tag: (none)
+Branchpoints: branch
+Log:
+ci1
+
+Members:
+ a:1.1->1.2
+
+---------------------
+PatchSet 6
+Date:
+Author:
+Branch: HEAD
+Tag: (none)
+Log:
+ci1
+
+Members:
+ b/c:1.2->1.3
+
+---------------------
+PatchSet 7
+Date:
+Author:
+Branch: branch
+Tag: (none)
+Log:
+ci2
+
+Members:
+ b/c:1.1->1.1.2.1
+
+---------------------
+PatchSet 8
+Date:
+Author:
+Branch: branch
+Tag: (none)
+Log:
+funny
+----------------------------
+log message
+
+Members:
+ a:1.2->1.2.2.1
+
--- a/tests/test-convert-cvsnt-mergepoints Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvsnt-mergepoints Fri Oct 16 11:19:39 2009 +0200
@@ -29,8 +29,6 @@
echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH
echo "graphlog = " >> $HGRCPATH
-echo "[convert]" >> $HGRCPATH
-echo "cvsps=builtin" >> $HGRCPATH
echo "% create cvs repository"
mkdir cvsmaster
--- a/tests/test-convert-darcs Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-darcs Fri Oct 16 11:19:39 2009 +0200
@@ -43,7 +43,19 @@
darcs pull -a ../darcs-clone
sleep 1
echo e > a
+echo f > f
+mkdir dir
+echo d > dir/d
+echo d > dir/d2
darcs record -a -l -m p2
+
+echo % test file and directory move
+darcs mv f ff
+# Test remove + move
+darcs remove dir/d2
+rm dir/d2
+darcs mv dir dir2
+darcs record -a -l -m p3
cd ..
glog()
--- a/tests/test-convert-darcs.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-darcs.out Fri Oct 16 11:19:39 2009 +0200
@@ -10,15 +10,20 @@
./a
Finished pulling and applying.
Finished recording patch 'p2'
+% test file and directory move
+Finished recording patch 'p3'
initializing destination darcs-repo-hg repository
scanning source...
sorting...
converting...
-3 p0
-2 p1.2
-1 p1.1
-0 p2
-o 3 "p2" files: a
+4 p0
+3 p1.2
+2 p1.1
+1 p2
+0 p3
+o 4 "p3" files: dir/d dir/d2 dir2/d f ff
+|
+o 3 "p2" files: a dir/d dir/d2 f
|
o 2 "p1.1" files:
|
@@ -28,3 +33,5 @@
7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a
1e88685f5ddec574a34c70af492f95b6debc8741 644 b
+d278f41640da5fc303a4cf9894af31c2983fc11d 644 dir2/d
+ef5c76581d78340f568d5f48d679bf307452cbc9 644 ff
--- a/tests/test-convert-hg-source Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-hg-source Fri Oct 16 11:19:39 2009 +0200
@@ -38,6 +38,25 @@
hg out ../orig
cd ..
+echo '% check shamap LF and CRLF handling'
+cat > rewrite.py <<EOF
+import sys
+# Interlace LF and CRLF
+lines = [(l.rstrip() + ((i % 2) and '\n' or '\r\n'))
+ for i, l in enumerate(file(sys.argv[1]))]
+file(sys.argv[1], 'wb').write(''.join(lines))
+EOF
+python rewrite.py new/.hg/shamap
+cd orig
+hg up -qC 1
+echo foo >> foo
+hg ci -qm 'change foo again'
+hg up -qC 2
+echo foo >> foo
+hg ci -qm 'change foo again again'
+cd ..
+hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
+
echo % init broken repository
hg init broken
cd broken
--- a/tests/test-convert-hg-source.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-hg-source.out Fri Oct 16 11:19:39 2009 +0200
@@ -20,6 +20,12 @@
comparing with ../orig
searching for changes
no changes found
+% check shamap LF and CRLF handling
+scanning source...
+sorting...
+converting...
+1 change foo again again
+0 change foo again
% init broken repository
created new head
% break it
--- a/tests/test-convert-svn-branches Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-svn-branches Fri Oct 16 11:19:39 2009 +0200
@@ -28,3 +28,7 @@
hg branches | sed 's/:.*/:/'
hg tags -q
cd ..
+
+echo '% test hg failing to call itself'
+HG=foobar hg convert svn-repo B-hg 2>&1 | grep -v foobar
+
--- a/tests/test-convert-svn-branches.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-svn-branches.out Fri Oct 16 11:19:39 2009 +0200
@@ -48,3 +48,6 @@
old 9:
old2 8:
tip
+% test hg failing to call itself
+initializing destination B-hg repository
+abort: Mercurial failed to run itself, check hg executable is in PATH
--- a/tests/test-convert-svn-sink.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-svn-sink.out Fri Oct 16 11:19:39 2009 +0200
@@ -265,7 +265,7 @@
warning: conflicts during merge.
merging b failed!
2 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
assuming destination b-hg
initializing svn repo 'b-hg'
initializing svn wc 'b-hg-wc'
--- a/tests/test-convert.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert.out Fri Oct 16 11:19:39 2009 +0200
@@ -117,23 +117,8 @@
starting directory will be converted, and that any directory
reorganization in the CVS sandbox is ignored.
- Because CVS does not have changesets, it is necessary to collect
- individual commits to CVS and merge them into changesets. CVS source uses
- its internal changeset merging code by default but can be configured to
- call the external 'cvsps' program by setting:
-
- --config convert.cvsps='cvsps -A -u --cvs-direct -q'
-
- This option is deprecated and will be removed in Mercurial 1.4.
-
The options shown are the defaults.
- Internal cvsps is selected by setting
-
- --config convert.cvsps=builtin
-
- and has a few more configurable options:
-
--config convert.cvsps.cache=True (boolean)
Set to False to disable remote log caching, for testing and debugging
purposes.
@@ -153,9 +138,10 @@
recent revision on the branch indicated in the regex as the second
parent of the changeset.
- The hgext/convert/cvsps wrapper script allows the builtin changeset
+ An additional "debugcvsps" Mercurial command allows the builtin changeset
merging code to be run without doing a conversion. Its parameters and
- output are similar to that of cvsps 2.1.
+ output are similar to that of cvsps 2.1. Please see the command help for
+ more details.
Subversion Source
-----------------
--- a/tests/test-diff-color Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-diff-color Fri Oct 16 11:19:39 2009 +0200
@@ -33,4 +33,18 @@
hg diff --nodates --color=always
echo '% --unified=2'
-hg diff --nodates -U 2 --color=always
\ No newline at end of file
+hg diff --nodates -U 2 --color=always
+
+echo "record=" >> $HGRCPATH
+echo "[ui]" >> $HGRCPATH
+echo "interactive=true" >> $HGRCPATH
+echo "[diff]" >> $HGRCPATH
+echo "git=True" >> $HGRCPATH
+
+echo % record
+chmod 0755 a
+hg record --color=always -m moda a <<EOF
+y
+y
+EOF
+echo
--- a/tests/test-diff-color.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-diff-color.out Fri Oct 16 11:19:39 2009 +0200
@@ -23,3 +23,18 @@
[0;32m+dd[0m
a
a
+% record
+[0;1mdiff --git a/a b/a[0m
+[0;36;1mold mode 100644[0m
+[0;36;1mnew mode 100755[0m
+1 hunks, 2 lines changed
+examine changes to 'a'? [Ynsfdaq?] [0;35m@@ -2,7 +2,7 @@[0m
+ c
+ a
+ a
+[0;31m-b[0m
+[0;32m+dd[0m
+ a
+ a
+ c
+record this change to 'a'? [Ynsfdaq?]
--- a/tests/test-encoding Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-encoding Fri Oct 16 11:19:39 2009 +0200
@@ -29,30 +29,31 @@
HGENCODING=latin-1 hg ci -d "1000000 0" -m 'latin1 branch'
rm .hg/branch
-echo % ascii
+echo "% hg log (ascii)"
hg --encoding ascii log
-echo % latin-1
+echo "% hg log (latin-1)"
hg --encoding latin-1 log
-echo % utf-8
+echo "% hg log (utf-8)"
hg --encoding utf-8 log
-echo % ascii
+echo "% hg tags (ascii)"
HGENCODING=ascii hg tags
-echo % latin-1
+echo "% hg tags (latin-1)"
HGENCODING=latin-1 hg tags
-echo % utf-8
+echo "% hg tags (utf-8)"
HGENCODING=utf-8 hg tags
-echo % ascii
+echo "% hg branches (ascii)"
HGENCODING=ascii hg branches
-echo % latin-1
+echo "% hg branches (latin-1)"
HGENCODING=latin-1 hg branches
-echo % utf-8
+echo "% hg branches (utf-8)"
HGENCODING=utf-8 hg branches
echo '[ui]' >> .hg/hgrc
echo 'fallbackencoding = koi8-r' >> .hg/hgrc
-echo % utf-8
+echo "% hg log (utf-8)"
HGENCODING=utf-8 hg log
+echo "% hg log (dolphin)"
HGENCODING=dolphin hg log
HGENCODING=ascii hg branch `cat latin-1-tag`
--- a/tests/test-encoding.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-encoding.out Fri Oct 16 11:19:39 2009 +0200
@@ -14,7 +14,7 @@
abort: decoding near ' encoded: é': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)!
% these should work
marked working directory as branch é
-% ascii
+% hg log (ascii)
changeset: 5:db5520b4645f
branch: ?
tag: tip
@@ -48,7 +48,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: latin-1 e': ? = u'\xe9'
-% latin-1
+% hg log (latin-1)
changeset: 5:db5520b4645f
branch: é
tag: tip
@@ -82,7 +82,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: latin-1 e': é = u'\xe9'
-% utf-8
+% hg log (utf-8)
changeset: 5:db5520b4645f
branch: é
tag: tip
@@ -116,25 +116,25 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: latin-1 e': é = u'\xe9'
-% ascii
+% hg tags (ascii)
tip 5:db5520b4645f
? 3:770b9b11621d
-% latin-1
+% hg tags (latin-1)
tip 5:db5520b4645f
é 3:770b9b11621d
-% utf-8
+% hg tags (utf-8)
tip 5:db5520b4645f
é 3:770b9b11621d
-% ascii
+% hg branches (ascii)
? 5:db5520b4645f
default 4:9cff3c980b58 (inactive)
-% latin-1
+% hg branches (latin-1)
é 5:db5520b4645f
default 4:9cff3c980b58 (inactive)
-% utf-8
+% hg branches (utf-8)
é 5:db5520b4645f
default 4:9cff3c980b58 (inactive)
-% utf-8
+% hg log (utf-8)
changeset: 5:db5520b4645f
branch: é
tag: tip
@@ -168,6 +168,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: latin-1 e': И = u'\xe9'
+% hg log (dolphin)
abort: unknown encoding: dolphin, please check your locale settings
abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)!
abort: branch name not in UTF-8!
--- a/tests/test-extension.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-extension.out Fri Oct 16 11:19:39 2009 +0200
@@ -44,7 +44,7 @@
debugextension only debugcommands
global options:
- -R --repository repository root directory or symbolic path name
+ -R --repository repository root directory or name of overlay bundle file
--cwd change working directory
-y --noninteractive do not prompt, assume 'yes' for any required answers
-q --quiet suppress output
@@ -74,7 +74,7 @@
debugextension only debugcommands
global options:
- -R --repository repository root directory or symbolic path name
+ -R --repository repository root directory or name of overlay bundle file
--cwd change working directory
-y --noninteractive do not prompt, assume 'yes' for any required answers
-q --quiet suppress output
--- a/tests/test-gendoc Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-gendoc Fri Oct 16 11:19:39 2009 +0200
@@ -3,10 +3,19 @@
"$TESTDIR/hghave" rst2html || exit 80
RST2HTML=$(which rst2html 2> /dev/null || which rst2html.py)
-echo "checking for syntax errors in gendoc.py"
-python $TESTDIR/../doc/gendoc.py > gendoc.txt || exit
+HGENCODING=UTF-8
+export HGENCODING
-# We run rst2html over the file without adding "--halt warning" to
-# make it report all errors instead of stopping on the first one.
-echo "checking for parse errors with rst2html"
-$RST2HTML gendoc.txt /dev/null
+for PO in C $TESTDIR/../i18n/*.po; do
+ LOCALE=$(basename $PO .po)
+ echo
+ echo "% extracting documentation from $LOCALE"
+ echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt
+ echo "" >> gendoc-$LOCALE.txt
+ LC_ALL=$LOCALE python $TESTDIR/../doc/gendoc.py >> gendoc-$LOCALE.txt || exit
+
+ # We run rst2html over the file without adding "--halt warning" to
+ # make it report all errors instead of stopping on the first one.
+ echo "checking for parse errors with rst2html"
+ $RST2HTML gendoc-$LOCALE.txt /dev/null
+done
--- a/tests/test-gendoc.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-gendoc.out Fri Oct 16 11:19:39 2009 +0200
@@ -1,2 +1,33 @@
-checking for syntax errors in gendoc.py
+
+% extracting documentation from C
+checking for parse errors with rst2html
+
+% extracting documentation from da
+checking for parse errors with rst2html
+
+% extracting documentation from de
+checking for parse errors with rst2html
+
+% extracting documentation from el
+checking for parse errors with rst2html
+
+% extracting documentation from fr
checking for parse errors with rst2html
+
+% extracting documentation from it
+checking for parse errors with rst2html
+
+% extracting documentation from ja
+checking for parse errors with rst2html
+
+% extracting documentation from pt_BR
+checking for parse errors with rst2html
+
+% extracting documentation from sv
+checking for parse errors with rst2html
+
+% extracting documentation from zh_CN
+checking for parse errors with rst2html
+
+% extracting documentation from zh_TW
+checking for parse errors with rst2html
--- a/tests/test-hgrc Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-hgrc Fri Oct 16 11:19:39 2009 +0200
@@ -16,3 +16,9 @@
cat .hg/hgrc |sed -e "s:$p:...:"
hg paths |sed -e "s:$p:...:"
hg showconfig |sed -e "s:$p:...:"
+
+# issue1829: wrong indentation
+cd ..
+echo '[foo]' >> $HGRCPATH
+echo ' x = y' >> $HGRCPATH
+hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|"
--- a/tests/test-hgrc.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-hgrc.out Fri Oct 16 11:19:39 2009 +0200
@@ -10,3 +10,4 @@
defaults.tag=-d "0 0"
paths.default=.../foo%bar
ui.slash=True
+hg: config error at $HGRCPATH:8: ' x = y'
--- a/tests/test-hgweb-commands.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-hgweb-commands.out Fri Oct 16 11:19:39 2009 +0200
@@ -17,7 +17,7 @@
<entry>
<title>branch</title>
<id>http://127.0.0.1/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id>
- <link href="http://127.0.0.1/rev/1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe"/>
+ <link href="http://127.0.0.1/rev/1d22e65f027e"/>
<author>
<name>test</name>
<email>test</email>
@@ -33,7 +33,7 @@
<entry>
<title>Added tag 1.0 for changeset 2ef0ac749a14</title>
<id>http://127.0.0.1/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id>
- <link href="http://127.0.0.1/rev/a4f92ed23982be056b9852de5dfe873eaac7f0de"/>
+ <link href="http://127.0.0.1/rev/a4f92ed23982"/>
<author>
<name>test</name>
<email>test</email>
@@ -49,7 +49,7 @@
<entry>
<title>base</title>
<id>http://127.0.0.1/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
- <link href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
+ <link href="http://127.0.0.1/rev/2ef0ac749a14"/>
<author>
<name>test</name>
<email>test</email>
@@ -78,7 +78,7 @@
<entry>
<title>branch</title>
<id>http://127.0.0.1/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id>
- <link href="http://127.0.0.1/rev/1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe"/>
+ <link href="http://127.0.0.1/rev/1d22e65f027e"/>
<author>
<name>test</name>
<email>test</email>
@@ -94,7 +94,7 @@
<entry>
<title>Added tag 1.0 for changeset 2ef0ac749a14</title>
<id>http://127.0.0.1/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id>
- <link href="http://127.0.0.1/rev/a4f92ed23982be056b9852de5dfe873eaac7f0de"/>
+ <link href="http://127.0.0.1/rev/a4f92ed23982"/>
<author>
<name>test</name>
<email>test</email>
@@ -110,7 +110,7 @@
<entry>
<title>base</title>
<id>http://127.0.0.1/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
- <link href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
+ <link href="http://127.0.0.1/rev/2ef0ac749a14"/>
<author>
<name>test</name>
<email>test</email>
@@ -137,7 +137,7 @@
<entry>
<title>base</title>
<id>http://127.0.0.1/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
- <link href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
+ <link href="http://127.0.0.1/rev/2ef0ac749a14"/>
<author>
<name>test</name>
<email>test</email>
@@ -476,7 +476,7 @@
<entry>
<title>1.0</title>
- <link rel="alternate" href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
+ <link rel="alternate" href="http://127.0.0.1/rev/2ef0ac749a14"/>
<id>http://127.0.0.1/#tag-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
<updated>1970-01-01T00:00:00+00:00</updated>
<published>1970-01-01T00:00:00+00:00</published>
--- a/tests/test-hgweb-no-path-info.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-hgweb-no-path-info.out Fri Oct 16 11:19:39 2009 +0200
@@ -20,7 +20,7 @@
<entry>
<title>test</title>
<id>http://127.0.0.1/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id>
- <link href="http://127.0.0.1/rev/4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e"/>
+ <link href="http://127.0.0.1/rev/4cbec7e6f8c4"/>
<author>
<name>Testing</name>
<email>Testing</email>
--- a/tests/test-hgweb-no-request-uri.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-hgweb-no-request-uri.out Fri Oct 16 11:19:39 2009 +0200
@@ -20,7 +20,7 @@
<entry>
<title>test</title>
<id>http://127.0.0.1/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id>
- <link href="http://127.0.0.1/rev/4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e"/>
+ <link href="http://127.0.0.1/rev/4cbec7e6f8c4"/>
<author>
<name>Testing</name>
<email>Testing</email>
--- a/tests/test-hgwebdir.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-hgwebdir.out Fri Oct 16 11:19:39 2009 +0200
@@ -237,7 +237,7 @@
<entry>
<title>a</title>
<id>http://127.0.0.1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
- <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/>
+ <link href="http://127.0.0.1/t/a/rev/8580ff50825a"/>
<author>
<name>test</name>
<email>test</email>
@@ -266,7 +266,7 @@
<entry>
<title>a</title>
<id>http://127.0.0.1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
- <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/>
+ <link href="http://127.0.0.1/t/a/rev/8580ff50825a"/>
<author>
<name>test</name>
<email>test</email>
--- a/tests/test-http Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-http Fri Oct 16 11:19:39 2009 +0200
@@ -5,6 +5,11 @@
hg init test
cd test
echo foo>foo
+mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
+echo foo>foo.d/foo
+echo bar>foo.d/bAr.hg.d/BaR
+echo bar>foo.d/baR.d.hg/bAR
+
hg commit -A -m 1
hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid
hg serve -p $HGPORT1 -d --pid-file=../hg2.pid
--- a/tests/test-http.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-http.out Fri Oct 16 11:19:39 2009 +0200
@@ -1,4 +1,7 @@
adding foo
+adding foo.d/bAr.hg.d/BaR
+adding foo.d/baR.d.hg/bAR
+adding foo.d/foo
abort: cannot start server at ':20060':
% clone via stream
streaming all changes
@@ -10,31 +13,31 @@
checking manifests
crosschecking files in changesets and manifests
checking files
-1 files, 1 changesets, 1 total revisions
+4 files, 1 changesets, 4 total revisions
% try to clone via stream, should use pull instead
requesting all changes
adding changesets
adding manifests
adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 4 changes to 4 files
updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
% clone via pull
requesting all changes
adding changesets
adding manifests
adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 4 changes to 4 files
updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
-1 files, 1 changesets, 1 total revisions
+4 files, 1 changesets, 4 total revisions
adding bar
% pull
-changegroup hook: HG_NODE=cfbd11a1fa315300a080c3de8fe36b0fc5820acf HG_SOURCE=pull HG_URL=http://localhost/
+changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost/
pulling from http://localhost/
searching for changes
adding changesets
--- a/tests/test-import Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-import Fri Oct 16 11:19:39 2009 +0200
@@ -345,3 +345,23 @@
cd oddcreate
hg import --no-commit ../create.patch
cat foo
+
+echo % 'first line mistaken for email headers (issue 1859)'
+hg init emailconfusion
+cd emailconfusion
+cat > a.patch <<EOF
+module: summary
+
+description
+
+
+diff -r 000000000000 -r 9b4c1e343b55 test.txt
+--- /dev/null
++++ b/a
+@@ -0,0 +1,1 @@
++a
+EOF
+hg import -d '0 0' a.patch
+hg parents -v
+cd ..
+
--- a/tests/test-import.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-import.out Fri Oct 16 11:19:39 2009 +0200
@@ -295,3 +295,16 @@
% create file when source is not /dev/null
applying ../create.patch
a
+% first line mistaken for email headers (issue 1859)
+applying a.patch
+changeset: 0:5a681217c0ad
+tag: tip
+user: test
+date: Thu Jan 01 00:00:00 1970 +0000
+files: a
+description:
+module: summary
+
+description
+
+
--- a/tests/test-inotify-issue1208.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-inotify-issue1208.out Fri Oct 16 11:19:39 2009 +0200
@@ -1,5 +1,5 @@
% fail
-could not talk to new inotify server: No such file or directory
+abort: could not start server: File exists
abort: could not start server: File exists
% inserve
% status
--- a/tests/test-keyword Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-keyword Fri Oct 16 11:19:39 2009 +0200
@@ -53,6 +53,11 @@
echo % cat
cat a b
+echo % no kwfiles
+hg kwfiles
+echo % untracked candidates
+hg -v kwfiles --unknown
+
echo % addremove
hg addremove
echo % status
@@ -167,6 +172,10 @@
echo % kwfiles
hg kwfiles
+echo % ignored files
+hg -v kwfiles --ignore
+echo % all files
+hg kwfiles --all
echo % diff --rev
hg diff --rev 1 | grep -v 'b/c'
--- a/tests/test-keyword.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-keyword.out Fri Oct 16 11:19:39 2009 +0200
@@ -38,6 +38,9 @@
do not process $Id:
xxx $
ignore $Id$
+% no kwfiles
+% untracked candidates
+k a
% addremove
adding a
adding b
@@ -177,6 +180,14 @@
% kwfiles
a
c
+% ignored files
+I b
+I sym
+% all files
+K a
+K c
+I b
+I sym
% diff --rev
diff -r ef63ca68695b c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -396,7 +407,7 @@
warning: conflicts during merge.
merging m failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% keyword stays outside conflict zone
$Id$
<<<<<<< local
--- a/tests/test-merge-internal-tools-pattern.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-merge-internal-tools-pattern.out Fri Oct 16 11:19:39 2009 +0200
@@ -9,7 +9,7 @@
created new head
# merge using internal:fail tool
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
line 1
line 2
third line
--- a/tests/test-merge-tools.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-merge-tools.out Fri Oct 16 11:19:39 2009 +0200
@@ -17,7 +17,7 @@
warning: conflicts during merge.
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
<<<<<<< local
revision 1
@@ -37,7 +37,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -69,7 +69,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -86,7 +86,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -103,7 +103,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -120,7 +120,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -185,7 +185,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -204,7 +204,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -223,7 +223,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -244,7 +244,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -260,7 +260,7 @@
# hg update -C 1
# hg merge -r 2 --config ui.merge=internal:fail
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -323,7 +323,7 @@
# hg merge -r 2 --config ui.merge=internal:dump
merging f
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -354,7 +354,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -518,7 +518,7 @@
was merge successful (yn)? n
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
--- a/tests/test-merge7.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-merge7.out Fri Oct 16 11:19:39 2009 +0200
@@ -11,7 +11,7 @@
warning: conflicts during merge.
merging test.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
pulling from ../test-a
searching for changes
adding changesets
@@ -31,7 +31,7 @@
warning: conflicts during merge.
merging test.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
one
<<<<<<< local
two-point-five
--- a/tests/test-merge9.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-merge9.out Fri Oct 16 11:19:39 2009 +0200
@@ -7,7 +7,7 @@
merging bar failed!
merging foo and baz to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
U bar
R baz
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -15,7 +15,7 @@
merging bar failed!
merging baz and foo to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% show unresolved
U bar
R baz
--- a/tests/test-mq-qpush-fail Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-mq-qpush-fail Fri Oct 16 11:19:39 2009 +0200
@@ -53,4 +53,10 @@
echo '% now we expect the push to fail, but it should NOT complain about patch1'
hg qpush
+echo '% preparing qpush of missing patch with no patch applied'
+hg qpop -a
+rm .hg/patches/patch1
+echo '% qpush should fail the same way as below'
+hg qpush
+
true # happy ending
--- a/tests/test-mq-qpush-fail.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-mq-qpush-fail.out Fri Oct 16 11:19:39 2009 +0200
@@ -30,3 +30,9 @@
applying patch2
unable to read patch2
now at: patch1
+% preparing qpush of missing patch with no patch applied
+popping patch1
+patch queue now empty
+% qpush should fail the same way as below
+applying patch1
+unable to read patch1
--- a/tests/test-mq-symlinks Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-mq-symlinks Fri Oct 16 11:19:39 2009 +0200
@@ -8,12 +8,14 @@
hg init
hg qinit
hg qnew base.patch
-echo a > a
-echo b > b
-hg add a b
+echo aaa > a
+echo bbb > b
+echo ccc > c
+hg add a b c
hg qrefresh
$TESTDIR/readlink.py a
+echo '% test replacing a file with a symlink'
hg qnew symlink.patch
rm a
ln -s b a
@@ -24,6 +26,29 @@
hg qpush
$TESTDIR/readlink.py a
+echo '% test updating a symlink'
+rm a
+ln -s c a
+hg qnew --git -f updatelink
+$TESTDIR/readlink.py a
+hg qpop
+hg qpush --debug
+$TESTDIR/readlink.py a
+hg st
+
+echo '% test replacing a symlink with a file'
+ln -s c s
+hg add s
+hg qnew --git -f addlink
+rm s
+echo sss > s
+hg qnew --git -f replacelinkwithfile
+hg qpop
+hg qpush
+cat s
+hg st
+
+echo '% test symlink removal'
hg qnew removesl.patch
hg rm a
hg qrefresh --git
--- a/tests/test-mq-symlinks.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-mq-symlinks.out Fri Oct 16 11:19:39 2009 +0200
@@ -1,12 +1,31 @@
a -> a not a symlink
+% test replacing a file with a symlink
a -> b
popping symlink.patch
now at: base.patch
applying symlink.patch
now at: symlink.patch
a -> b
+% test updating a symlink
+a -> c
+popping updatelink
+now at: symlink.patch
+applying updatelink
+patching file a
+a
+now at: updatelink
+a -> c
+% test replacing a symlink with a file
+popping replacelinkwithfile
+now at: addlink
+applying replacelinkwithfile
+now at: replacelinkwithfile
+sss
+% test symlink removal
popping removesl.patch
-now at: symlink.patch
+now at: replacelinkwithfile
applying removesl.patch
now at: removesl.patch
C b
+C c
+C s
--- a/tests/test-notify.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-notify.out Fri Oct 16 11:19:39 2009 +0200
@@ -35,6 +35,7 @@
diffstat = True # add a diffstat before the diff content
sources = serve # notify if source of incoming changes in this list
# (serve == ssh or http, push, pull, bundle)
+ merge = False # send notification for merges (default True)
[email]
from = user@host.com # email address to send as if none given
[web]
--- a/tests/test-push-warn Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-push-warn Fri Oct 16 11:19:39 2009 +0200
@@ -123,4 +123,21 @@
hg -q ci -d "1000000 0" -m 11
hg push -r 10 -r 11 ../f; echo $?
+echo % checking prepush logic does not allow silently pushing multiple new heads
+cd ..
+hg init g
+echo init > g/init
+hg -R g ci -Am init
+echo a > g/a
+hg -R g ci -Am a
+hg clone g h
+hg -R g up 0
+echo b > g/b
+hg -R g ci -Am b
+hg -R h up 0
+echo c > h/c
+hg -R h ci -Am c
+hg -R h push g
+echo
+
exit 0
--- a/tests/test-push-warn.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-push-warn.out Fri Oct 16 11:19:39 2009 +0200
@@ -124,3 +124,20 @@
adding file changes
added 2 changesets with 2 changes to 1 files
0
+% checking prepush logic does not allow silently pushing multiple new heads
+abort: repository g already exists!
+adding init
+adding a
+updating working directory
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+adding b
+created new head
+1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+adding c
+created new head
+pushing to g
+searching for changes
+abort: push creates new remote heads!
+(did you forget to merge? use push -f to force)
+
--- a/tests/test-rebase-parameters.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-rebase-parameters.out Fri Oct 16 11:19:39 2009 +0200
@@ -18,9 +18,9 @@
-s --source rebase from a given revision
-b --base rebase from the base of a given revision
-d --dest rebase onto a given revision
- --collapse collapse the rebased revisions
- --keep keep original revisions
- --keepbranches keep original branches
+ --collapse collapse the rebased changesets
+ --keep keep original changesets
+ --keepbranches keep original branch names
-c --continue continue an interrupted rebase
-a --abort abort an interrupted rebase
--style display using template map file
@@ -46,9 +46,9 @@
-s --source rebase from a given revision
-b --base rebase from the base of a given revision
-d --dest rebase onto a given revision
- --collapse collapse the rebased revisions
- --keep keep original revisions
- --keepbranches keep original branches
+ --collapse collapse the rebased changesets
+ --keep keep original changesets
+ --keepbranches keep original branch names
-c --continue continue an interrupted rebase
-a --abort abort an interrupted rebase
--style display using template map file
@@ -74,9 +74,9 @@
-s --source rebase from a given revision
-b --base rebase from the base of a given revision
-d --dest rebase onto a given revision
- --collapse collapse the rebased revisions
- --keep keep original revisions
- --keepbranches keep original branches
+ --collapse collapse the rebased changesets
+ --keep keep original changesets
+ --keepbranches keep original branch names
-c --continue continue an interrupted rebase
-a --abort abort an interrupted rebase
--style display using template map file
@@ -102,9 +102,9 @@
-s --source rebase from a given revision
-b --base rebase from the base of a given revision
-d --dest rebase onto a given revision
- --collapse collapse the rebased revisions
- --keep keep original revisions
- --keepbranches keep original branches
+ --collapse collapse the rebased changesets
+ --keep keep original changesets
+ --keepbranches keep original branch names
-c --continue continue an interrupted rebase
-a --abort abort an interrupted rebase
--style display using template map file
--- a/tests/test-rebase-scenario-global Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-rebase-scenario-global Fri Oct 16 11:19:39 2009 +0200
@@ -70,7 +70,7 @@
hg rebase -s 3 -d 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
hg glog --template '{rev}: {desc}\n'
-echo '% These will fail'
+echo '% These will fail (using --source)'
createrepo > /dev/null 2>&1
echo '% E onto D - rebase onto an ancestor'
hg rebase -s 4 -d 3
@@ -79,4 +79,13 @@
echo '% E onto B - merge revision with both parents not in ancestors of target'
hg rebase -s 4 -d 1
+echo
+echo '% These will abort gracefully (using --base)'
+echo '% E onto E - rebase onto same changeset'
+hg rebase -b 4 -d 4
+echo '% E onto D - rebase onto an ancestor'
+hg rebase -b 4 -d 3
+echo '% D onto E - rebase onto a descendant'
+hg rebase -b 3 -d 4
+
exit 0
--- a/tests/test-rebase-scenario-global.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-rebase-scenario-global.out Fri Oct 16 11:19:39 2009 +0200
@@ -127,10 +127,18 @@
|/
o 0: A
-% These will fail
+% These will fail (using --source)
% E onto D - rebase onto an ancestor
-abort: cannot rebase a descendant
+abort: source is descendant of destination
% D onto E - rebase onto a descendant
-abort: cannot rebase an ancestor
+abort: source is ancestor of destination
% E onto B - merge revision with both parents not in ancestors of target
abort: cannot use revision 4 as base, result would have 3 parents
+
+% These will abort gracefully (using --base)
+% E onto E - rebase onto same changeset
+nothing to rebase
+% E onto D - rebase onto an ancestor
+nothing to rebase
+% D onto E - rebase onto a descendant
+nothing to rebase
--- a/tests/test-remove Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-remove Fri Oct 16 11:19:39 2009 +0200
@@ -108,3 +108,12 @@
echo % dir, options -Af
rm test/bar
remove -Af test
+
+echo 'test remove dropping empty trees (issue1861)'
+mkdir -p issue1861/b/c
+echo x > issue1861/x
+echo y > issue1861/b/c/y
+hg ci -Am add
+hg rm issue1861/b
+hg ci -m remove
+ls issue1861
--- a/tests/test-remove.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-remove.out Fri Oct 16 11:19:39 2009 +0200
@@ -111,3 +111,8 @@
./foo
./test/foo
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+test remove dropping empty trees (issue1861)
+adding issue1861/b/c/y
+adding issue1861/x
+removing issue1861/b/c/y
+x
--- a/tests/test-resolve.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-resolve.out Fri Oct 16 11:19:39 2009 +0200
@@ -4,5 +4,5 @@
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% resolve -l, should be empty
--- a/tests/test-subrepo.out Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-subrepo.out Fri Oct 16 11:19:39 2009 +0200
@@ -87,7 +87,7 @@
warning: conflicts during merge.
merging t failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should conflict