[PATCH] i18n-de: synchronised with hg.pot
Tobias Bell
tobias.bell at googlemail.com
Tue Apr 14 11:16:27 CDT 2009
# HG changeset patch
# User Tobias Bell <tobias.bell at gmail.com>
# Date 1239725764 -7200
# Node ID 022a9bfc7145b48cbb9c58944df9233f432c42bc
# Parent aece3c9e62f1a685e4cebd3ecf0b22e1c8101ae1
i18n-de: synchronised with hg.pot
diff --git a/i18n/de.po b/i18n/de.po
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -22,8 +22,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-03 21:50+0200\n"
-"PO-Revision-Date: 2009-04-04 10:49+0200\n"
+"POT-Creation-Date: 2009-04-10 10:49+0200\n"
+"PO-Revision-Date: 2009-04-04 16:11+0200\n"
"Last-Translator: Tobias Bell <tobias.bell at gmail.com>\n"
"Language-Team: German (Tobias Bell, Fabian Kreutz, Lutz Horn)\n"
"MIME-Version: 1.0\n"
@@ -127,7 +127,6 @@
msgid "*** [alias] %s: no definition\n"
msgstr "*** [alias] %s: nicht definiert\n"
-# Nicht übersetzen
msgid ""
"mercurial bookmarks\n"
"\n"
@@ -139,16 +138,15 @@
"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 "
-"experience\n"
-"by adding the following configuration option to your .hgrc:\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 on, "
-"and\n"
-"just updates it. This is similar to git's approach of branching.\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"
+"branching.\n"
msgstr ""
# Nicht übersetzen
@@ -199,8 +197,8 @@
"\n"
" Bookmarks are pointers to certain commits that move when\n"
" commiting. Bookmarks are local. They can be renamed, copied and\n"
-" deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n"
-" update' to update to a given bookmark.\n"
+" deleted. It is possible to use bookmark names in 'hg merge' and\n"
+" 'hg update' to update to a given bookmark.\n"
"\n"
" You can use 'hg bookmark NAME' to set a bookmark on the current\n"
" tip with the given name. If you specify a revision using -r REV\n"
@@ -208,7 +206,7 @@
" that revision.\n"
" "
msgstr ""
-"mercurial bookmarks (Lesezeichen)\n"
+"Mercurial Lesezeichen\n"
"\n"
" Lesezeichen sind Zeiger auf bestimmte Versionen, die mitwandern,\n"
" wenn eine neuen Version erzeugt wird. Lesezeichen sind nur lokal.\n"
@@ -288,84 +286,76 @@
"Bugzilla integration\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 bug\n"
-"status.\n"
-"\n"
-"The hook updates the Bugzilla database directly. Only Bugzilla "
-"installations\n"
-"using MySQL are supported.\n"
-"\n"
-"The hook relies on a Bugzilla script to send bug change notification "
-"emails.\n"
-"That script changes between Bugzilla versions; the 'processmail' script "
-"used\n"
-"prior to 2.18 is replaced in 2.18 and subsequent versions by\n"
-"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the "
-"user\n"
-"pushing the change; you will need to ensure the Bugzilla install file\n"
-"permissions are set appropriately.\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"
"Configuring the extension:\n"
"\n"
" [bugzilla]\n"
-" host Hostname of the MySQL server holding the Bugzilla database.\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 3.0 "
-"and\n"
-" later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n"
-" versions prior to 2.18.\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 keys,\n"
-" 'bzdir', 'id' (bug id) and 'user' (committer bugzilla "
-"email).\n"
-" Default depends on version; from 2.18 it is\n"
-" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %"
-"(user)s\".\n"
-" regexp Regular expression to match bug IDs in changeset commit "
-"message.\n"
-" Must contain one \"()\" group. The default expression "
-"matches\n"
-" 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n"
-" 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations "
-"thereof.\n"
-" Matching is case insensitive.\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 "
-"repository.\n"
-" {webroot} Stripped pathname of the Mercurial "
-"repository.\n"
-" {hgweb} Base URL for browsing Mercurial "
-"repositories.\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 Bugzilla "
-"user\n"
-" ID mappings. If specified, the file should contain one "
-"mapping\n"
-" per line, \"committer\"=\"Bugzilla user\". See also the\n"
-" [usermap] section.\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 committer ID\n"
-" to Bugzilla user ID. See also [bugzilla].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 from\n"
-" templates as {hgweb}.\n"
+" baseurl Base URL for browsing Mercurial repositories. Reference\n"
+" from templates as {hgweb}.\n"
"\n"
"Activating the extension:\n"
"\n"
@@ -378,9 +368,9 @@
"\n"
"Example configuration:\n"
"\n"
-"This example configuration is for a collection of Mercurial repositories\n"
-"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n"
-"/opt/bugzilla-3.2.\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"
@@ -544,13 +534,13 @@
msgstr ""
msgid ""
-"show the children of the given or working dir revision\n"
-"\n"
-" Print the children of the working directory's revisions.\n"
-" If a revision is given via --rev, the children of that revision\n"
-" will be printed. If a file argument is given, revision in\n"
-" which the file was last changed (after the working directory\n"
-" revision or the argument to --rev if given) is printed.\n"
+"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 --rev, the children of that revision will be\n"
+" printed. If a file argument is given, revision in which the file\n"
+" was last changed (after the working directory revision or the\n"
+" argument to --rev if given) is printed.\n"
" "
msgstr ""
"Zeigt die Kinder der übergebenen Revision oder des Arbeitsverzeichnisses an\n"
@@ -564,7 +554,7 @@
" --rev).\n"
" "
-msgid "show children of the specified rev"
+msgid "show children of the specified revision"
msgstr "Zeigt die Kinder der übergebenen Revision"
msgid "hg children [-r REV] [FILE]"
@@ -587,10 +577,9 @@
msgid ""
"graph count of revisions grouped by template\n"
"\n"
-" Will graph count of changed lines or revisions grouped by template or\n"
-" alternatively by date, if dateformat is used. In this case it will "
-"override\n"
-" template.\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"
@@ -620,8 +609,8 @@
msgid "count rate for the specified revision or range"
msgstr ""
-msgid "count rate for revs matching date spec"
-msgstr ""
+msgid "count rate for revisions matching date spec"
+msgstr "Zeigt Revisionen passend zur Datums-Spezifikation"
msgid "template to group changesets"
msgstr ""
@@ -647,16 +636,16 @@
msgid ""
"add color output to status, qseries, and diff-related commands\n"
"\n"
-"This extension modifies the status command to add color to its output to\n"
-"reflect file status, the qseries command to add color to reflect patch "
-"status\n"
-"(applied, unapplied, missing), and to diff-related commands to highlight\n"
-"additions, removals, diff headers, and trailing whitespace.\n"
-"\n"
-"Other effects in addition to color, like bold and underlined text, are also\n"
-"available. Effects are rendered with the ECMA-48 SGR control function (aka\n"
-"ANSI escape codes). This module also provides the render_text function,\n"
-"which can be used to add effects to any text.\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"
"To enable this extension, add this to your .hgrc file:\n"
"[extensions]\n"
@@ -742,33 +731,32 @@
" - Mercurial [hg]\n"
" - Subversion [svn] (history on branches is not preserved)\n"
"\n"
-" If no revision is given, all revisions will be converted. Otherwise,\n"
-" convert will only import up to the named revision (given in a format\n"
-" understood by the source).\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"
+" basename of the source with '-hg' appended. If the destination\n"
" repository doesn't exist, it will be created.\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\n"
-" file that maps each source commit ID to the destination ID for\n"
-" that revision, like so:\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"
"\n"
-" If the file doesn't exist, it's automatically created. It's updated\n"
-" on each commit copied, so convert-repo can be interrupted and can\n"
-" be run repeatedly to copy new commits.\n"
-"\n"
-" The [username mapping] file is a simple text file that maps each source\n"
-" commit author to a destination commit author. It is handy for source "
-"SCMs\n"
-" that use unix logins to identify authors (eg: CVS). One line per author\n"
-" mapping and the line format is:\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"
+" and directories. Comment lines start with '#'. Each line can\n"
" contain one of the following directives:\n"
"\n"
" include path/to/file\n"
@@ -779,33 +767,33 @@
"\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 dirs not explicitely included.\n"
+" exclusion of all other files and directories not explicitely included.\n"
" The 'exclude' directive causes files or directories to be omitted.\n"
-" The 'rename' directive renames a file or directory. To rename from a\n"
-" subdirectory into the root of the repository, use '.' as the path to\n"
-" rename to.\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"
"\n"
" The splicemap is a file that allows insertion of synthetic\n"
-" history, letting you specify the parents of a revision. This is\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"
+" 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\n"
-" source revision control system whose parents should be modified\n"
-" (same format as a key in .hg/shamap). The values are the revision\n"
-" IDs (in either the source or destination revision control system)\n"
-" that should be used as the new parents for that node.\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"
" Mercurial Source\n"
" -----------------\n"
"\n"
-" --config convert.hg.ignoreerrors=False (boolean)\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 "
-"change)\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"
@@ -814,11 +802,11 @@
"\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\n"
-" the repository is :local:. The conversion uses the top level\n"
-" directory in the sandbox to find the CVS repository, and then uses\n"
-" CVS rlog commands to find files to convert. This means that unless\n"
-" a filemap is given, all files under the starting directory will be\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 reorganisation in the CVS\n"
" sandbox is ignored.\n"
"\n"
@@ -834,34 +822,37 @@
" Internal cvsps is selected by setting\n"
" --config convert.cvsps=builtin\n"
" and has a few more configurable options:\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\n"
-" of a changeset then the default may not be long enough.\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 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"
+" 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 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 changeset\n"
-" merging code to be run without doing a conversion. Its parameters and\n"
-" output are similar to that of cvsps 2.1.\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"
+" 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\n"
-" it replaces the default branch. If \"svn://repo/path/branches\"\n"
-" exists, its subdirectories are listed as possible branches. If\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 overriden with following options. Set them to paths\n"
@@ -885,17 +876,17 @@
" Perforce Source\n"
" ---------------\n"
"\n"
-" The Perforce (P4) importer can be given a p4 depot path or a client\n"
-" specification as source. It will convert all files in the source to\n"
-" a flat Mercurial repository, ignoring labels, branches and "
-"integrations.\n"
-" Note that when a depot path is given you then usually should specify a\n"
-" target directory, because otherwise the target may be named ...-hg.\n"
-"\n"
-" It is possible to limit the amount of source history to be converted\n"
-" by specifying an initial Perforce revision.\n"
-"\n"
-" --config convert.p4.startrev=0 (perforce changelist number)\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"
"\n"
@@ -915,12 +906,14 @@
msgid ""
"create changeset information from CVS\n"
"\n"
-" This command is intended as a debugging tool for the CVS to Mercurial\n"
-" converter, and can be used as a direct replacement for cvsps.\n"
-"\n"
-" Hg debugcvsps reads the CVS rlog for current directory (or any named\n"
-" directory) in the CVS repository, and converts the log to a series of\n"
-" changesets based on matching commit log entries and dates."
+" 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"
@@ -1032,7 +1025,7 @@
msgstr ""
#, python-format
-msgid "Overriding mapping for author %s, was %s, will be %s\n"
+msgid "Ignoring bad line in author map file %s: %s\n"
msgstr ""
#, python-format
@@ -1040,7 +1033,7 @@
msgstr ""
#, python-format
-msgid "Ignoring bad line in author map file %s: %s\n"
+msgid "overriding mapping for author %s, was %s, will be %s\n"
msgstr ""
#, python-format
@@ -1129,7 +1122,7 @@
msgstr ""
#, python-format
-msgid "found synthetic rev in %s: %r\n"
+msgid "found synthetic revision in %s: %r\n"
msgstr "Synthetische Revision gefundein in %s: %r\n"
#, python-format
@@ -1250,7 +1243,7 @@
msgstr ""
#, python-format
-msgid "copying file in renamed dir from '%s' to '%s'"
+msgid "copying file in renamed directory from '%s' to '%s'"
msgstr ""
msgid "reading p4 views\n"
@@ -1406,7 +1399,7 @@
msgid ""
"\n"
"The `extdiff' Mercurial extension allows you to use external programs\n"
-"to compare revisions, or revision with working dir. The external diff\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"
"non-option arguments: paths to directories containing snapshots of\n"
"files to compare.\n"
@@ -1433,16 +1426,16 @@
" 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"
+" # (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"
" # 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\n"
-"\"hg diff\" command. The `extdiff' extension makes snapshots of only\n"
-"needed files, so running the external diff program will actually be\n"
-"pretty fast (at least faster than having to compare the entire tree).\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 ""
msgid "snapshot files as of some revision"
@@ -1459,7 +1452,7 @@
msgstr ""
#, python-format
-msgid "making snapshot of %d files from working dir\n"
+msgid "making snapshot of %d files from working directory\n"
msgstr ""
msgid ""
@@ -1490,19 +1483,19 @@
"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"
+" an external program. The default program used is diff, with\n"
" default options \"-Npru\".\n"
"\n"
-" To select a different program, use the -p option. The program\n"
-" will be passed the names of two directories to compare. To pass\n"
-" additional options to the program, use the -o option. These will\n"
+" To select a different program, use the -p option. The program will\n"
+" be passed the names of two directories to compare. To pass\n"
+" additional options to the program, use the -o option. These will\n"
" be passed before the names of the directories to compare.\n"
"\n"
-" When two revision arguments are given, then changes are\n"
-" shown between those revisions. If only one revision is\n"
-" specified then that revision is compared to the working\n"
-" directory, and, when no revisions are specified, the\n"
-" working directory files are compared to its parent."
+" 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"
@@ -1527,19 +1520,21 @@
msgid "pulling, updating and merging in one command"
msgstr "Hole, aktualisiere und führe zusammen in einem Befehl"
+
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 automatically\n"
-" merged, and the result of the merge is committed. Otherwise, the\n"
-" working directory is updated to include the new changes.\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"
+" \"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"
@@ -1920,17 +1915,17 @@
"browsing 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\n"
-"not distributed with Mercurial.)\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 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\n"
-"to use your global $HOME/.hgrc file, not one in a repository). You\n"
-"can specify an absolute path:\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"
@@ -1942,8 +1937,8 @@
" hgk=\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\n"
-"specify the path to hgk in your .hgrc file:\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"
@@ -2235,15 +2230,15 @@
msgid ""
"keyword expansion in local repositories\n"
"\n"
-"This extension expands RCS/CVS-like or self-customized $Keywords$\n"
-"in tracked text files selected by your configuration.\n"
-"\n"
-"Keywords are only expanded in local repositories and not stored in\n"
-"the change history. The mechanism can be regarded as a convenience\n"
-"for the current user or for archive distribution.\n"
-"\n"
-"Configuration is done in the [keyword] and [keywordmaps] sections\n"
-"of hgrc files.\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"
@@ -2253,28 +2248,28 @@
" x* = ignore\n"
"\n"
"Note: the more specific you are in your filename patterns\n"
-" the less you lose speed in huge repos.\n"
+" the less you 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"
"\n"
-"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n"
-"with customized keywords and templates.\n"
-"Again, run \"hg kwdemo\" to control the results of your config changes.\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 inadvertedly storing expanded keywords in the change history.\n"
+"the risk of inadvertedly 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, be "
-"aware\n"
-"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n"
-"question to update keyword expansions after all changes have been checked "
-"in.\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\n"
@@ -2357,11 +2352,11 @@
msgid ""
"print [keywordmaps] configuration and an expansion example\n"
"\n"
-" Show current, custom, or default keyword template maps\n"
-" and their expansion.\n"
-"\n"
-" Extend current configuration by specifying maps as arguments\n"
-" and optionally by reading from an additional hgrc file.\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"
" "
@@ -2374,7 +2369,7 @@
msgstr ""
#, python-format
-msgid "creating temporary repo at %s\n"
+msgid "creating temporary repository at %s\n"
msgstr ""
#, python-format
@@ -2389,7 +2384,7 @@
#, python-format
msgid ""
"\n"
-"removing temporary repo %s\n"
+"removing temporary repository %s\n"
msgstr ""
msgid ""
@@ -2404,17 +2399,17 @@
msgid ""
"print files currently configured for keyword expansion\n"
"\n"
-" Crosscheck which files in working directory are potential targets for\n"
-" keyword expansion.\n"
-" That is, files matched by [keyword] config patterns but not symlinks.\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"
"\n"
-" Run before changing/disabling active keywords\n"
-" or if you experience problems with \"hg import\" or \"hg merge\".\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"
" "
@@ -2481,11 +2476,11 @@
"patch management and development\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"
+"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"
+"directory. Applied patches are both patch files and changesets.\n"
"\n"
"Common tasks (use \"hg help command\" for more details):\n"
"\n"
@@ -2866,14 +2861,16 @@
msgid ""
"remove patches from queue\n"
"\n"
-" The patches must not be applied, unless they are arguments to\n"
-" the --rev parameter. At least one patch or revision is required.\n"
+" The patches must not be applied, unless they are arguments to the\n"
+" --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 be\n"
-" used as an alternative for qdel -r, as the latter option is deprecated.\n"
-"\n"
-" With --keep, the patch files are preserved in the patch directory."
+" them to regular mercurial changesets). The qfinish command should\n"
+" be used as an alternative for qdel -r, as the latter option is\n"
+" deprecated.\n"
+"\n"
+" With --keep, the patch files are preserved in the patch\n"
+" directory."
msgstr ""
msgid "print the patches already applied"
@@ -2885,24 +2882,25 @@
msgid ""
"import a patch\n"
"\n"
-" The patch is inserted into the series after the last applied patch.\n"
-" If no patches have been applied, qimport prepends the patch\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 --name.\n"
"\n"
-" You can register an existing patch inside the patch directory\n"
-" with the --existing flag.\n"
-"\n"
-" With --force, an existing patch of the same name will be overwritten.\n"
+" You can register an existing patch inside the patch directory with\n"
+" the --existing flag.\n"
+"\n"
+" With --force, an existing patch of the same name will be\n"
+" overwritten.\n"
"\n"
" An existing changeset may be placed under mq control with --rev\n"
" (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
" With --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 "
-"changes.\n"
+" important for preserving rename/copy information and permission\n"
+" changes.\n"
" "
msgstr ""
@@ -2910,23 +2908,23 @@
"init a new queue repository\n"
"\n"
" The queue repository is unversioned by default. If -c is\n"
-" specified, qinit will create a separate nested repository\n"
-" for patches (qinit -c may also be run later to convert\n"
-" an unversioned patch repository into a versioned one).\n"
-" You can use qcommit to commit changes to this queue repository."
+" specified, qinit will create a separate nested repository for\n"
+" patches (qinit -c may also be run later to convert an unversioned\n"
+" patch repository into a versioned one). You can use qcommit to\n"
+" 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"
+" 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"
+" 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"
+" 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"
@@ -2936,17 +2934,17 @@
msgid "versioned patch repository not found (see qinit -c)"
msgstr ""
-msgid "cloning main repo\n"
-msgstr ""
-
-msgid "cloning patch repo\n"
-msgstr ""
-
-msgid "stripping applied patches from destination repo\n"
-msgstr ""
-
-msgid "updating destination repo\n"
-msgstr ""
+msgid "cloning main repository\n"
+msgstr ""
+
+msgid "cloning patch repository\n"
+msgstr "Klone Patch-Archiv\n"
+
+msgid "stripping applied patches from destination repository\n"
+msgstr ""
+
+msgid "updating destination repository\n"
+msgstr "Aktualisiere Zielarchiv\n"
msgid "commit changes in the queue repository"
msgstr ""
@@ -2972,21 +2970,19 @@
msgid ""
"create a new patch\n"
"\n"
-" qnew creates a new patch on top of the currently-applied patch (if "
-"any).\n"
-" It will refuse to run if there are any outstanding changes unless -f is\n"
-" specified, in which case the patch will be initialized with them. You\n"
-" may also use -I, -X, 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 as\n"
-" uncommitted modifications.\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 is specified, in which case the patch will be\n"
+" initialized with them. You may also use -I, -X, and/or a list of\n"
+" files after the patch name to add only changes to matching files\n"
+" to the new patch, leaving the rest as uncommitted modifications.\n"
"\n"
" -u and -d can be used to set the (given) user and date, respectively.\n"
" -U and -D set user to current user and date to current date.\n"
"\n"
-" -e, -m or -l set the patch header as well as the commit message. If "
-"none\n"
-" is specified, the header is empty and the commit message is '[mq]: "
-"PATCH'.\n"
+" -e, -m or -l set the patch header as well as the commit message.\n"
+" If none is specified, the header is empty and the commit message\n"
+" is '[mq]: PATCH'.\n"
"\n"
" Use the --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"
@@ -2998,18 +2994,17 @@
msgid ""
"update the current patch\n"
"\n"
-" If any file patterns are provided, the refreshed patch will contain "
-"only\n"
-" the modifications that match those patterns; the remaining "
-"modifications\n"
-" will remain in the working directory.\n"
-"\n"
-" If --short is specified, files currently included in the patch will\n"
-" 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 use\n"
-" git-style patches (--git or [diff] git=1) to track copies and renames.\n"
-" See the diffs help topic for more information on the git diff format.\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 --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 (--git or [diff] git=1) to track copies and\n"
+" renames. See the diffs help topic for more information on the git\n"
+" diff format.\n"
" "
msgstr ""
@@ -3019,14 +3014,15 @@
msgid ""
"diff of the current patch and subsequent modifications\n"
"\n"
-" Shows a diff which includes the current patch as well as any changes "
-"which\n"
-" have been made in the working directory since the last refresh (thus\n"
-" showing what the current patch would become after a qrefresh).\n"
-"\n"
-" Use 'hg diff' if you only want to see the changes made since the last\n"
-" qrefresh, or 'hg export qtip' if you want to see changes made by the\n"
-" current patch without including changes made since the qrefresh.\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 ""
@@ -3036,12 +3032,12 @@
" 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\n"
-" be deleted. With -k/--keep, the folded patch files will not\n"
-" be removed afterwards.\n"
-"\n"
-" The header for each folded patch will be concatenated with\n"
-" the current patch header, separated by a line of '* * *'."
+" 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"
@@ -3099,8 +3095,8 @@
msgid ""
"push the next patch onto the stack\n"
"\n"
-" When --force is applied, all local changes in patched files will be "
-"lost.\n"
+" When --force is applied, all local changes in patched files will\n"
+" be lost.\n"
" "
msgstr ""
@@ -3114,9 +3110,9 @@
msgid ""
"pop the current patch off the stack\n"
"\n"
-" By default, pops off the top of the patch stack. If given a patch name,\n"
-" keeps popping off patches until the named patch is at the top of the "
-"stack.\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 ""
@@ -3139,7 +3135,7 @@
msgid "A patch named %s already exists in the series file"
msgstr ""
-msgid "restore the queue state saved by a rev"
+msgid "restore the queue state saved by a revision"
msgstr ""
msgid "save current queue state"
@@ -3160,8 +3156,9 @@
msgid ""
"strip a revision and all its descendants from the repository\n"
"\n"
-" If one of the working dir's parent revisions is stripped, the working\n"
-" directory will be updated to the parent of the stripped revision.\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 ""
@@ -3169,34 +3166,34 @@
"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 it\n"
-" has no guards or any positive guards match the currently selected "
-"guard,\n"
-" but will not be pushed if any negative guards match the current guard.\n"
-" For example:\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\n"
-" has a positive match).\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 skipped\n"
-" and patches with negative guards are pushed.\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 applied\n"
-" patch that is not guarded. Use --reapply (which implies --pop) to push\n"
-" back to the current patch afterwards, but skip guarded patches.\n"
-"\n"
-" Use -s/--series to print a list of all guards in the series file (no\n"
-" other arguments needed). Use -v for more information."
+" 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"
@@ -3231,17 +3228,18 @@
msgid ""
"move applied patches into repository history\n"
"\n"
-" Finishes the specified revisions (corresponding to applied patches) by\n"
-" moving them out of mq control into regular repository history.\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 --applied option. If --applied is\n"
" specified, all applied mq revisions are removed from mq control.\n"
" Otherwise, the given revisions must be at the base of the stack of\n"
" applied patches.\n"
"\n"
-" This can be especially useful if your changes have been applied to an\n"
-" upstream repository, or if you are about to push your changes to "
-"upstream.\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 ""
@@ -3280,7 +3278,7 @@
msgid "use uncompressed transfer (fast over LAN)"
msgstr "Nutzt unkomprimierte Übertragung (schnell im LAN)"
-msgid "location of source patch repo"
+msgid "location of source patch repository"
msgstr ""
msgid "hg qclone [OPTION]... SOURCE [DEST]"
@@ -3328,7 +3326,7 @@
msgid "hg qheader [PATCH]"
msgstr ""
-msgid "import file in patch dir"
+msgid "import file in patch directory"
msgstr ""
msgid "patch file name"
@@ -3430,7 +3428,7 @@
msgid "delete save entry"
msgstr ""
-msgid "update queue working dir"
+msgid "update queue working directory"
msgstr ""
msgid "hg qrestore [-d] [-u] REV"
@@ -3554,10 +3552,10 @@
"emails\n"
" pattern = user at host\n"
"\n"
-" glob patterns are matched against path to repo root.\n"
-"\n"
-" if you like, you can put notify config file in repo that users can\n"
-" push changes to, they can manage their own subscriptions."
+" 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."
msgstr ""
msgid "email notification class."
@@ -3611,7 +3609,7 @@
msgstr ""
#, python-format
-msgid "notify: no subscribers to repo %s\n"
+msgid "notify: no subscribers to repository %s\n"
msgstr ""
#, python-format
@@ -3626,12 +3624,11 @@
" [pager]\n"
" pager = LESS='FSRX' less\n"
"\n"
-"If no pager is set, the pager extensions uses the environment\n"
-"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n"
-"is used.\n"
-"\n"
-"If you notice \"BROKEN PIPE\" error messages, you can disable them\n"
-"by setting:\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"
@@ -3642,23 +3639,23 @@
" [pager]\n"
" ignore = version, help, update\n"
"\n"
-"You can also enable the pager only for certain commands using pager.attend:\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 "
-"specify\n"
-"them in the global .hgrc\n"
+"To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
+"specify them in the global .hgrc\n"
msgstr ""
msgid ""
"use suffixes to refer to ancestor revisions\n"
"\n"
-"This extension allows you to use git-style suffixes to refer to\n"
-"the ancestors of a specific revision.\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"
@@ -3677,12 +3674,12 @@
msgid ""
"sending Mercurial changesets as a series of patch emails\n"
"\n"
-"The series is started off with a \"[PATCH 0 of N]\" introduction,\n"
-"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 body parts:\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 remainder of the changeset description.\n"
"\n"
@@ -3691,11 +3688,11 @@
" The patch itself, as generated by \"hg export\".\n"
"\n"
"Each message refers to all of its predecessors using the In-Reply-To\n"
-"and References headers, so they will show up as a sequence in\n"
-"threaded mail and news readers, and in mail archives.\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"
"For each changeset, you will be prompted with a diffstat summary and\n"
-"the changeset summary, so you can be sure you are sending the right "
+"the changeset summary, so you can be sure you are sending the right\n"
"changes.\n"
"\n"
"To enable this extension:\n"
@@ -3703,7 +3700,8 @@
" [extensions]\n"
" hgext.patchbomb =\n"
"\n"
-"To configure other defaults, add a section like this to your hgrc file:\n"
+"To configure other defaults, add a section like this to your hgrc\n"
+"file:\n"
"\n"
" [email]\n"
" from = My Name <my at email>\n"
@@ -3715,24 +3713,24 @@
"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"
+"the \"email\" command with the \"-n\" option (test only). You will be\n"
"prompted for an email recipient address, a subject an an introductory\n"
-"message describing the patches of your patchbomb. Then when all is\n"
+"message describing the patches of your patchbomb. Then when all is\n"
"done, patchbomb messages are displayed. If PAGER environment variable\n"
-"is set, your pager will be fired up once for each patchbomb message, so\n"
-"you can verify everything is alright.\n"
-"\n"
-"The \"-m\" (mbox) option is also very useful. Instead of previewing\n"
-"each patchbomb message in a pager or sending the messages directly,\n"
-"it will create a UNIX mailbox file with the patch emails. This\n"
-"mailbox file can be previewed with any mail user agent which supports\n"
-"UNIX mbox files, e.g. with mutt:\n"
+"is set, your pager will be fired up once for each patchbomb message,\n"
+"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 package),\n"
-"to send each message out:\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"
@@ -3740,9 +3738,9 @@
"\n"
"You can also either configure the method option in the email section\n"
"to be a sendmail compatable mailer or fill out the [smtp] section so\n"
-"that the patchbomb extension can automatically send patchbombs directly\n"
-"from the commandline. See the [email] and [smtp] sections in hgrc(5)\n"
-"for details."
+"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."
msgstr ""
msgid "Please enter a valid value.\n"
@@ -3758,23 +3756,23 @@
"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"
+" 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 body parts. First, the rest of\n"
-" the changeset description. Next, (optionally) if the diffstat\n"
+" The message contains two or three body parts. First, the rest of\n"
+" the changeset description. Next, (optionally) if the diffstat\n"
" program is installed, the result of running diffstat on the patch.\n"
" Finally, the patch itself, as generated by \"hg export\".\n"
"\n"
-" With --outgoing, emails will be generated for patches not\n"
-" found in the destination repository (or only those which are\n"
-" ancestors of the specified revisions if any are provided)\n"
-"\n"
-" With --bundle, changesets are selected as for --outgoing,\n"
-" but a single email containing a binary Mercurial bundle as an\n"
-" attachment will be sent.\n"
+" With --outgoing, emails will be generated for patches not found in\n"
+" the destination repository (or only those which are ancestors of\n"
+" the specified revisions if any are provided)\n"
+"\n"
+" With --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"
@@ -3794,8 +3792,8 @@
"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 hgrc.\n"
-" See the [email] section in hgrc(5) for details.\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 ""
@@ -3871,6 +3869,9 @@
msgid "subject of first message (intro or single patch)"
msgstr ""
+msgid "\"message identifier to reply to\""
+msgstr ""
+
msgid "email addresses of recipients"
msgstr ""
@@ -3904,13 +3905,13 @@
msgid ""
"removes files not tracked by Mercurial\n"
"\n"
-" Delete files not known to Mercurial. This is useful to test local and\n"
-" uncommitted changes in an otherwise-clean source tree.\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"
" - Unknown files: files marked with \"?\" by \"hg status\"\n"
-" - Empty directories: in fact Mercurial ignores directories unless they\n"
-" contain files under source control managment\n"
+" - Empty directories: in fact Mercurial ignores directories unless\n"
+" they contain files under source control managment\n"
" But it will leave untouched:\n"
" - Modified and unmodified tracked files\n"
" - Ignored files (unless --all is specified)\n"
@@ -3919,9 +3920,10 @@
" 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 you\n"
-" forgot to add to the repository. If you only want to print the list of\n"
-" files that this program would delete, use the --print option.\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 ""
@@ -3956,11 +3958,10 @@
msgid "hg purge [OPTION]... [DIR]..."
msgstr ""
-# Nicht übersetzen
msgid ""
"move sets of revisions to a different ancestor\n"
"\n"
-"This extension lets you rebase changesets in an existing Mercurial "
+"This extension lets you rebase changesets in an existing Mercurial\n"
"repository.\n"
"\n"
"For more information:\n"
@@ -3977,15 +3978,12 @@
msgid ""
"move changeset (and descendants) to a different branch\n"
"\n"
-" Rebase uses repeated merging to graft changesets from one part of "
-"history\n"
-" onto another. This can be useful for linearizing local changes relative "
-"to\n"
-" a master development tree.\n"
-"\n"
-" If a rebase is interrupted to manually resolve a merge, it can be "
-"continued\n"
-" with --continue or aborted with --abort.\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 or aborted with --abort.\n"
" "
msgstr ""
"Verschiebt Versionen (und ihre Nachfolger) auf einen abweichenden Zweig\n"
@@ -4001,24 +3999,24 @@
" abgebrochen werden.\n"
" "
+msgid "cannot use both abort and continue"
+msgstr "abort und continue können nicht gleichzeitig genutzt werden"
+
+msgid "cannot use collapse with continue or abort"
+msgstr "collapse kann nicht mit continue oder abort genutzt werden"
+
+msgid "abort and continue do not allow specifying revisions"
+msgstr "abort und continue erlauben die Angabe einer Revision nicht"
+
+msgid "cannot specify both a revision and a base"
+msgstr "Es können nicht revision und base gleichzeitig angegeben werden"
+
+msgid "nothing to rebase\n"
+msgstr "Kein Rebase nötig\n"
+
msgid "cannot use both keepbranches and extrafn"
msgstr "keepbranches und extrafn können nicht gleichzeitig genutzt werden"
-msgid "cannot use both abort and continue"
-msgstr "abort und continue können nicht gleichzeitig genutzt werden"
-
-msgid "cannot use collapse with continue or abort"
-msgstr "collapse kann nicht mit continue oder abort genutzt werden"
-
-msgid "abort and continue do not allow specifying revisions"
-msgstr "abort und continue erlauben die Angabe einer Revision nicht"
-
-msgid "cannot specify both a revision and a base"
-msgstr "Es können nicht revision und base gleichzeitig angegeben werden"
-
-msgid "nothing to rebase\n"
-msgstr "Kein Rebase nötig\n"
-
msgid "rebase merging completed\n"
msgstr "Zusammenführungen des Rebase abgeschlossen\n"
@@ -4091,6 +4089,9 @@
"Revision %d kann nicht als Basis genutzt werden, das Ergebnis hätte 3 "
"Vorgänger"
+msgid "Return true if the given patch is in git format"
+msgstr ""
+
# Nicht übersetzen
msgid "Update rebased mq patches - finalize and then import them"
msgstr ""
@@ -4175,24 +4176,24 @@
msgid "rebase working directory to branch head"
msgstr "Führt Rebase zu einem Zweigkopf auf dem Arbeitsverzeichnis aus"
+msgid "rebase from a given revision"
+msgstr "Rebase ab einer angegebenen Revision"
+
+msgid "rebase from the base of a given revision"
+msgstr "Rebase ab der Basis einer angegebenen Revision"
+
+msgid "rebase onto a given revision"
+msgstr "Rebase der angegebene Revision"
+
+msgid "collapse the rebased revisions"
+msgstr "Faltet die erzeugten Revisionen nach dem Rebase zusammen"
+
msgid "keep original revisions"
msgstr "Behält die ursprünglichen Revisionen"
msgid "keep original branches"
msgstr "Behält die ursprünglichen Zweige"
-msgid "rebase from a given revision"
-msgstr "Rebase ab einer angegebenen Revision"
-
-msgid "rebase from the base of a given revision"
-msgstr "Rebase ab der Basis einer angegebenen Revision"
-
-msgid "rebase onto a given revision"
-msgstr "Rebase der angegebene Revision"
-
-msgid "collapse the rebased revisions"
-msgstr "Faltet die erzeugten Revisionen nach dem Rebase zusammen"
-
msgid "continue an interrupted rebase"
msgstr "Führt einen unterbrochenen Rebase fort"
@@ -4200,7 +4201,8 @@
msgstr "Bricht einen unterbrochenen Rebase ab"
msgid ""
-"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]"
+"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
+"| [-c] | [-a]"
msgstr ""
# Nicht übersetzen
@@ -4339,7 +4341,7 @@
"\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"
+" change to use. For each query, the following responses are\n"
" possible:\n"
"\n"
" y - record this change\n"
@@ -4441,8 +4443,8 @@
"\n"
"This extension allows you to transplant patches from another branch.\n"
"\n"
-"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n"
-"from a changeset hash to its hash in the source repository.\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 ""
msgid ""
@@ -4534,8 +4536,8 @@
" (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\n"
-" as $1 and the patch as $2.\n"
+" Its argument will be invoked with the current changelog message as\n"
+" $1 and the patch as $2.\n"
"\n"
" If --source is specified, selects changesets from the named\n"
" repository. If --branch is specified, selects changesets from the\n"
@@ -4543,19 +4545,21 @@
" is specified, all changesets on the branch will be transplanted,\n"
" otherwise you will be prompted to select the changesets you want.\n"
"\n"
-" hg transplant --branch REVISION --all will rebase the selected branch\n"
-" (up to the named revision) onto your current working directory.\n"
-"\n"
-" You can optionally mark selected transplanted changesets as\n"
-" merge changesets. You will not be prompted to transplant any\n"
-" ancestors of a merged transplant, and you can merge descendants\n"
-" of them normally instead of transplanting them.\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 and\n"
-" then resume where you left off by calling hg transplant --continue.\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.\n"
" "
msgstr ""
@@ -4611,18 +4615,18 @@
msgid ""
"allow to use MBCS path with problematic encoding.\n"
"\n"
-"Some MBCS encodings are not good for some path operations\n"
-"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n"
-"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n"
-"encoding\". This extension can be used to fix the issue with those\n"
-"encodings by wrapping some functions to convert to unicode string\n"
-"before path operation.\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 usefull 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\n"
-" on case-insensitive file system.\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"
@@ -4630,15 +4634,17 @@
"\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 HGENCODING.\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"
-"Path encoding conversion are done between unicode and util._encoding\n"
-"which is decided by mercurial from current locale setting or HGENCODING.\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"
"\n"
msgstr ""
@@ -4691,19 +4697,18 @@
msgid ""
"zeroconf support for mercurial repositories\n"
"\n"
-"Zeroconf enabled repositories will be announced in a network without the "
-"need\n"
-"to configure a server or a service. They can be discovered without knowing\n"
-"their actual IP address.\n"
-"\n"
-"To use the zeroconf extension add the following entry to your hgrc file:\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\" in "
-"your\n"
-"repository.\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"
@@ -4949,7 +4954,8 @@
msgid ""
"add the specified files on the next commit\n"
"\n"
-" Schedule files to be version controlled and added to the repository.\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 revert.\n"
@@ -4962,7 +4968,8 @@
" Merkt Dateien zur Versionskontrolle im Projektarchiv vor.\n"
"\n"
" Die Dateien werden dem Projektarchiv beim nächsten Übernehmen (commit)\n"
-" hinzugefügt. Um diese Aktion vorher rückgängig zu machen, siehe hg revert.\n"
+" hinzugefügt. Um diese Aktion vorher rückgängig zu machen, siehe hg "
+"revert.\n"
"\n"
" Wenn keine Namen angegeben sind, füge alle Dateien dem Projektarchiv\n"
" hinzu.\n"
@@ -4971,17 +4978,19 @@
msgid ""
"add all new files, delete all missing files\n"
"\n"
-" Add all new files and remove all missing files from the repository.\n"
-"\n"
-" New files are ignored if they match any of the patterns in .hgignore. "
-"As\n"
-" with add, these changes take effect at the next commit.\n"
-"\n"
-" Use the -s option to detect renamed files. With a parameter > 0,\n"
-" this compares every removed file with every added file and records\n"
-" those similar enough as renames. This option takes a percentage\n"
-" between 0 (disabled) and 100 (files must be identical) as its\n"
-" parameter. Detecting renamed files this way can be expensive.\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 > 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 ""
"Fügt alle neuen Dateien hinzu, löscht alle fehlenden Dateien\n"
@@ -5011,16 +5020,15 @@
msgid ""
"show changeset information per file line\n"
"\n"
-" List changes in files, showing the revision id responsible for each "
-"line\n"
-"\n"
-" This command is useful to discover who did a change or when a change "
-"took\n"
-" place.\n"
-"\n"
-" Without the -a option, annotate will avoid processing files it\n"
-" detects as binary. With -a, annotate will generate an annotation\n"
-" anyway, probably with undesirable results.\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"
+"\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"
@@ -5051,9 +5059,9 @@
"create unversioned archive of a repository revision\n"
"\n"
" By default, the revision used is the parent of the working\n"
-" directory; use \"-r\" to specify a different revision.\n"
-"\n"
-" To specify the type of archive to create, use \"-t\". Valid\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"
@@ -5064,11 +5072,12 @@
" \"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"
+" 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\" to specify a format string for the prefix.\n"
-" The default is the basename of the archive, with suffixes removed.\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 ""
"Erzeugt ein unversioniertes Archiv einer Projektarchiv-Revision\n"
@@ -5088,10 +5097,10 @@
" \"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"
+" einem Format-String angegeben; siehe 'hg help export' für Details.\n"
"\n"
" Jedem Element des Archivs wird ein Verzeichnis-Präfix vorangestellt.\n"
-" Nutze \"-p\" um eine Format-String für das Präfix anzugeben.\n"
+" Nutze -p/--prefix um eine Format-String für das Präfix anzugeben.\n"
" Als Standard wird der Dateiname des Archive ohne Dateiendung genutzt.\n"
" "
@@ -5117,9 +5126,8 @@
"\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\n"
-" hand. The result of this merge is not committed, as with a normal\n"
-" merge.\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"
" "
@@ -5187,26 +5195,23 @@
msgid ""
"subdivision search of changesets\n"
"\n"
-" This command helps to find changesets which introduce problems.\n"
-" To use, mark the earliest changeset you know exhibits the problem\n"
-" as bad, then mark the latest changeset which is free from the\n"
-" problem as good. Bisect will update your working directory to a\n"
-" revision for testing (unless the --noupdate option is specified).\n"
-" Once you have performed tests, mark the working directory as bad\n"
-" or good and bisect will either update to another candidate changeset\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 bad or\n"
+" good 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. Its "
-"exit\n"
-" status will be used as flag to mark revision as bad or good. In case "
-"exit\n"
-" status is 0 the revision is marked as good, 125 - skipped, 127 (command "
-"not\n"
-" found) - bisection will be aborted; any other status bigger than 0 will\n"
-" mark revision as bad.\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"
" "
msgstr ""
"Binäre Suche von Änderungssätzen\n"
@@ -5277,14 +5282,16 @@
"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 in\n"
-" the repository until the next commit).\n"
-"\n"
-" Unless --force is specified, branch will not let you set a\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"
+"\n"
+" Unless -f/--force is specified, branch will not let you set a\n"
" branch name that shadows an existing branch.\n"
"\n"
-" Use --clean to reset the working directory branch to that of the\n"
-" parent of the working directory, negating a previous branch change.\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"
" "
@@ -5294,6 +5301,8 @@
" Ohne Parameter wird der Name des aktuellen Zweiges angezeigt. Mit einem\n"
" Parameter wird der Zweigname des Arbeitsverzeichnisses gesetzt. Der\n"
" Zweig existiert nicht im Projektarchiv und muss erst übernommen werden.\n"
+" 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"
@@ -5347,13 +5356,14 @@
" 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"
-" --all (or --base null). To change the compression method applied,\n"
-" use the -t option (by default, bundles are compressed using bz2).\n"
-"\n"
-" The bundle file can then be transferred using conventional means and\n"
-" applied to another repository with the unbundle or pull command.\n"
-" This is useful when direct push and pull are not available or when\n"
-" exporting an entire repository is undesirable.\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"
+"\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"
@@ -5391,8 +5401,8 @@
msgid ""
"output the current or given revision of files\n"
"\n"
-" Print the specified files as they were at the given revision.\n"
-" If no revision is given, the parent of the working directory is used,\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"
@@ -5400,7 +5410,7 @@
" 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 repo root\n"
+" %d dirname of file being printed, or '.' if in repository root\n"
" %p root-relative path name of file being printed\n"
" "
msgstr ""
@@ -5421,6 +5431,7 @@
" %p Pfad und Dateiname relativ zur Archiv-Wurzel\n"
" "
+
msgid ""
"make a copy of an existing repository\n"
"\n"
@@ -5432,6 +5443,23 @@
" 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"
+" Look at the help text for URLs for important details about ssh://\n"
+" 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"
@@ -5444,26 +5472,13 @@
"\n"
" $ cp -al REPO REPOCLONE\n"
"\n"
-" This is the fastest way to clone, but it is not always safe. The\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"
+" 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"
-" If you use the -r option to clone up to a specific revision, no\n"
-" subsequent revisions will be present in the cloned repository.\n"
-" This option implies --pull, even on local repositories.\n"
-"\n"
-" If the -U option is used, the new clone will contain only a repository\n"
-" (.hg) and no working copy (the working copy 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"
-" Look at the help text for urls for important details about ssh:// URLs.\n"
" "
msgstr ""
"Erzeugt eine Kopie eines bestehenden Projektarchivs\n"
@@ -5476,6 +5491,22 @@
" Die Adresse der Quelle wird der .hg/hgrc Datei des neuen Archivs\n"
" als Standard für entfernte Aktionen (pull/push) hinzugefügt.\n"
"\n"
+" Wenn die -r Option zum klonen bis zu einer bestimmten Revision genutzt\n"
+" wird, werden keine Folgeversionen (oder Marken) im geklonten Archiv\n"
+" vorhanden sein. Diese Option impliziert --pull, auch bei lokalen "
+"Archiven.\n"
+"\n"
+" Standardmäßig wird clone die Kopfversion des 'default'-Zweiges zum\n"
+" Arbeitsverzeichnis machen. Bei Nutzung der -U Option wird der Klon zwar\n"
+" das Projektarchiv enthalten (.hg) aber keine Arbeitskopie laden (die\n"
+" Vorgängerversion der Arbeitskopie ist die 'null'-Revision).\n"
+"\n"
+" Siehe 'hg help urls' für Details gültiger Quellformate.\n"
+"\n"
+" Es ist möglich eine ssh:// URL als Ziel anzugeben, aber es werden weder\n"
+" .hg/hgrc noch Arbeitsverzeichnis auf der entfernten Seite angelegt.\n"
+" Wichtige Details zu URLs mit ssh:// finden sich unter 'hg help urls'.\n"
+"\n"
" Aus Effizienzgründen werden 'hardlinks' für das Klonen genutzt, wann "
"immer\n"
" Quelle und Ziel auf dem selben Dateisystem sind (dies gilt nur für die\n"
@@ -5498,27 +5529,14 @@
" Erweiterungen, die Metadaten unter dem .hg Verzeichnis ablegen, z.B. "
"mq.\n"
"\n"
-" Wenn die -r Option zum klonen bis zu einer bestimmten Revision genutzt\n"
-" wird, werden keine Folgeversionen im geklonten Archiv vorhanden sein.\n"
-" Diese Option impliziert --pull, auch bei lokalen Archiven.\n"
-"\n"
-" Bei Nutzung der -U Option wird der Klon zwar das Projektarchiv "
-"enthalten\n"
-" (.hg) aber keine Arbeitskopie laden (die Vorgängerversion der "
-"Arbeitskopie\n"
-" ist die 'null'-Revision).\n"
-"\n"
-" Siehe 'hg help urls' für Details gültiger Quellformate.\n"
-"\n"
-" Es ist möglich eine ssh:// URL als Ziel anzugeben, aber es werden weder\n"
-" .hg/hgrc noch Arbeitsverzeichnis auf der entfernten Seite angelegt.\n"
-" Wichtige Details zu Urls mit ssh:// finden sich unter 'hg help urls'.\n"
" "
msgid ""
"commit the specified files or all outstanding changes\n"
"\n"
-" Commit changes to the given files into the repository.\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"
"\n"
" If a list of files is omitted, all changes reported by \"hg status\"\n"
" will be committed.\n"
@@ -5526,18 +5544,21 @@
" If you are committing the result of a merge, do not provide any\n"
" file names or -I/-X filters.\n"
"\n"
-" If no commit message is specified, the configured editor is started to\n"
-" prompt you for a message.\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 ""
-"Übernimmt die vorgemerkten Änderungen und erzeugt eine neue Revision\n"
-"\n"
-" Erzeugt eine neue Revision mit allen (von \"hg status\" angezeigten) "
-"oder\n"
-" den angegegebenen geänderten Dateien des Arbeitsverzeichnisses im "
-"Archiv.\n"
+"Übernimmt Änderungen der angegebenen Dateien oder alle ausstehenden "
+"Änderungen ins Archiv\n"
+"\n"
+" Übernimmt Änderungen der angegebenen Dateien ins Archiv. Anders als\n"
+" 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"
+" angezeigten Änderungen Bestandteil der neuen Revision.\n"
"\n"
" Wenn das Ergebnis einer Zusammenführung übernommen werden soll, dürfen\n"
" keine Dateinamen oder -I/-X Filter angegeben werden.\n"
@@ -5564,7 +5585,7 @@
" 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 --after, the\n"
+" stand 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"
@@ -5811,12 +5832,12 @@
" revisions are specified, the working directory files are compared\n"
" to its parent.\n"
"\n"
-" Without the -a option, diff will avoid generating diffs of files\n"
-" it detects as binary. With -a, diff will generate a diff anyway,\n"
-" probably with undesirable results.\n"
-"\n"
-" Use the --git option to generate diffs in the git extended diff\n"
-" format. For more information, read hg help diffs.\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 ""
"Zeigt Änderungen des Projektarchiv oder angegebener Dateien an\n"
@@ -5845,6 +5866,7 @@
"aufschlussreich.\n"
" "
+
msgid ""
"dump the header and diffs for one or more changesets\n"
"\n"
@@ -5853,8 +5875,9 @@
" 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 changesets,\n"
-" as it will compare the merge changeset against its first parent only.\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"
@@ -5868,15 +5891,15 @@
" %n zero-padded sequence number, starting at 1\n"
" %r zero-padded changeset revision number\n"
"\n"
-" Without the -a option, export will avoid generating diffs of files\n"
-" it detects as binary. With -a, export will generate a diff anyway,\n"
-" probably with undesirable results.\n"
-"\n"
-" Use the --git option to generate diffs in the git extended diff\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"
"\n"
-" With the --switch-parent option, the diff will be against the second\n"
-" parent. It can be useful to review a merge.\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 ""
"Gibt Kopfzeilen und Änderungsverlauf einer oder mehrerer Versionen aus\n"
@@ -5930,8 +5953,8 @@
"\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\n"
-" a match appears.\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"
@@ -5940,6 +5963,23 @@
" use the --all flag.\n"
" "
msgstr ""
+"Sucht ein Muster in angegebenen Dateien und Revisionen\n"
+"\n"
+" Durchsucht Dateien in der Versionshistorie nach einem gegebenen Muster.\n"
+"\n"
+" Dieses Kommando unterscheidet sich von Unix grep, da es Reguläre "
+"Ausdrücke\n"
+" in Python/Perl Format erwartet und ausserdem nur die übernommenen "
+"Revisionen\n"
+" im Archiv durchsucht, nicht jedoch das Arbeitsverzeichnis.\n"
+"\n"
+" Standardmäßig gibt grep den Dateinamen und die jüngste Revision einer "
+"Datei\n"
+" aus, die das Suchmuster enthält. Mit der Option --all werden "
+"stattdessen\n"
+" alle Revisionen ausgegeben, in der das Muster hinzugefügt (\"+\") oder\n"
+" entfernt (\"-\") wurde.\n"
+" "
#, python-format
msgid "grep: invalid match pattern: %s\n"
@@ -5995,7 +6035,8 @@
"\n"
" With no arguments, print a list of commands and short help.\n"
"\n"
-" Given a topic, extension, or command name, print help for that topic."
+" Given a topic, extension, or command name, print help for that\n"
+" topic."
msgstr ""
"Zeigt die Hilfe für ein gegebenes Thema oder eine Hilfsübersicht\n"
"\n"
@@ -6085,17 +6126,19 @@
"Zusätzliche Hilfethemen:\n"
"\n"
+
msgid ""
"identify the working copy or specified revision\n"
"\n"
-" With no revision, print a summary of the current state of the repo.\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"
"\n"
-" This summary identifies the repository state using one or two parent\n"
-" hash identifiers, followed by a \"+\" if there are uncommitted changes\n"
-" in the working directory, a list of tags for this revision and a branch\n"
-" name for non-default branches.\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 ""
"Beschreibt die Arbeitskopie oder die angegebene Revision\n"
@@ -6113,13 +6156,14 @@
" falls nicht der 'default'-Zweig vorliegt.\n"
" "
+
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 flag.\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 (body part must be type text/plain or\n"
@@ -6128,21 +6172,22 @@
" 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 description\n"
-" from patch override values from message headers and body. Values\n"
-" given on command line with -m and -u override these.\n"
-"\n"
-" If --exact is specified, import will set the working directory\n"
-" to the parent of each patch before applying it, and will abort\n"
-" if the resulting changeset has a different ID than the one\n"
-" recorded in the patch. This may happen due to character set\n"
-" problems or other deficiencies in the text patch format.\n"
-"\n"
-" With --similarity, hg will attempt to discover renames and copies\n"
-" in the patch in the same way as 'addremove'.\n"
-"\n"
-" To read a patch from standard input, use patch name \"-\".\n"
-" See 'hg help dates' for a list of formats valid for -d/--date.\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 patch name \"-\". See 'hg\n"
+" help dates' for a list of formats valid for -d/--date.\n"
" "
msgstr ""
"Importiert eine Liste von Patches\n"
@@ -6202,23 +6247,27 @@
msgid "patch is damaged or loses information"
msgstr "Prüfsumme stimmt nicht überein: Patch korrumpiert"
+
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 pull\n"
-" was requested.\n"
-"\n"
-" For remote repository, using --bundle avoids downloading the changesets\n"
-" twice if the incoming is followed by a pull.\n"
+" pull location. These are the changesets that would be pulled if a\n"
+" pull was requested.\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 ""
"Zeigt neue Revisionen in einer externen Quelle an\n"
"\n"
-" Zeigt alle neuen Änderungen an, die durch ein \"hg pull\" von der ange-\n"
-" gebenen oder Standardquelle geholt werden würden.\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"
" Für entfernte Archive sorgt die Option --bundle dafür, dass die "
"Änderungen\n"
@@ -6250,6 +6299,7 @@
" Siehe 'hg help urls' für mehr Informationen.\n"
" "
+
msgid ""
"locate files matching specific patterns\n"
"\n"
@@ -6264,9 +6314,9 @@
" names.\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\".\n"
-" This will avoid the problem of \"xargs\" treating single filenames\n"
-" that contain white space as multiple filenames.\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"
" "
msgstr ""
"Suche Dateien mit bestimmtem Namen\n"
@@ -6287,6 +6337,7 @@
" mit Leerzeichen in Dateinamen vermeidet.\n"
" "
+
msgid ""
"show revision history of entire repository or files\n"
"\n"
@@ -6310,7 +6361,7 @@
" commit. When the -v/--verbose switch is used, the list of changed\n"
" files and full commit message is shown.\n"
"\n"
-" NOTE: log -p may generate unexpected diff output for merge\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"
@@ -6363,23 +6414,20 @@
"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 parent of the working directory is used,\n"
-" or tip if no revision is checked out.\n"
-"\n"
-" The manifest is the list of files being version controlled. If no "
-"revision\n"
-" is given then the first parent of the working directory is used.\n"
-"\n"
-" With -v flag, print file permissions, symlink and executable bits. With\n"
-" --debug flag, print file revision hashes.\n"
+" If no revision is given, the first parent of the working directory\n"
+" is used, or tip if no revision is checked out.\n"
+"\n"
+" With -v flag, print file permissions, symlink and executable bits.\n"
+" With --debug flag, print file revision hashes.\n"
" "
msgstr ""
"Gibt das Manifest der angegebenen oder aktuellen Revision aus.\n"
"\n"
-" Das Manifest enthält die Liste aller Dateien under Versionskontrolle.\n"
-" Wenn keine Revision angegeben ist, wird die Vorgängerversion des "
-"Arbeits-\n"
-" verzeichnisses (bzw. die Spitze, falls dies leer ist) verwendet.\n"
+" Gibt eine Liste aller Dateien unter Versionskontrolle für die "
+"angegebene\n"
+" Revision aus. Wenn keine Revision angegeben wird, wird die erste\n"
+" Vorgängerversion des Arbeitsverzeichnis genutzt oder die Spitze (tip)\n"
+" falls keine Revision ausgecheckt ist.\n"
"\n"
" Mit dem Schalter -v werden zusätzlich zum Dateinamen auch die Rechte "
"und\n"
@@ -6390,26 +6438,29 @@
msgid ""
"merge working directory with another revision\n"
"\n"
-" Merge the contents of the current working directory and the\n"
-" requested revision. Files that changed between either parent are\n"
-" marked as changed for the next commit and a commit must be\n"
-" performed before any further updates are allowed.\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"
+"\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"
"\n"
" If no revision is specified, the working directory's parent is a\n"
-" head revision, and the current branch contains exactly one other head,\n"
-" the other head is merged with by default. Otherwise, an explicit\n"
-" revision to merge with must be provided.\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"
" "
msgstr ""
"Führt das Arbeitsverzeichnis mit einer anderen Revision zusammen\n"
"\n"
" Wendet die Änderungen der angegebenen Revision (seit einem gemeinsamen\n"
-" Vorfahr) im Arbeitsverzeichnis an. Diese müssen mit \"hg commit\" "
-"zunächst\n"
-" übernommen werden, bevor weitere Änderungen (add, delete, merge) zuge-\n"
-" lassen werden.\n"
-"\n"
-" Nach dem Übernehmen hat die neue Revision zwei Vorfahren.\n"
+" Vorfahr) im Arbeitsverzeichnis an.\n"
+"\n"
+" Dateien, die in sich in einer der beiden Vorgängerversionen änderten\n"
+" werden als verändert markiert und es muss 'hg commit' ausgeführt bevor\n"
+" weitere Änderungen durchgeführt werden dürfen. Nach dem Übernehmen hat\n"
+" die neue Revision zwei Vorfahren.\n"
"\n"
" Wenn keine Revision angegeben wird und der Vorgänger des Arbeits-\n"
" verzeichnisses eine Kopfversion eines Zweiges mit genau zwei Köpfen "
@@ -6442,13 +6493,13 @@
"Arbeitsverzeichnis ist keine Kopfversion - Nutze \"hg update\" oder gib eine "
"explizite Revision an"
+
msgid ""
"show changesets not found in destination\n"
"\n"
-" Show changesets not found in the specified destination repository or\n"
-" the default push location. These are the changesets that would be "
-"pushed\n"
-" if a push was requested.\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"
" "
@@ -6457,19 +6508,20 @@
"\n"
" Zeigt alle Änderungssätze des lokalen Archivs, die nicht im angegebenen\n"
" Zielarchiv oder dem Standardziel vorhanden sind. Dies sind genau jene,\n"
-" die durch ein \"hg push\" übertragen werden würden.\n"
-"\n"
-" Siehe Hilfe zu \"push\" für das Format der Zeilangabe.\n"
-" "
-
-msgid ""
-"show the parents of the working dir or revision\n"
-"\n"
-" Print the working directory's parent revisions. If a\n"
-" revision is given via --rev, the parent of that revision\n"
-" will be printed. If a file argument is given, revision in\n"
-" which the file was last changed (before the working directory\n"
-" revision or the argument to --rev if given) is printed.\n"
+" die durch ein 'hg push' übertragen werden würden.\n"
+"\n"
+" Siehe Hilfe zu 'pull' für das Format der Zieladresse.\n"
+" "
+
+
+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"
" "
msgstr ""
"Zeigt die Vorgänger des Arbeitsverzeichnisses oder einer Revision\n"
@@ -6492,8 +6544,8 @@
msgid ""
"show aliases for remote repositories\n"
"\n"
-" Show definition of symbolic path name NAME. If no name is given, show\n"
-" definition of available names.\n"
+" Show definition of symbolic path name NAME. If no name is given,\n"
+" show definition of 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"
@@ -6503,7 +6555,8 @@
msgstr ""
"Zeigt Adresse für Aliasnamen von entfernten Projektarchiven an\n"
"\n"
-" Zeigt die Adressdefinition des Kurznamens NAME an. Wenn kein Name gegeben\n"
+" Zeigt die Adressdefinition des Kurznamens NAME an. Wenn kein Name "
+"gegeben\n"
" ist, werden alle Alias-Definitionen angezeigt.\n"
"\n"
" Kurznamen für entfernte Archive werden im Abschnitt [paths] der Dateien\n"
@@ -6529,12 +6582,15 @@
msgid ""
"pull changes from the specified source\n"
"\n"
-" Pull changes from a remote repository to a local one.\n"
+" Pull changes from a remote repository to the 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"
+"\n"
" If SOURCE is omitted, the 'default' path will be used.\n"
" See 'hg help urls' for more information.\n"
" "
@@ -6547,7 +6603,11 @@
" URL gesucht und dem lokalen Archiv hinzugefügt. Standardmäßig\n"
" wird die Kopie des Projektes im Arbeitsverzeichnis nicht aktualisiert.\n"
"\n"
-" Beim Weglassen der QUELLE wird standardmäßig der 'default'-Pfad genutzt.\n"
+" Um zu sehen, was beim nächsten 'pull' geholt würde, ohne dem Archiv\n"
+" tatsächlich Änderungen hinzuzufügen, nutze hg incoming.\n"
+"\n"
+" Beim Weglassen der QUELLE wird standardmäßig der 'default'-Pfad "
+"genutzt.\n"
" Siehe Hilfe zu \"paths\" zu Pfad-Kurznamen und \"urls\" für erlaubte\n"
" Formate für die Quellangabe.\n"
" "
@@ -6564,20 +6624,20 @@
"\n"
" Push changes from the local repository to the given destination.\n"
"\n"
-" This is the symmetrical operation for pull. It helps to move\n"
-" changes from the current repository to a different one. If the\n"
-" destination is local this is identical to a pull in that directory\n"
-" from the current one.\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"
" the client has forgotten to pull and merge before pushing.\n"
"\n"
-" If -r is used, the named changeset and all its ancestors will be pushed\n"
-" to the remote repository.\n"
-"\n"
-" Look at the help text for urls for important details about ssh:// URLs.\n"
-" If DESTINATION is omitted, a default path will be used.\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"
+" URLs. If DESTINATION is omitted, a default path will be used.\n"
" See 'hg help urls' for more information.\n"
" "
msgstr ""
@@ -6591,16 +6651,16 @@
"\n"
" Im Regelfall wird \"hg push\" die Ausführung verweigern, wenn das\n"
" Resultat die Anzahl der Kopfversionen im entfernten Archiv erhöht, da\n"
-" dies normalerweise bedeutet, dass der Nutzer vergessen hat vor der Über-\n"
+" dies normalerweise bedeutet, dass der Nutzer vergessen hat vor der "
+"Über-\n"
" tragung die entfernten Änderungen zu holen und zusammenzuführen.\n"
-" Mit der -f/--force Option kann eine Übertragung erzwungen werden.\n"
"\n"
" Bei Nutzung von -r wird die benannte Revision mit allen Vorgängern in\n"
" das entfernte Archiv übertragen.\n"
"\n"
-" Beim Weglassen des ZIELs wird standardmäßig der 'default'-Pfad genutzt.\n"
-" Siehe Hilfe zu \"paths\" zu Pfad-Kurznamen und \"urls\" für erlaubte\n"
-" Formate für die Zielangabe.\n"
+" Für wichtige Details zu ssh://-URLS kann die URL-Hilfe zu Rate gezogen\n"
+" werden. Beim Weglassen des ZIELs wird standardmäßig der 'default'-Pfad\n"
+" genutzt. Weitere Hilfe gibt unter 'hg help urls'.\n"
" "
#, python-format
@@ -6631,32 +6691,38 @@
"\n"
" Recover from an interrupted commit or pull.\n"
"\n"
-" This command tries to fix the repository status after an interrupted\n"
-" operation. It should only be necessary when Mercurial suggests it.\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 ""
"Setzt eine unterbrochene Transaktion zurück\n"
"\n"
-" Setzt ein unterbrochenes Übernehmen (commit) oder Abholen (pull) zurück.\n"
-"\n"
-" Der ungültige Status durch die Unterbrechung wird repariert. Dies sollte\n"
+" Setzt ein unterbrochenes Übernehmen (commit) oder Abholen (pull) "
+"zurück.\n"
+"\n"
+" Der ungültige Status durch die Unterbrechung wird repariert. Dies "
+"sollte\n"
" nur dann nötig sein, wenn eine Meldung von Mercurial es vorschlägt.\n"
" "
+
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 entire\n"
-" project history. -A can be used to remove only files that have already\n"
-" been deleted, -f can be used to force deletion, and -Af can be used\n"
-" to remove files from the next revision without deleting them.\n"
-"\n"
-" The following table details the behavior of remove for different file\n"
-" states (columns) and option combinations (rows). The file states are\n"
-" Added, Clean, Modified and Missing (as reported by hg status). The\n"
-" actions are Warn, Remove (from branch) and Delete (from disk).\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.\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"
@@ -6712,15 +6778,16 @@
msgid "has been marked for add"
msgstr "Wurde als hinzugefügt markiert"
+
msgid ""
"rename files; equivalent of copy + remove\n"
"\n"
-" Mark dest as copies of sources; mark sources for deletion. If\n"
-" dest is a directory, copies are put in that directory. If dest is\n"
-" a file, there can only be one source.\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 --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 at the next commit. To undo a rename\n"
@@ -6742,34 +6809,44 @@
"\n"
" Die neue Datei wird wie üblich nicht sofort übernommen, sondern "
"existiert\n"
-" als lokale Änderung im Arbeitsverzeichnis. Die Umbenennung kann durch\n"
+" als lokale Änderung im Arbeitsverzeichnis. Die Umbenennung kann durch\n"
" \"hg revert\" rückgängig gemacht werden.\n"
" "
+#, fuzzy
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 switch.\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 will also allow listing resolved files and manually\n"
-" marking and unmarking files as resolved.\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"
" "
msgstr ""
-"Führt eine lokal geänderte Datei mit Änderungen erneut zusammen\n"
+"Wiederholt Dateizusammenführungen einer Zusammenführung oder einer "
+"Aktualisierung\n"
"\n"
" Änderungen, die einen Konflikt erzeugt haben, werden erneut auf die\n"
-" Version einer Datei angewendet, wie sie vor der konflikterzeugenden Aktion\n"
-" im Arbeitsverzeichnis vorlag. Dies macht manuelle Versuche, den Konflikt\n"
+" Version einer Datei angewendet, wie sie vor der konflikterzeugenden "
+"Aktion\n"
+" im Arbeitsverzeichnis vorlag. Dies macht manuelle Versuche, den "
+"Konflikt\n"
" zu lösen, rückgängig.\n"
" Mit der Option --all wird dies an allen markierten Dateien ausgeführt.\n"
"\n"
-" Die Optionen --mark und --unmark markieren Konflikte als aufgelöst, bzw.\n"
+" Die Optionen --mark und --unmark markieren Konflikte als aufgelöst, "
+"bzw.\n"
" heben dies wieder auf. Der aktuelle Status wird mit --list angezeigt.\n"
"\n"
" Die verwendeten Zeichen bei --list bedeuten:\n"
@@ -6787,10 +6864,10 @@
msgstr "Keine Dateien oder Verzeichnisse angegeben; nutze --all für alle"
msgid ""
-"restore individual files or dirs to an earlier state\n"
+"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 dir parents)\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"
@@ -6799,10 +6876,10 @@
" working directory has two parents, you must explicitly specify the\n"
" revision to revert to.\n"
"\n"
-" Using the -r option, revert the given files or directories to their\n"
-" contents as of a specific revision. This can be helpful to \"roll\n"
-" back\" some or all of an earlier change.\n"
-" See 'hg help dates' for a list of formats valid for -d/--date.\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"
@@ -6810,8 +6887,8 @@
" directory, the reverted files will thus appear modified\n"
" afterwards.\n"
"\n"
-" If a file has been deleted, it is restored. If the executable\n"
-" mode of a file was changed, it is reset.\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"
@@ -6880,7 +6957,7 @@
msgstr ""
msgid ""
-"print the root (top) of the current working dir\n"
+"print the root (top) of the current working directory\n"
"\n"
" Print the root directory of the current repository.\n"
" "
@@ -6892,7 +6969,7 @@
" 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\" and \"-E\" options to log to files.\n"
+" stderr. Use the -A and -E options to log to files.\n"
" "
msgstr ""
"Exportiert das Projektarchiv via HTTP\n"
@@ -6913,12 +6990,13 @@
"\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 is given. Unless options described\n"
-" with \"show only ...\" are given, the options -mardu are used.\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"
"\n"
" Option -q/--quiet hides untracked (unknown and ignored) files\n"
-" unless explicitly requested with -u/--unknown or -i/-ignored.\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"
@@ -6933,7 +7011,7 @@
" A = added\n"
" R = removed\n"
" C = clean\n"
-" ! = deleted, but still tracked\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"
@@ -6972,7 +7050,8 @@
" A = hinzugefügt (added)\n"
" R = entfernt (removed)\n"
" C = unverändert (clean)\n"
-" ! = gelöscht, aber immer noch überwacht\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"
@@ -6987,8 +7066,8 @@
" 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 used,\n"
-" or tip if no revision is checked out.\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"
@@ -7015,7 +7094,11 @@
msgstr ""
#, python-format
-msgid "tag '%s' is not a %s tag"
+msgid "tag '%s' is not a global tag"
+msgstr ""
+
+#, python-format
+msgid "tag '%s' is not a local tag"
msgstr ""
#, python-format
@@ -7033,8 +7116,8 @@
msgid ""
"list repository tags\n"
"\n"
-" This lists both regular and local tags. When the -v/--verbose switch\n"
-" is used, a third column \"local\" is printed for local tags.\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 ""
@@ -7060,32 +7143,36 @@
" "
msgstr ""
+
msgid ""
"update working directory\n"
"\n"
-" Update the repository's working directory to the specified revision,\n"
-" or the tip of the current branch if none is specified. Use null as\n"
-" the revision to remove the working copy (like 'hg clone -U').\n"
-"\n"
-" When the working dir contains no uncommitted changes, it will be\n"
-" replaced by the state of the requested revision from the repo. When\n"
-" the requested revision is on a different branch, the working dir\n"
-" will additionally be switched to that branch.\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 to discard them,\n"
-" forcibly replacing the state of the working dir with the requested\n"
-" revision.\n"
+" forcibly replacing the state of the working directory with the\n"
+" requested revision.\n"
"\n"
" When there are uncommitted changes and option -C is not used, and\n"
" the parent revision and requested revision are on the same branch,\n"
" and one of them is an ancestor of the other, then the new working\n"
" directory will contain the requested revision merged with the\n"
-" uncommitted changes. Otherwise, the update will fail with a\n"
+" uncommitted changes. Otherwise, the update will fail with a\n"
" suggestion to use 'merge' or 'update -C' instead.\n"
"\n"
-" If you want to update just one file to an older revision, use revert.\n"
-"\n"
-" See 'hg help dates' for a list of formats valid for --date.\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 ""
"Aktualisiert das Arbeitsverzeichnis\n"
@@ -7130,23 +7217,6 @@
" integrity of their crosslinks and indices.\n"
" "
msgstr ""
-"Sucht ein Muster in angegebenen Dateien und Revisionen\n"
-"\n"
-" Durchsucht Dateien in der Versionshistorie nach einem gegebenen Muster.\n"
-"\n"
-" Dieses Kommando unterscheidet sich von Unix grep, da es Reguläre "
-"Ausdrücke\n"
-" in Python/Perl Format erwartet und ausserdem nur die übernommenen "
-"Revisionen\n"
-" im Archiv durchsucht, nicht jedoch das Arbeitsverzeichnis.\n"
-"\n"
-" Standardmäßig gibt grep den Dateinamen und die jüngste Revision einer "
-"Datei\n"
-" aus, die das Suchmuster enthält. Mit der Option --all werden "
-"stattdessen\n"
-" alle Revisionen ausgegeben, in der das Muster hinzugefügt (\"+\") oder\n"
-" entfernt (\"-\") wurde.\n"
-" "
msgid "output version and copyright information"
msgstr ""
@@ -7192,9 +7262,6 @@
msgid "set the charset encoding mode"
msgstr "Setzt den Modus der Zeichenkodierung"
-msgid "print improved command execution profile"
-msgstr "Gibt erweitertes Ausführungsprofil der Befehle aus"
-
msgid "print traceback on exception"
msgstr "Gibt den Traceback einer Exception aus"
@@ -7491,7 +7558,7 @@
msgid "ignore case when matching"
msgstr ""
-msgid "print only filenames and revs that match"
+msgid "print only filenames and revisions that match"
msgstr ""
msgid "print matching line numbers"
@@ -7503,7 +7570,7 @@
msgid "[OPTION]... PATTERN [FILE]..."
msgstr ""
-msgid "show only heads which are descendants of rev"
+msgid "show only heads which are descendants of REV"
msgstr ""
msgid "show only the active heads from open branches"
@@ -7515,8 +7582,8 @@
msgid "[TOPIC]"
msgstr ""
-msgid "identify the specified rev"
-msgstr ""
+msgid "identify the specified revision"
+msgstr "Identifiziert die angegebene Revision"
msgid "show local revision number"
msgstr ""
@@ -7534,8 +7601,8 @@
msgstr ""
msgid ""
-"directory strip option for patch. This has the same\n"
-"meaning as the corresponding patch option"
+"directory strip option for patch. This has the same meaning as the "
+"corresponding patch option"
msgstr ""
msgid "base path"
@@ -7550,7 +7617,7 @@
msgid "apply patch to the nodes from which it was generated"
msgstr ""
-msgid "Use any branch information in patch (implied by --exact)"
+msgid "use any branch information in patch (implied by --exact)"
msgstr ""
msgid "[OPTION]... PATCH..."
@@ -7571,7 +7638,7 @@
msgid "[-e CMD] [--remotecmd CMD] [DEST]"
msgstr ""
-msgid "search the repository as it stood at rev"
+msgid "search the repository as it stood at REV"
msgstr ""
msgid "end filenames with NUL, for use with xargs"
@@ -7586,7 +7653,7 @@
msgid "only follow the first parent of merge changesets"
msgstr "Folgt nur dem ersten Vorgänger einer Zusammenführungsversion"
-msgid "show revs matching date spec"
+msgid "show revisions matching date spec"
msgstr "Zeigt Revisionen passend zur Datums-Spezifikation"
msgid "show copied files"
@@ -7595,13 +7662,13 @@
msgid "do case-insensitive search for a keyword"
msgstr "Sucht unabhängig von Groß- und Kleinschreibung ein Stichwort"
-msgid "include revs where files were removed"
+msgid "include revisions where files were removed"
msgstr "Revisionen hinzufügen, in denen Dateien entfernt wurden"
msgid "show only merges"
msgstr "Zeigt nur Zusammenführungen"
-msgid "revs committed by user"
+msgid "revisions committed by user"
msgstr "Revisionen erzeugt vom Nutzer"
msgid "show only changesets within the given named branch"
@@ -7634,7 +7701,7 @@
msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
msgstr "[-M] [-p] [-n] [-f] [-r REV]... [ZIEL]"
-msgid "show parents from the specified rev"
+msgid "show parents from the specified revision"
msgstr "Zeigt die Vorgänger der angegeben Revision"
msgid "hg parents [-r REV] [FILE]"
@@ -7709,11 +7776,11 @@
msgid "prefix path to serve from (default: server root)"
msgstr "Pfadpräfix von dem ausgeliefert wird (Standard: Serverwurzel '/')"
-msgid "name to show in web pages (default: working dir)"
+msgid "name to show in web pages (default: working directory)"
msgstr ""
"Name der auf der Webseite angezeigt wird (Standard: Arbeitsverzeichnis)"
-msgid "name of the webdir config file (serve more than one repo)"
+msgid "name of the webdir config file (serve more than one repository)"
msgstr "Name der webdir-Konfigurationsdatei (mehr als ein Archiv ausliefern)"
msgid "for remote clients"
@@ -8006,7 +8073,8 @@
msgid "invalid arguments"
msgstr ""
-msgid "exception raised - generating profile anyway\n"
+#, python-format
+msgid "unrecognized profiling format '%s' - Ignored\n"
msgstr ""
msgid ""
@@ -8096,6 +8164,7 @@
msgid "Date Formats"
msgstr "Datumsformate"
+
msgid ""
"\n"
" Some commands allow the user to specify a date, e.g.:\n"
@@ -8123,9 +8192,9 @@
" \"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). offset\n"
-" is the offset of the local timezone, in seconds west of UTC (negative\n"
-" if the timezone is east of UTC).\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"
@@ -8288,10 +8357,10 @@
msgid ""
"\n"
"HG::\n"
-" Path to the 'hg' executable, automatically passed when running hooks,\n"
-" extensions or external tools. If unset or empty, this is the hg\n"
-" executable's name if it's frozen, or an executable named 'hg'\n"
-" (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\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"
@@ -8352,32 +8421,32 @@
" 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\n"
-" for a user to modify, for example when writing commit messages.\n"
-" The editor it uses is determined by looking at the environment\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 set\n"
-" appropriately if this Mercurial is not installed system-wide.\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 "Angabe Einzelner Revisionen"
-msgid ""
-"\n"
-" Mercurial supports several ways to specify individual\n"
-" revisions.\n"
-"\n"
-" A plain integer is treated as a revision number. Negative\n"
-" integers are treated as topological offsets from the tip, with\n"
-" -1 denoting the tip. As such, negative numbers are only useful\n"
-" if you've memorized your local tree numbers and want to save\n"
-" typing a single digit. This editor suggests copy and paste.\n"
+
+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 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"
"\n"
" A 40-digit hexadecimal string is treated as a unique revision\n"
" identifier.\n"
@@ -8398,9 +8467,9 @@
" 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.\n"
-" If an uncommitted merge is in progress, \".\" is the revision of\n"
-" the first parent.\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 ""
"\n"
@@ -8443,6 +8512,7 @@
msgid "Specifying Multiple Revisions"
msgstr "Angabe Mehrerer Revisionen"
+
msgid ""
"\n"
" When Mercurial accepts more than one revision, they may be\n"
@@ -8452,8 +8522,8 @@
" 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\n"
-" means \"all revisions\".\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"
@@ -8487,9 +8557,10 @@
msgid ""
"\n"
-" Mercurial's default format for showing changes between two versions\n"
-" of a file is compatible with the unified format of GNU diff, which\n"
-" can be used by GNU patch and many other standard tools.\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"
@@ -8507,15 +8578,16 @@
" 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 extra\n"
-" information is lost. Mercurial's internal operations (like push and\n"
-" pull) are not affected by this, because they use an internal binary\n"
-" format for communicating changes.\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 the\n"
-" [diff] section of your hgrc. You do not need to set this option when\n"
-" importing diffs in this format or using them in the mq extension.\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 ""
@@ -8525,51 +8597,52 @@
msgid ""
"\n"
" Mercurial allows you to customize output of commands through\n"
-" templates. You can either pass in a template from the command line,\n"
-" via the --template option, or select an existing template-style (--"
-"style).\n"
-"\n"
-" You can customize output for any \"log-like\" command: log, outgoing,\n"
-" incoming, tip, parents, heads and glog.\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. Usage:\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 "
-"expansion:\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 keywords\n"
-" are usually available for templating a log-like command:\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 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 format:\n"
-" \"modified files: +added/-removed lines\"\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 40-character\n"
-" hexadecimal string.\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"
"\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 it.\n"
-" Filters are functions which return a string based on the input "
-"variable.\n"
-" You can also use a chain of filters to get the desired output:\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"
@@ -8587,11 +8660,11 @@
"\".\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 email\n"
-" address, and extracts just the domain component.\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 at example.com>' becomes 'example.com'.\n"
-" - email: Any text. Extracts the first string that looks like an email\n"
-" address. Example: 'User <user at example.com>' becomes\n"
+" - email: Any text. Extracts the first string that looks like an\n"
+" email address. Example: 'User <user at example.com>' becomes\n"
" 'user at example.com'.\n"
" - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
" \"<\" and \">\" with XML entities.\n"
@@ -8601,25 +8674,25 @@
" - 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"
-" - obfuscate: Any text. Returns the input text rendered as a sequence\n"
-" of XML entities.\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 hash,\n"
-" i.e. a 12-byte hexadecimal string.\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 the\n"
-" first starting with a tab character.\n"
-" - urlescape: Any text. Escapes all \"special\" characters. For example,\n"
-" \"foo bar\" becomes \"foo%20bar\".\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"
" "
msgstr ""
-msgid "Url Paths"
-msgstr "Url-Pfade"
+msgid "URL Paths"
+msgstr "URL-Pfade"
msgid ""
"\n"
@@ -8638,43 +8711,45 @@
" or changeset to use from the remote repository.\n"
"\n"
" Some features, such as pushing to http:// and https:// URLs are\n"
-" only possible if the feature is explicitly enabled on the\n"
-" remote Mercurial server.\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"
-" - SSH requires an accessible shell account on the destination machine\n"
-" and a copy of hg in the remote path or specified with as remotecmd.\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"
" ssh://example.com//tmp/repository\n"
-" - Mercurial doesn't use its own compression via SSH; the right thing\n"
-" to do is to configure it in your ~/.ssh/config, e.g.:\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"
" Host *.mylocalnetwork.example.com\n"
" Compression no\n"
" Host *\n"
" Compression yes\n"
-" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-" with the --ssh command line option.\n"
-"\n"
-" These urls can all be stored in your hgrc with path aliases under the\n"
-" [paths] section like so:\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"
"\n"
-" You can then use the alias for any command that uses a url (for example\n"
-" 'hg pull alias1' would pull from the 'alias1' path).\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"
+" 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 saves\n"
-" the location of the source repository as the new repository's\n"
-" 'default' path. This is then used when you omit path from push-\n"
-" and pull-like commands (including in and out).\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"
@@ -8739,9 +8814,8 @@
" Bei Erstellung eines Projektarchivs mit hg clone, sichert der clone\n"
" Befehl die Herkunft des Quellarchivs als 'default'-Pfad des neuen\n"
" Archivs. Dieser Pfad wird immer dann genutzt, wenn bei 'push' oder\n"
-" 'pull'-ähnlichen Befehlen der Pfad nicht angegeben wurde (auch bei "
-"'in'\n"
-" oder 'out').\n"
+" 'pull'-ähnlichen Befehlen der Pfad nicht angegeben wurde (auch bei\n"
+" 'incoming' oder 'outgoing').\n"
"\n"
" default-push:\n"
" Der 'push'-Befehl sucht nach dem 'default-push'-Alias und zieht\n"
@@ -9507,6 +9581,10 @@
msgid "index %s unknown format %d"
msgstr ""
+#, python-format
+msgid "index %s is corrupted"
+msgstr ""
+
msgid "no node"
msgstr ""
@@ -9710,10 +9788,6 @@
msgstr "HTTP Auth: Benutzer %s, Passwort%s\n"
#, python-format
-msgid "%s, please check your locale settings"
-msgstr "%s, bitte überprüfe deine locale Einstellungen"
-
-#, python-format
msgid "command '%s' failed: %s"
msgstr "Befehl '%s' fehlgeschlagen: %s"
More information about the Mercurial-devel
mailing list