Show More
This diff has been collapsed as it changes many lines, (1778 lines changed) Show them Hide them | |||||
@@ -22,8 +22,8 b' msgid ""' | |||||
22 | msgstr "" |
|
22 | msgstr "" | |
23 | "Project-Id-Version: Mercurial\n" |
|
23 | "Project-Id-Version: Mercurial\n" | |
24 | "Report-Msgid-Bugs-To: \n" |
|
24 | "Report-Msgid-Bugs-To: \n" | |
25 |
"POT-Creation-Date: 2009-04-0 |
|
25 | "POT-Creation-Date: 2009-04-10 10:49+0200\n" | |
26 |
"PO-Revision-Date: 2009-04-04 1 |
|
26 | "PO-Revision-Date: 2009-04-04 16:11+0200\n" | |
27 | "Last-Translator: Tobias Bell <tobias.bell@gmail.com>\n" |
|
27 | "Last-Translator: Tobias Bell <tobias.bell@gmail.com>\n" | |
28 | "Language-Team: German (Tobias Bell, Fabian Kreutz, Lutz Horn)\n" |
|
28 | "Language-Team: German (Tobias Bell, Fabian Kreutz, Lutz Horn)\n" | |
29 | "MIME-Version: 1.0\n" |
|
29 | "MIME-Version: 1.0\n" | |
@@ -127,7 +127,6 b' msgstr "*** [alias] %s: zirkul\xc3\xa4re Abh\xc3\xa4ngigkeit auf %s"' | |||||
127 | msgid "*** [alias] %s: no definition\n" |
|
127 | msgid "*** [alias] %s: no definition\n" | |
128 | msgstr "*** [alias] %s: nicht definiert\n" |
|
128 | msgstr "*** [alias] %s: nicht definiert\n" | |
129 |
|
129 | |||
130 | # Nicht übersetzen |
|
|||
131 | msgid "" |
|
130 | msgid "" | |
132 | "mercurial bookmarks\n" |
|
131 | "mercurial bookmarks\n" | |
133 | "\n" |
|
132 | "\n" | |
@@ -139,16 +138,15 b' msgid ""' | |||||
139 | "It is possible to use bookmark names in every revision lookup (e.g. hg\n" |
|
138 | "It is possible to use bookmark names in every revision lookup (e.g. hg\n" | |
140 | "merge, hg update).\n" |
|
139 | "merge, hg update).\n" | |
141 | "\n" |
|
140 | "\n" | |
142 |
"The bookmark extension offers the possiblity to have a more git-like |
|
141 | "The bookmark extension offers the possiblity to have a more git-like\n" | |
143 | "experience\n" |
|
142 | "experience by adding the following configuration option to your .hgrc:\n" | |
144 | "by adding the following configuration option to your .hgrc:\n" |
|
|||
145 | "\n" |
|
143 | "\n" | |
146 | "[bookmarks]\n" |
|
144 | "[bookmarks]\n" | |
147 | "track.current = True\n" |
|
145 | "track.current = True\n" | |
148 | "\n" |
|
146 | "\n" | |
149 |
"This will cause bookmarks to track the bookmark that you are currently |
|
147 | "This will cause bookmarks to track the bookmark that you are currently\n" | |
150 | "and\n" |
|
148 | "on, and just updates it. This is similar to git's approach of\n" | |
151 | "just updates it. This is similar to git's approach of branching.\n" |
|
149 | "branching.\n" | |
152 | msgstr "" |
|
150 | msgstr "" | |
153 |
|
151 | |||
154 | # Nicht übersetzen |
|
152 | # Nicht übersetzen | |
@@ -199,8 +197,8 b' msgid ""' | |||||
199 | "\n" |
|
197 | "\n" | |
200 | " Bookmarks are pointers to certain commits that move when\n" |
|
198 | " Bookmarks are pointers to certain commits that move when\n" | |
201 | " commiting. Bookmarks are local. They can be renamed, copied and\n" |
|
199 | " commiting. Bookmarks are local. They can be renamed, copied and\n" | |
202 |
" deleted. It is possible to use bookmark names in 'hg merge' and |
|
200 | " deleted. It is possible to use bookmark names in 'hg merge' and\n" | |
203 | " update' to update to a given bookmark.\n" |
|
201 | " 'hg update' to update to a given bookmark.\n" | |
204 | "\n" |
|
202 | "\n" | |
205 | " You can use 'hg bookmark NAME' to set a bookmark on the current\n" |
|
203 | " You can use 'hg bookmark NAME' to set a bookmark on the current\n" | |
206 | " tip with the given name. If you specify a revision using -r REV\n" |
|
204 | " tip with the given name. If you specify a revision using -r REV\n" | |
@@ -208,7 +206,7 b' msgid ""' | |||||
208 | " that revision.\n" |
|
206 | " that revision.\n" | |
209 | " " |
|
207 | " " | |
210 | msgstr "" |
|
208 | msgstr "" | |
211 |
" |
|
209 | "Mercurial Lesezeichen\n" | |
212 | "\n" |
|
210 | "\n" | |
213 | " Lesezeichen sind Zeiger auf bestimmte Versionen, die mitwandern,\n" |
|
211 | " Lesezeichen sind Zeiger auf bestimmte Versionen, die mitwandern,\n" | |
214 | " wenn eine neuen Version erzeugt wird. Lesezeichen sind nur lokal.\n" |
|
212 | " wenn eine neuen Version erzeugt wird. Lesezeichen sind nur lokal.\n" | |
@@ -288,84 +286,76 b' msgid ""' | |||||
288 | "Bugzilla integration\n" |
|
286 | "Bugzilla integration\n" | |
289 | "\n" |
|
287 | "\n" | |
290 | "This hook extension adds comments on bugs in Bugzilla when changesets\n" |
|
288 | "This hook extension adds comments on bugs in Bugzilla when changesets\n" | |
291 |
"that refer to bugs by Bugzilla ID are seen. The hook does not change |
|
289 | "that refer to bugs by Bugzilla ID are seen. The hook does not change\n" | |
292 | "status.\n" |
|
290 | "bug status.\n" | |
293 | "\n" |
|
291 | "\n" | |
294 |
"The hook updates the Bugzilla database directly. Only Bugzilla |
|
292 | "The hook updates the Bugzilla database directly. Only Bugzilla\n" | |
295 | "installations\n" |
|
293 | "installations using MySQL are supported.\n" | |
296 | "using MySQL are supported.\n" |
|
294 | "\n" | |
297 | "\n" |
|
295 | "The hook relies on a Bugzilla script to send bug change notification\n" | |
298 | "The hook relies on a Bugzilla script to send bug change notification " |
|
296 | "emails. That script changes between Bugzilla versions; the\n" | |
299 | "emails.\n" |
|
297 | "'processmail' script used prior to 2.18 is replaced in 2.18 and\n" | |
300 | "That script changes between Bugzilla versions; the 'processmail' script " |
|
298 | "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" | |
301 | "used\n" |
|
299 | "be run by Mercurial as the user pushing the change; you will need to\n" | |
302 | "prior to 2.18 is replaced in 2.18 and subsequent versions by\n" |
|
300 | "ensure the Bugzilla install file permissions are set appropriately.\n" | |
303 | "'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " |
|
|||
304 | "user\n" |
|
|||
305 | "pushing the change; you will need to ensure the Bugzilla install file\n" |
|
|||
306 | "permissions are set appropriately.\n" |
|
|||
307 | "\n" |
|
301 | "\n" | |
308 | "Configuring the extension:\n" |
|
302 | "Configuring the extension:\n" | |
309 | "\n" |
|
303 | "\n" | |
310 | " [bugzilla]\n" |
|
304 | " [bugzilla]\n" | |
311 | " host Hostname of the MySQL server holding the Bugzilla database.\n" |
|
305 | "\n" | |
|
306 | " host Hostname of the MySQL server holding the Bugzilla\n" | |||
|
307 | " database.\n" | |||
312 | " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" |
|
308 | " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" | |
313 | " user Username to use to access MySQL server. Default 'bugs'.\n" |
|
309 | " user Username to use to access MySQL server. Default 'bugs'.\n" | |
314 | " password Password to use to access MySQL server.\n" |
|
310 | " password Password to use to access MySQL server.\n" | |
315 | " timeout Database connection timeout (seconds). Default 5.\n" |
|
311 | " timeout Database connection timeout (seconds). Default 5.\n" | |
316 |
" version Bugzilla version. Specify '3.0' for Bugzilla versions |
|
312 | " version Bugzilla version. Specify '3.0' for Bugzilla versions\n" | |
317 | "and\n" |
|
313 | " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" | |
318 | " later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" |
|
314 | " and '2.16' for versions prior to 2.18.\n" | |
319 | " versions prior to 2.18.\n" |
|
|||
320 | " bzuser Fallback Bugzilla user name to record comments with, if\n" |
|
315 | " bzuser Fallback Bugzilla user name to record comments with, if\n" | |
321 | " changeset committer cannot be found as a Bugzilla user.\n" |
|
316 | " changeset committer cannot be found as a Bugzilla user.\n" | |
322 | " bzdir Bugzilla install directory. Used by default notify.\n" |
|
317 | " bzdir Bugzilla install directory. Used by default notify.\n" | |
323 | " Default '/var/www/html/bugzilla'.\n" |
|
318 | " Default '/var/www/html/bugzilla'.\n" | |
324 | " notify The command to run to get Bugzilla to send bug change\n" |
|
319 | " notify The command to run to get Bugzilla to send bug change\n" | |
325 |
" notification emails. Substitutes from a map with 3 |
|
320 | " notification emails. Substitutes from a map with 3\n" | |
326 |
" 'bzdir', 'id' (bug id) and 'user' (committer |
|
321 | " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" | |
327 | "email).\n" |
|
322 | " bugzilla email). Default depends on version; from 2.18\n" | |
328 | " Default depends on version; from 2.18 it is\n" |
|
323 | " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" | |
329 | " \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %" |
|
324 | " %(id)s %(user)s\".\n" | |
330 | "(user)s\".\n" |
|
325 | " regexp Regular expression to match bug IDs in changeset commit\n" | |
331 | " regexp Regular expression to match bug IDs in changeset commit " |
|
326 | " message. Must contain one \"()\" group. The default\n" | |
332 | "message.\n" |
|
327 | " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" | |
333 | " Must contain one \"()\" group. The default expression " |
|
328 | " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" | |
334 | "matches\n" |
|
329 | " variations thereof. Matching is case insensitive.\n" | |
335 | " 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" |
|
|||
336 | " 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations " |
|
|||
337 | "thereof.\n" |
|
|||
338 | " Matching is case insensitive.\n" |
|
|||
339 | " style The style file to use when formatting comments.\n" |
|
330 | " style The style file to use when formatting comments.\n" | |
340 | " template Template to use when formatting comments. Overrides\n" |
|
331 | " template Template to use when formatting comments. Overrides\n" | |
341 | " style if specified. In addition to the usual Mercurial\n" |
|
332 | " style if specified. In addition to the usual Mercurial\n" | |
342 | " keywords, the extension specifies:\n" |
|
333 | " keywords, the extension specifies:\n" | |
343 | " {bug} The Bugzilla bug ID.\n" |
|
334 | " {bug} The Bugzilla bug ID.\n" | |
344 |
" {root} The full pathname of the Mercurial |
|
335 | " {root} The full pathname of the Mercurial\n" | |
345 | "repository.\n" |
|
336 | " repository.\n" | |
346 |
" {webroot} Stripped pathname of the Mercurial |
|
337 | " {webroot} Stripped pathname of the Mercurial\n" | |
347 | "repository.\n" |
|
338 | " repository.\n" | |
348 |
" {hgweb} Base URL for browsing Mercurial |
|
339 | " {hgweb} Base URL for browsing Mercurial\n" | |
349 | "repositories.\n" |
|
340 | " repositories.\n" | |
350 | " Default 'changeset {node|short} in repo {root} refers '\n" |
|
341 | " Default 'changeset {node|short} in repo {root} refers '\n" | |
351 | " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" |
|
342 | " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" | |
352 | " strip The number of slashes to strip from the front of {root}\n" |
|
343 | " strip The number of slashes to strip from the front of {root}\n" | |
353 | " to produce {webroot}. Default 0.\n" |
|
344 | " to produce {webroot}. Default 0.\n" | |
354 |
" usermap Path of file containing Mercurial committer ID to |
|
345 | " usermap Path of file containing Mercurial committer ID to\n" | |
355 | "user\n" |
|
346 | " Bugzilla user ID mappings. If specified, the file\n" | |
356 | " ID mappings. If specified, the file should contain one " |
|
347 | " should contain one mapping per line,\n" | |
357 | "mapping\n" |
|
348 | " \"committer\"=\"Bugzilla user\". See also the [usermap]\n" | |
358 | " per line, \"committer\"=\"Bugzilla user\". See also the\n" |
|
349 | " section.\n" | |
359 | " [usermap] section.\n" |
|
|||
360 | "\n" |
|
350 | "\n" | |
361 | " [usermap]\n" |
|
351 | " [usermap]\n" | |
362 |
" Any entries in this section specify mappings of Mercurial |
|
352 | " Any entries in this section specify mappings of Mercurial\n" | |
363 | " to Bugzilla user ID. See also [bugzilla].usermap.\n" |
|
353 | " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" | |
364 | " \"committer\"=\"Bugzilla user\"\n" |
|
354 | " \"committer\"=\"Bugzilla user\"\n" | |
365 | "\n" |
|
355 | "\n" | |
366 | " [web]\n" |
|
356 | " [web]\n" | |
367 |
" baseurl Base URL for browsing Mercurial repositories. Reference |
|
357 | " baseurl Base URL for browsing Mercurial repositories. Reference\n" | |
368 | " templates as {hgweb}.\n" |
|
358 | " from templates as {hgweb}.\n" | |
369 | "\n" |
|
359 | "\n" | |
370 | "Activating the extension:\n" |
|
360 | "Activating the extension:\n" | |
371 | "\n" |
|
361 | "\n" | |
@@ -378,9 +368,9 b' msgid ""' | |||||
378 | "\n" |
|
368 | "\n" | |
379 | "Example configuration:\n" |
|
369 | "Example configuration:\n" | |
380 | "\n" |
|
370 | "\n" | |
381 |
"This example configuration is for a collection of Mercurial |
|
371 | "This example configuration is for a collection of Mercurial\n" | |
382 |
"in /var/local/hg/repos/ used with a local Bugzilla 3.2 |
|
372 | "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" | |
383 | "/opt/bugzilla-3.2.\n" |
|
373 | "installation in /opt/bugzilla-3.2.\n" | |
384 | "\n" |
|
374 | "\n" | |
385 | " [bugzilla]\n" |
|
375 | " [bugzilla]\n" | |
386 | " host=localhost\n" |
|
376 | " host=localhost\n" | |
@@ -544,13 +534,13 b' msgid "database error: %s"' | |||||
544 | msgstr "" |
|
534 | msgstr "" | |
545 |
|
535 | |||
546 | msgid "" |
|
536 | msgid "" | |
547 | "show the children of the given or working dir revision\n" |
|
537 | "show the children of the given or working directory revision\n" | |
548 | "\n" |
|
538 | "\n" | |
549 | " Print the children of the working directory's revisions.\n" |
|
539 | " Print the children of the working directory's revisions. If a\n" | |
550 |
" |
|
540 | " revision is given via --rev, the children of that revision will be\n" | |
551 |
" |
|
541 | " printed. If a file argument is given, revision in which the file\n" | |
552 |
" w |
|
542 | " was last changed (after the working directory revision or the\n" | |
553 |
" |
|
543 | " argument to --rev if given) is printed.\n" | |
554 | " " |
|
544 | " " | |
555 | msgstr "" |
|
545 | msgstr "" | |
556 | "Zeigt die Kinder der übergebenen Revision oder des Arbeitsverzeichnisses an\n" |
|
546 | "Zeigt die Kinder der übergebenen Revision oder des Arbeitsverzeichnisses an\n" | |
@@ -564,7 +554,7 b' msgstr ""' | |||||
564 | " --rev).\n" |
|
554 | " --rev).\n" | |
565 | " " |
|
555 | " " | |
566 |
|
556 | |||
567 | msgid "show children of the specified rev" |
|
557 | msgid "show children of the specified revision" | |
568 | msgstr "Zeigt die Kinder der übergebenen Revision" |
|
558 | msgstr "Zeigt die Kinder der übergebenen Revision" | |
569 |
|
559 | |||
570 | msgid "hg children [-r REV] [FILE]" |
|
560 | msgid "hg children [-r REV] [FILE]" | |
@@ -587,10 +577,9 b' msgstr ""' | |||||
587 | msgid "" |
|
577 | msgid "" | |
588 | "graph count of revisions grouped by template\n" |
|
578 | "graph count of revisions grouped by template\n" | |
589 | "\n" |
|
579 | "\n" | |
590 |
" Will graph count of changed lines or revisions grouped by template |
|
580 | " Will graph count of changed lines or revisions grouped by template\n" | |
591 |
" alternatively by date, if dateformat is used. In this case it |
|
581 | " or alternatively by date, if dateformat is used. In this case it\n" | |
592 | "override\n" |
|
582 | " will override template.\n" | |
593 | " template.\n" |
|
|||
594 | "\n" |
|
583 | "\n" | |
595 | " By default statistics are counted for number of changed lines.\n" |
|
584 | " By default statistics are counted for number of changed lines.\n" | |
596 | "\n" |
|
585 | "\n" | |
@@ -620,8 +609,8 b' msgstr ""' | |||||
620 | msgid "count rate for the specified revision or range" |
|
609 | msgid "count rate for the specified revision or range" | |
621 | msgstr "" |
|
610 | msgstr "" | |
622 |
|
611 | |||
623 | msgid "count rate for revs matching date spec" |
|
612 | msgid "count rate for revisions matching date spec" | |
624 | msgstr "" |
|
613 | msgstr "Zeigt Revisionen passend zur Datums-Spezifikation" | |
625 |
|
614 | |||
626 | msgid "template to group changesets" |
|
615 | msgid "template to group changesets" | |
627 | msgstr "" |
|
616 | msgstr "" | |
@@ -647,16 +636,16 b' msgstr ""' | |||||
647 | msgid "" |
|
636 | msgid "" | |
648 | "add color output to status, qseries, and diff-related commands\n" |
|
637 | "add color output to status, qseries, and diff-related commands\n" | |
649 | "\n" |
|
638 | "\n" | |
650 |
"This extension modifies the status command to add color to its output |
|
639 | "This extension modifies the status command to add color to its output\n" | |
651 |
"reflect file status, the qseries command to add color to reflect |
|
640 | "to reflect file status, the qseries command to add color to reflect\n" | |
652 | "status\n" |
|
641 | "patch status (applied, unapplied, missing), and to diff-related\n" | |
653 | "(applied, unapplied, missing), and to diff-related commands to highlight\n" |
|
642 | "commands to highlight additions, removals, diff headers, and trailing\n" | |
654 | "additions, removals, diff headers, and trailing whitespace.\n" |
|
643 | "whitespace.\n" | |
655 | "\n" |
|
644 | "\n" | |
656 |
"Other effects in addition to color, like bold and underlined text, are |
|
645 | "Other effects in addition to color, like bold and underlined text, are\n" | |
657 |
"available. |
|
646 | "also available. Effects are rendered with the ECMA-48 SGR control\n" | |
658 |
"ANSI escape codes). |
|
647 | "function (aka ANSI escape codes). This module also provides the\n" | |
659 | "which can be used to add effects to any text.\n" |
|
648 | "render_text function, which can be used to add effects to any text.\n" | |
660 | "\n" |
|
649 | "\n" | |
661 | "To enable this extension, add this to your .hgrc file:\n" |
|
650 | "To enable this extension, add this to your .hgrc file:\n" | |
662 | "[extensions]\n" |
|
651 | "[extensions]\n" | |
@@ -742,33 +731,32 b' msgid ""' | |||||
742 | " - Mercurial [hg]\n" |
|
731 | " - Mercurial [hg]\n" | |
743 | " - Subversion [svn] (history on branches is not preserved)\n" |
|
732 | " - Subversion [svn] (history on branches is not preserved)\n" | |
744 | "\n" |
|
733 | "\n" | |
745 |
" If no revision is given, all revisions will be converted. |
|
734 | " If no revision is given, all revisions will be converted.\n" | |
746 |
" convert will only import up to the named revision |
|
735 | " Otherwise, convert will only import up to the named revision\n" | |
747 | " understood by the source).\n" |
|
736 | " (given in a format understood by the source).\n" | |
748 | "\n" |
|
737 | "\n" | |
749 | " If no destination directory name is specified, it defaults to the\n" |
|
738 | " If no destination directory name is specified, it defaults to the\n" | |
750 |
" basename of the source with '-hg' appended. |
|
739 | " basename of the source with '-hg' appended. If the destination\n" | |
751 | " repository doesn't exist, it will be created.\n" |
|
740 | " repository doesn't exist, it will be created.\n" | |
752 | "\n" |
|
741 | "\n" | |
753 | " If <REVMAP> isn't given, it will be put in a default location\n" |
|
742 | " If <REVMAP> isn't given, it will be put in a default location\n" | |
754 |
" (<dest>/.hg/shamap by default). |
|
743 | " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" | |
755 |
" |
|
744 | " that maps each source commit ID to the destination ID for that\n" | |
756 |
" |
|
745 | " revision, like so:\n" | |
757 | " <source ID> <destination ID>\n" |
|
746 | " <source ID> <destination ID>\n" | |
758 | "\n" |
|
747 | "\n" | |
759 |
" If the file doesn't exist, it's automatically created. |
|
748 | " If the file doesn't exist, it's automatically created. It's\n" | |
760 |
" on each commit copied, so convert-repo can be interrupted |
|
749 | " updated on each commit copied, so convert-repo can be interrupted\n" | |
761 | " be run repeatedly to copy new commits.\n" |
|
750 | " and can be run repeatedly to copy new commits.\n" | |
762 | "\n" |
|
751 | "\n" | |
763 |
" The [username mapping] file is a simple text file that maps each |
|
752 | " The [username mapping] file is a simple text file that maps each\n" | |
764 |
" commit author to a destination commit author. It is handy |
|
753 | " source commit author to a destination commit author. It is handy\n" | |
765 | "SCMs\n" |
|
754 | " for source SCMs that use unix logins to identify authors (eg:\n" | |
766 | " that use unix logins to identify authors (eg: CVS). One line per author\n" |
|
755 | " CVS). One line per author mapping and the line format is:\n" | |
767 | " mapping and the line format is:\n" |
|
|||
768 | " srcauthor=whatever string you want\n" |
|
756 | " srcauthor=whatever string you want\n" | |
769 | "\n" |
|
757 | "\n" | |
770 | " The filemap is a file that allows filtering and remapping of files\n" |
|
758 | " The filemap is a file that allows filtering and remapping of files\n" | |
771 |
" and directories. |
|
759 | " and directories. Comment lines start with '#'. Each line can\n" | |
772 | " contain one of the following directives:\n" |
|
760 | " contain one of the following directives:\n" | |
773 | "\n" |
|
761 | "\n" | |
774 | " include path/to/file\n" |
|
762 | " include path/to/file\n" | |
@@ -779,33 +767,33 b' msgid ""' | |||||
779 | "\n" |
|
767 | "\n" | |
780 | " The 'include' directive causes a file, or all files under a\n" |
|
768 | " The 'include' directive causes a file, or all files under a\n" | |
781 | " directory, to be included in the destination repository, and the\n" |
|
769 | " directory, to be included in the destination repository, and the\n" | |
782 | " exclusion of all other files and dirs not explicitely included.\n" |
|
770 | " exclusion of all other files and directories not explicitely included.\n" | |
783 | " The 'exclude' directive causes files or directories to be omitted.\n" |
|
771 | " The 'exclude' directive causes files or directories to be omitted.\n" | |
784 |
" The 'rename' directive renames a file or directory. |
|
772 | " The 'rename' directive renames a file or directory. To rename from\n" | |
785 |
" subdirectory into the root of the repository, use '.' as the |
|
773 | " a subdirectory into the root of the repository, use '.' as the\n" | |
786 | " rename to.\n" |
|
774 | " path to rename to.\n" | |
787 | "\n" |
|
775 | "\n" | |
788 | " The splicemap is a file that allows insertion of synthetic\n" |
|
776 | " The splicemap is a file that allows insertion of synthetic\n" | |
789 |
" history, letting you specify the parents of a revision. |
|
777 | " history, letting you specify the parents of a revision. This is\n" | |
790 | " useful if you want to e.g. give a Subversion merge two parents, or\n" |
|
778 | " useful if you want to e.g. give a Subversion merge two parents, or\n" | |
791 |
" graft two disconnected series of history together. |
|
779 | " graft two disconnected series of history together. Each entry\n" | |
792 | " contains a key, followed by a space, followed by one or two\n" |
|
780 | " contains a key, followed by a space, followed by one or two\n" | |
793 |
" comma-separated values. |
|
781 | " comma-separated values. The key is the revision ID in the source\n" | |
794 |
" |
|
782 | " revision control system whose parents should be modified (same\n" | |
795 |
" |
|
783 | " format as a key in .hg/shamap). The values are the revision IDs\n" | |
796 |
" |
|
784 | " (in either the source or destination revision control system) that\n" | |
797 |
" |
|
785 | " should be used as the new parents for that node.\n" | |
798 | "\n" |
|
786 | "\n" | |
799 | " Mercurial Source\n" |
|
787 | " Mercurial Source\n" | |
800 | " -----------------\n" |
|
788 | " -----------------\n" | |
801 | "\n" |
|
789 | "\n" | |
802 | " --config convert.hg.ignoreerrors=False (boolean)\n" |
|
790 | " --config convert.hg.ignoreerrors=False (boolean)\n" | |
803 | " ignore integrity errors when reading. Use it to fix Mercurial\n" |
|
791 | " ignore integrity errors when reading. Use it to fix Mercurial\n" | |
804 | " repositories with missing revlogs, by converting from and to\n" |
|
792 | " repositories with missing revlogs, by converting from and to\n" | |
805 | " Mercurial.\n" |
|
793 | " Mercurial.\n" | |
806 |
" --config convert.hg.saverev=False |
|
794 | " --config convert.hg.saverev=False (boolean)\n" | |
807 |
" store original revision ID in changeset (forces target IDs to |
|
795 | " store original revision ID in changeset (forces target IDs to\n" | |
808 | "change)\n" |
|
796 | " change)\n" | |
809 | " --config convert.hg.startrev=0 (hg revision identifier)\n" |
|
797 | " --config convert.hg.startrev=0 (hg revision identifier)\n" | |
810 | " convert start revision and its descendants\n" |
|
798 | " convert start revision and its descendants\n" | |
811 | "\n" |
|
799 | "\n" | |
@@ -814,11 +802,11 b' msgid ""' | |||||
814 | "\n" |
|
802 | "\n" | |
815 | " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" |
|
803 | " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" | |
816 | " to indicate the starting point of what will be converted. Direct\n" |
|
804 | " to indicate the starting point of what will be converted. Direct\n" | |
817 | " access to the repository files is not needed, unless of course\n" |
|
805 | " access to the repository files is not needed, unless of course the\n" | |
818 |
" |
|
806 | " repository is :local:. The conversion uses the top level directory\n" | |
819 |
" |
|
807 | " in the sandbox to find the CVS repository, and then uses CVS rlog\n" | |
820 |
" |
|
808 | " commands to find files to convert. This means that unless a\n" | |
821 |
" |
|
809 | " filemap is given, all files under the starting directory will be\n" | |
822 | " converted, and that any directory reorganisation in the CVS\n" |
|
810 | " converted, and that any directory reorganisation in the CVS\n" | |
823 | " sandbox is ignored.\n" |
|
811 | " sandbox is ignored.\n" | |
824 | "\n" |
|
812 | "\n" | |
@@ -834,34 +822,37 b' msgid ""' | |||||
834 | " Internal cvsps is selected by setting\n" |
|
822 | " Internal cvsps is selected by setting\n" | |
835 | " --config convert.cvsps=builtin\n" |
|
823 | " --config convert.cvsps=builtin\n" | |
836 | " and has a few more configurable options:\n" |
|
824 | " and has a few more configurable options:\n" | |
837 | " --config convert.cvsps.fuzz=60 (integer)\n" |
|
825 | " --config convert.cvsps.fuzz=60 (integer)\n" | |
838 |
" Specify the maximum time (in seconds) that is allowed |
|
826 | " Specify the maximum time (in seconds) that is allowed\n" | |
839 |
" commits with identical user and log message in a |
|
827 | " between commits with identical user and log message in a\n" | |
840 |
" changeset. When very large files were checked in as |
|
828 | " single changeset. When very large files were checked in as\n" | |
841 |
" of a changeset then the default may not be long |
|
829 | " part of a changeset then the default may not be long\n" | |
|
830 | " enough.\n" | |||
842 | " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" |
|
831 | " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" | |
843 |
" Specify a regular expression to which commit log messages |
|
832 | " Specify a regular expression to which commit log messages\n" | |
844 |
" matched. If a match occurs, then the conversion |
|
833 | " are matched. If a match occurs, then the conversion\n" | |
845 |
" insert a dummy revision merging the branch on |
|
834 | " process will insert a dummy revision merging the branch on\n" | |
846 |
" message occurs to the branch indicated in |
|
835 | " which this log message occurs to the branch indicated in\n" | |
|
836 | " the regex.\n" | |||
847 | " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" |
|
837 | " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" | |
848 |
" Specify a regular expression to which commit log messages |
|
838 | " Specify a regular expression to which commit log messages\n" | |
849 |
" matched. If a match occurs, then the conversion |
|
839 | " are matched. If a match occurs, then the conversion\n" | |
850 |
" add the most recent revision on the branch |
|
840 | " process will add the most recent revision on the branch\n" | |
851 |
" regex as the second parent of the |
|
841 | " indicated in the regex as the second parent of the\n" | |
852 | "\n" |
|
842 | " changeset.\n" | |
853 | " The hgext/convert/cvsps wrapper script allows the builtin changeset\n" |
|
843 | "\n" | |
854 | " merging code to be run without doing a conversion. Its parameters and\n" |
|
844 | " The hgext/convert/cvsps wrapper script allows the builtin\n" | |
855 | " output are similar to that of cvsps 2.1.\n" |
|
845 | " changeset merging code to be run without doing a conversion. Its\n" | |
|
846 | " parameters and output are similar to that of cvsps 2.1.\n" | |||
856 | "\n" |
|
847 | "\n" | |
857 | " Subversion Source\n" |
|
848 | " Subversion Source\n" | |
858 | " -----------------\n" |
|
849 | " -----------------\n" | |
859 | "\n" |
|
850 | "\n" | |
860 | " Subversion source detects classical trunk/branches/tags layouts.\n" |
|
851 | " Subversion source detects classical trunk/branches/tags layouts.\n" | |
861 | " By default, the supplied \"svn://repo/path/\" source URL is\n" |
|
852 | " By default, the supplied \"svn://repo/path/\" source URL is\n" | |
862 | " converted as a single branch. If \"svn://repo/path/trunk\" exists\n" |
|
853 | " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" | |
863 |
" |
|
854 | " replaces the default branch. If \"svn://repo/path/branches\" exists,\n" | |
864 |
" |
|
855 | " its subdirectories are listed as possible branches. If\n" | |
865 | " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" |
|
856 | " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" | |
866 | " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" |
|
857 | " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" | |
867 | " can be overriden with following options. Set them to paths\n" |
|
858 | " can be overriden with following options. Set them to paths\n" | |
@@ -885,17 +876,17 b' msgid ""' | |||||
885 | " Perforce Source\n" |
|
876 | " Perforce Source\n" | |
886 | " ---------------\n" |
|
877 | " ---------------\n" | |
887 | "\n" |
|
878 | "\n" | |
888 |
" The Perforce (P4) importer can be given a p4 depot path or a |
|
879 | " The Perforce (P4) importer can be given a p4 depot path or a\n" | |
889 |
" specification as source. It will convert all files in the |
|
880 | " client specification as source. It will convert all files in the\n" | |
890 |
" a flat Mercurial repository, ignoring labels, branches |
|
881 | " source to a flat Mercurial repository, ignoring labels, branches\n" | |
891 | "integrations.\n" |
|
882 | " and integrations. Note that when a depot path is given you then\n" | |
892 | " Note that when a depot path is given you then usually should specify a\n" |
|
883 | " usually should specify a target directory, because otherwise the\n" | |
893 |
" target |
|
884 | " target may be named ...-hg.\n" | |
894 | "\n" |
|
885 | "\n" | |
895 |
" It is possible to limit the amount of source history to be |
|
886 | " It is possible to limit the amount of source history to be\n" | |
896 | " by specifying an initial Perforce revision.\n" |
|
887 | " converted by specifying an initial Perforce revision.\n" | |
897 | "\n" |
|
888 | "\n" | |
898 | " --config convert.p4.startrev=0 (perforce changelist number)\n" |
|
889 | " --config convert.p4.startrev=0 (perforce changelist number)\n" | |
899 | " specify initial Perforce revision.\n" |
|
890 | " specify initial Perforce revision.\n" | |
900 | "\n" |
|
891 | "\n" | |
901 | "\n" |
|
892 | "\n" | |
@@ -915,12 +906,14 b' msgstr ""' | |||||
915 | msgid "" |
|
906 | msgid "" | |
916 | "create changeset information from CVS\n" |
|
907 | "create changeset information from CVS\n" | |
917 | "\n" |
|
908 | "\n" | |
918 |
" This command is intended as a debugging tool for the CVS to |
|
909 | " This command is intended as a debugging tool for the CVS to\n" | |
919 |
" converter, and can be used as a direct replacement for |
|
910 | " Mercurial converter, and can be used as a direct replacement for\n" | |
920 | "\n" |
|
911 | " cvsps.\n" | |
921 | " Hg debugcvsps reads the CVS rlog for current directory (or any named\n" |
|
912 | "\n" | |
922 | " directory) in the CVS repository, and converts the log to a series of\n" |
|
913 | " Hg debugcvsps reads the CVS rlog for current directory (or any\n" | |
923 | " changesets based on matching commit log entries and dates." |
|
914 | " named directory) in the CVS repository, and converts the log to a\n" | |
|
915 | " series of changesets based on matching commit log entries and\n" | |||
|
916 | " dates." | |||
924 | msgstr "" |
|
917 | msgstr "" | |
925 |
|
918 | |||
926 | msgid "username mapping filename" |
|
919 | msgid "username mapping filename" | |
@@ -1032,7 +1025,7 b' msgid "Writing author map file %s\\n"' | |||||
1032 | msgstr "" |
|
1025 | msgstr "" | |
1033 |
|
1026 | |||
1034 | #, python-format |
|
1027 | #, python-format | |
1035 | msgid "Overriding mapping for author %s, was %s, will be %s\n" |
|
1028 | msgid "Ignoring bad line in author map file %s: %s\n" | |
1036 | msgstr "" |
|
1029 | msgstr "" | |
1037 |
|
1030 | |||
1038 | #, python-format |
|
1031 | #, python-format | |
@@ -1040,7 +1033,7 b' msgid "mapping author %s to %s\\n"' | |||||
1040 | msgstr "" |
|
1033 | msgstr "" | |
1041 |
|
1034 | |||
1042 | #, python-format |
|
1035 | #, python-format | |
1043 |
msgid " |
|
1036 | msgid "overriding mapping for author %s, was %s, will be %s\n" | |
1044 | msgstr "" |
|
1037 | msgstr "" | |
1045 |
|
1038 | |||
1046 | #, python-format |
|
1039 | #, python-format | |
@@ -1129,7 +1122,7 b' msgid "revision must be followed by date' | |||||
1129 | msgstr "" |
|
1122 | msgstr "" | |
1130 |
|
1123 | |||
1131 | #, python-format |
|
1124 | #, python-format | |
1132 | msgid "found synthetic rev in %s: %r\n" |
|
1125 | msgid "found synthetic revision in %s: %r\n" | |
1133 | msgstr "Synthetische Revision gefundein in %s: %r\n" |
|
1126 | msgstr "Synthetische Revision gefundein in %s: %r\n" | |
1134 |
|
1127 | |||
1135 | #, python-format |
|
1128 | #, python-format | |
@@ -1250,7 +1243,7 b' msgid "%s does not look like a monotone ' | |||||
1250 | msgstr "" |
|
1243 | msgstr "" | |
1251 |
|
1244 | |||
1252 | #, python-format |
|
1245 | #, python-format | |
1253 | msgid "copying file in renamed dir from '%s' to '%s'" |
|
1246 | msgid "copying file in renamed directory from '%s' to '%s'" | |
1254 | msgstr "" |
|
1247 | msgstr "" | |
1255 |
|
1248 | |||
1256 | msgid "reading p4 views\n" |
|
1249 | msgid "reading p4 views\n" | |
@@ -1406,7 +1399,7 b' msgstr ""' | |||||
1406 | msgid "" |
|
1399 | msgid "" | |
1407 | "\n" |
|
1400 | "\n" | |
1408 | "The `extdiff' Mercurial extension allows you to use external programs\n" |
|
1401 | "The `extdiff' Mercurial extension allows you to use external programs\n" | |
1409 |
"to compare revisions, or revision with working dir. |
|
1402 | "to compare revisions, or revision with working directory. The external diff\n" | |
1410 | "programs are called with a configurable set of options and two\n" |
|
1403 | "programs are called with a configurable set of options and two\n" | |
1411 | "non-option arguments: paths to directories containing snapshots of\n" |
|
1404 | "non-option arguments: paths to directories containing snapshots of\n" | |
1412 | "files to compare.\n" |
|
1405 | "files to compare.\n" | |
@@ -1433,16 +1426,16 b' msgid ""' | |||||
1433 | " meld =\n" |
|
1426 | " meld =\n" | |
1434 | "\n" |
|
1427 | "\n" | |
1435 | " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" |
|
1428 | " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" | |
1436 | " #(see http://www.vim.org/scripts/script.php?script_id=102)\n" |
|
1429 | " # (see http://www.vim.org/scripts/script.php?script_id=102)\n" | |
1437 | " # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " |
|
1430 | " # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " | |
1438 | "in\n" |
|
1431 | "in\n" | |
1439 | " # your .vimrc\n" |
|
1432 | " # your .vimrc\n" | |
1440 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" |
|
1433 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" | |
1441 | "\n" |
|
1434 | "\n" | |
1442 | "You can use -I/-X and list of file or directory names like normal\n" |
|
1435 | "You can use -I/-X and list of file or directory names like normal \"hg\n" | |
1443 |
" |
|
1436 | "diff\" command. The `extdiff' extension makes snapshots of only needed\n" | |
1444 |
" |
|
1437 | "files, so running the external diff program will actually be pretty\n" | |
1445 |
" |
|
1438 | "fast (at least faster than having to compare the entire tree).\n" | |
1446 | msgstr "" |
|
1439 | msgstr "" | |
1447 |
|
1440 | |||
1448 | msgid "snapshot files as of some revision" |
|
1441 | msgid "snapshot files as of some revision" | |
@@ -1459,7 +1452,7 b' msgid ""' | |||||
1459 | msgstr "" |
|
1452 | msgstr "" | |
1460 |
|
1453 | |||
1461 | #, python-format |
|
1454 | #, python-format | |
1462 | msgid "making snapshot of %d files from working dir\n" |
|
1455 | msgid "making snapshot of %d files from working directory\n" | |
1463 | msgstr "" |
|
1456 | msgstr "" | |
1464 |
|
1457 | |||
1465 | msgid "" |
|
1458 | msgid "" | |
@@ -1490,19 +1483,19 b' msgid ""' | |||||
1490 | "use external program to diff repository (or selected files)\n" |
|
1483 | "use external program to diff repository (or selected files)\n" | |
1491 | "\n" |
|
1484 | "\n" | |
1492 | " Show differences between revisions for the specified files, using\n" |
|
1485 | " Show differences between revisions for the specified files, using\n" | |
1493 |
" an external program. |
|
1486 | " an external program. The default program used is diff, with\n" | |
1494 | " default options \"-Npru\".\n" |
|
1487 | " default options \"-Npru\".\n" | |
1495 | "\n" |
|
1488 | "\n" | |
1496 |
" To select a different program, use the -p option. |
|
1489 | " To select a different program, use the -p option. The program will\n" | |
1497 |
" |
|
1490 | " be passed the names of two directories to compare. To pass\n" | |
1498 |
" additional options to the program, use the -o option. |
|
1491 | " additional options to the program, use the -o option. These will\n" | |
1499 | " be passed before the names of the directories to compare.\n" |
|
1492 | " be passed before the names of the directories to compare.\n" | |
1500 | "\n" |
|
1493 | "\n" | |
1501 | " When two revision arguments are given, then changes are\n" |
|
1494 | " When two revision arguments are given, then changes are shown\n" | |
1502 |
" |
|
1495 | " between those revisions. If only one revision is specified then\n" | |
1503 |
" |
|
1496 | " that revision is compared to the working directory, and, when no\n" | |
1504 | " directory, and, when no revisions are specified, the\n" |
|
1497 | " revisions are specified, the working directory files are compared\n" | |
1505 | " working directory files are compared to its parent." |
|
1498 | " to its parent." | |
1506 | msgstr "" |
|
1499 | msgstr "" | |
1507 |
|
1500 | |||
1508 | msgid "comparison program to run" |
|
1501 | msgid "comparison program to run" | |
@@ -1527,19 +1520,21 b' msgstr ""' | |||||
1527 | msgid "pulling, updating and merging in one command" |
|
1520 | msgid "pulling, updating and merging in one command" | |
1528 | msgstr "Hole, aktualisiere und führe zusammen in einem Befehl" |
|
1521 | msgstr "Hole, aktualisiere und führe zusammen in einem Befehl" | |
1529 |
|
1522 | |||
|
1523 | ||||
1530 | msgid "" |
|
1524 | msgid "" | |
1531 | "pull changes from a remote repository, merge new changes if needed.\n" |
|
1525 | "pull changes from a remote repository, merge new changes if needed.\n" | |
1532 | "\n" |
|
1526 | "\n" | |
1533 | " This finds all changes from the repository at the specified path\n" |
|
1527 | " This finds all changes from the repository at the specified path\n" | |
1534 | " or URL and adds them to the local repository.\n" |
|
1528 | " or URL and adds them to the local repository.\n" | |
1535 | "\n" |
|
1529 | "\n" | |
1536 |
" If the pulled changes add a new branch head, the head is |
|
1530 | " If the pulled changes add a new branch head, the head is\n" | |
1537 |
" merged, and the result of the merge is committed. |
|
1531 | " automatically merged, and the result of the merge is committed.\n" | |
1538 |
" working directory is updated to include the new |
|
1532 | " Otherwise, the working directory is updated to include the new\n" | |
|
1533 | " changes.\n" | |||
1539 | "\n" |
|
1534 | "\n" | |
1540 | " When a merge occurs, the newly pulled changes are assumed to be\n" |
|
1535 | " When a merge occurs, the newly pulled changes are assumed to be\n" | |
1541 |
" \"authoritative\". |
|
1536 | " \"authoritative\". The head of the new changes is used as the first\n" | |
1542 |
" parent, with local changes as the second. |
|
1537 | " parent, with local changes as the second. To switch the merge\n" | |
1543 | " order, use --switch-parent.\n" |
|
1538 | " order, use --switch-parent.\n" | |
1544 | "\n" |
|
1539 | "\n" | |
1545 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
1540 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" | |
@@ -1920,17 +1915,17 b' msgid ""' | |||||
1920 | "browsing the repository in a graphical way\n" |
|
1915 | "browsing the repository in a graphical way\n" | |
1921 | "\n" |
|
1916 | "\n" | |
1922 | "The hgk extension allows browsing the history of a repository in a\n" |
|
1917 | "The hgk extension allows browsing the history of a repository in a\n" | |
1923 | "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n" |
|
1918 | "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" | |
1924 |
" |
|
1919 | "distributed with Mercurial.)\n" | |
1925 | "\n" |
|
1920 | "\n" | |
1926 | "hgk consists of two parts: a Tcl script that does the displaying and\n" |
|
1921 | "hgk consists of two parts: a Tcl script that does the displaying and\n" | |
1927 | "querying of information, and an extension to mercurial named hgk.py,\n" |
|
1922 | "querying of information, and an extension to mercurial named hgk.py,\n" | |
1928 | "which provides hooks for hgk to get information. hgk can be found in\n" |
|
1923 | "which provides hooks for hgk to get information. hgk can be found in\n" | |
1929 | "the contrib directory, and hgk.py can be found in the hgext directory.\n" |
|
1924 | "the contrib directory, and hgk.py can be found in the hgext directory.\n" | |
1930 | "\n" |
|
1925 | "\n" | |
1931 | "To load the hgext.py extension, add it to your .hgrc file (you have\n" |
|
1926 | "To load the hgext.py extension, add it to your .hgrc file (you have to\n" | |
1932 |
" |
|
1927 | "use your global $HOME/.hgrc file, not one in a repository). You can\n" | |
1933 |
" |
|
1928 | "specify an absolute path:\n" | |
1934 | "\n" |
|
1929 | "\n" | |
1935 | " [extensions]\n" |
|
1930 | " [extensions]\n" | |
1936 | " hgk=/usr/local/lib/hgk.py\n" |
|
1931 | " hgk=/usr/local/lib/hgk.py\n" | |
@@ -1942,8 +1937,8 b' msgid ""' | |||||
1942 | " hgk=\n" |
|
1937 | " hgk=\n" | |
1943 | "\n" |
|
1938 | "\n" | |
1944 | "The hg view command will launch the hgk Tcl script. For this command\n" |
|
1939 | "The hg view command will launch the hgk Tcl script. For this command\n" | |
1945 | "to work, hgk must be in your search path. Alternately, you can\n" |
|
1940 | "to work, hgk must be in your search path. Alternately, you can specify\n" | |
1946 |
" |
|
1941 | "the path to hgk in your .hgrc file:\n" | |
1947 | "\n" |
|
1942 | "\n" | |
1948 | " [hgk]\n" |
|
1943 | " [hgk]\n" | |
1949 | " path=/location/of/hgk\n" |
|
1944 | " path=/location/of/hgk\n" | |
@@ -2235,15 +2230,15 b' msgstr ""' | |||||
2235 | msgid "" |
|
2230 | msgid "" | |
2236 | "keyword expansion in local repositories\n" |
|
2231 | "keyword expansion in local repositories\n" | |
2237 | "\n" |
|
2232 | "\n" | |
2238 | "This extension expands RCS/CVS-like or self-customized $Keywords$\n" |
|
2233 | "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" | |
2239 |
" |
|
2234 | "tracked text files selected by your configuration.\n" | |
2240 | "\n" |
|
2235 | "\n" | |
2241 | "Keywords are only expanded in local repositories and not stored in\n" |
|
2236 | "Keywords are only expanded in local repositories and not stored in the\n" | |
2242 |
" |
|
2237 | "change history. The mechanism can be regarded as a convenience for the\n" | |
2243 |
" |
|
2238 | "current user or for archive distribution.\n" | |
2244 | "\n" |
|
2239 | "\n" | |
2245 | "Configuration is done in the [keyword] and [keywordmaps] sections\n" |
|
2240 | "Configuration is done in the [keyword] and [keywordmaps] sections of\n" | |
2246 |
" |
|
2241 | "hgrc files.\n" | |
2247 | "\n" |
|
2242 | "\n" | |
2248 | "Example:\n" |
|
2243 | "Example:\n" | |
2249 | "\n" |
|
2244 | "\n" | |
@@ -2253,28 +2248,28 b' msgid ""' | |||||
2253 | " x* = ignore\n" |
|
2248 | " x* = ignore\n" | |
2254 | "\n" |
|
2249 | "\n" | |
2255 | "Note: the more specific you are in your filename patterns\n" |
|
2250 | "Note: the more specific you are in your filename patterns\n" | |
2256 | " the less you lose speed in huge repos.\n" |
|
2251 | " the less you lose speed in huge repositories.\n" | |
2257 | "\n" |
|
2252 | "\n" | |
2258 | "For [keywordmaps] template mapping and expansion demonstration and\n" |
|
2253 | "For [keywordmaps] template mapping and expansion demonstration and\n" | |
2259 | "control run \"hg kwdemo\".\n" |
|
2254 | "control run \"hg kwdemo\".\n" | |
2260 | "\n" |
|
2255 | "\n" | |
2261 | "An additional date template filter {date|utcdate} is provided.\n" |
|
2256 | "An additional date template filter {date|utcdate} is provided.\n" | |
2262 | "\n" |
|
2257 | "\n" | |
2263 |
"The default template mappings (view with \"hg kwdemo -d\") can be |
|
2258 | "The default template mappings (view with \"hg kwdemo -d\") can be\n" | |
2264 | "with customized keywords and templates.\n" |
|
2259 | "replaced with customized keywords and templates. Again, run \"hg\n" | |
2265 |
" |
|
2260 | "kwdemo\" to control the results of your config changes.\n" | |
2266 | "\n" |
|
2261 | "\n" | |
2267 | "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" |
|
2262 | "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" | |
2268 |
"the risk of inadvertedly storing expanded keywords in the change |
|
2263 | "the risk of inadvertedly storing expanded keywords in the change\n" | |
|
2264 | "history.\n" | |||
2269 | "\n" |
|
2265 | "\n" | |
2270 | "To force expansion after enabling it, or a configuration change, run\n" |
|
2266 | "To force expansion after enabling it, or a configuration change, run\n" | |
2271 | "\"hg kwexpand\".\n" |
|
2267 | "\"hg kwexpand\".\n" | |
2272 | "\n" |
|
2268 | "\n" | |
2273 |
"Also, when committing with the record extension or using mq's qrecord, |
|
2269 | "Also, when committing with the record extension or using mq's qrecord,\n" | |
2274 | "aware\n" |
|
2270 | "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" | |
2275 | "that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" |
|
2271 | "the files in question to update keyword expansions after all changes\n" | |
2276 | "question to update keyword expansions after all changes have been checked " |
|
2272 | "have been checked in.\n" | |
2277 | "in.\n" |
|
|||
2278 | "\n" |
|
2273 | "\n" | |
2279 | "Expansions spanning more than one line and incremental expansions,\n" |
|
2274 | "Expansions spanning more than one line and incremental expansions,\n" | |
2280 | "like CVS' $Log$, are not supported. A keyword template map\n" |
|
2275 | "like CVS' $Log$, are not supported. A keyword template map\n" | |
@@ -2357,11 +2352,11 b' msgstr ""' | |||||
2357 | msgid "" |
|
2352 | msgid "" | |
2358 | "print [keywordmaps] configuration and an expansion example\n" |
|
2353 | "print [keywordmaps] configuration and an expansion example\n" | |
2359 | "\n" |
|
2354 | "\n" | |
2360 | " Show current, custom, or default keyword template maps\n" |
|
2355 | " Show current, custom, or default keyword template maps and their\n" | |
2361 |
" |
|
2356 | " expansion.\n" | |
2362 | "\n" |
|
2357 | "\n" | |
2363 | " Extend current configuration by specifying maps as arguments\n" |
|
2358 | " Extend current configuration by specifying maps as arguments and\n" | |
2364 |
" |
|
2359 | " optionally by reading from an additional hgrc file.\n" | |
2365 | "\n" |
|
2360 | "\n" | |
2366 | " Override current keyword template maps with \"default\" option.\n" |
|
2361 | " Override current keyword template maps with \"default\" option.\n" | |
2367 | " " |
|
2362 | " " | |
@@ -2374,7 +2369,7 b' msgid ""' | |||||
2374 | msgstr "" |
|
2369 | msgstr "" | |
2375 |
|
2370 | |||
2376 | #, python-format |
|
2371 | #, python-format | |
2377 | msgid "creating temporary repo at %s\n" |
|
2372 | msgid "creating temporary repository at %s\n" | |
2378 | msgstr "" |
|
2373 | msgstr "" | |
2379 |
|
2374 | |||
2380 | #, python-format |
|
2375 | #, python-format | |
@@ -2389,7 +2384,7 b' msgstr ""' | |||||
2389 | #, python-format |
|
2384 | #, python-format | |
2390 | msgid "" |
|
2385 | msgid "" | |
2391 | "\n" |
|
2386 | "\n" | |
2392 | "removing temporary repo %s\n" |
|
2387 | "removing temporary repository %s\n" | |
2393 | msgstr "" |
|
2388 | msgstr "" | |
2394 |
|
2389 | |||
2395 | msgid "" |
|
2390 | msgid "" | |
@@ -2404,17 +2399,17 b' msgstr ""' | |||||
2404 | msgid "" |
|
2399 | msgid "" | |
2405 | "print files currently configured for keyword expansion\n" |
|
2400 | "print files currently configured for keyword expansion\n" | |
2406 | "\n" |
|
2401 | "\n" | |
2407 |
" Crosscheck which files in working directory are potential targets |
|
2402 | " Crosscheck which files in working directory are potential targets\n" | |
2408 | " keyword expansion.\n" |
|
2403 | " for keyword expansion. That is, files matched by [keyword] config\n" | |
2409 |
" |
|
2404 | " patterns but not symlinks.\n" | |
2410 | " " |
|
2405 | " " | |
2411 | msgstr "" |
|
2406 | msgstr "" | |
2412 |
|
2407 | |||
2413 | msgid "" |
|
2408 | msgid "" | |
2414 | "revert expanded keywords in working directory\n" |
|
2409 | "revert expanded keywords in working directory\n" | |
2415 | "\n" |
|
2410 | "\n" | |
2416 | " Run before changing/disabling active keywords\n" |
|
2411 | " Run before changing/disabling active keywords or if you experience\n" | |
2417 |
" |
|
2412 | " problems with \"hg import\" or \"hg merge\".\n" | |
2418 | "\n" |
|
2413 | "\n" | |
2419 | " kwshrink refuses to run if given files contain local changes.\n" |
|
2414 | " kwshrink refuses to run if given files contain local changes.\n" | |
2420 | " " |
|
2415 | " " | |
@@ -2481,11 +2476,11 b' msgid ""' | |||||
2481 | "patch management and development\n" |
|
2476 | "patch management and development\n" | |
2482 | "\n" |
|
2477 | "\n" | |
2483 | "This extension lets you work with a stack of patches in a Mercurial\n" |
|
2478 | "This extension lets you work with a stack of patches in a Mercurial\n" | |
2484 |
"repository. |
|
2479 | "repository. It manages two stacks of patches - all known patches, and\n" | |
2485 | "applied patches (subset of known patches).\n" |
|
2480 | "applied patches (subset of known patches).\n" | |
2486 | "\n" |
|
2481 | "\n" | |
2487 | "Known patches are represented as patch files in the .hg/patches\n" |
|
2482 | "Known patches are represented as patch files in the .hg/patches\n" | |
2488 |
"directory. |
|
2483 | "directory. Applied patches are both patch files and changesets.\n" | |
2489 | "\n" |
|
2484 | "\n" | |
2490 | "Common tasks (use \"hg help command\" for more details):\n" |
|
2485 | "Common tasks (use \"hg help command\" for more details):\n" | |
2491 | "\n" |
|
2486 | "\n" | |
@@ -2866,14 +2861,16 b' msgstr ""' | |||||
2866 | msgid "" |
|
2861 | msgid "" | |
2867 | "remove patches from queue\n" |
|
2862 | "remove patches from queue\n" | |
2868 | "\n" |
|
2863 | "\n" | |
2869 | " The patches must not be applied, unless they are arguments to\n" |
|
2864 | " The patches must not be applied, unless they are arguments to the\n" | |
2870 |
" |
|
2865 | " --rev parameter. At least one patch or revision is required.\n" | |
2871 | "\n" |
|
2866 | "\n" | |
2872 | " With --rev, mq will stop managing the named revisions (converting\n" |
|
2867 | " With --rev, mq will stop managing the named revisions (converting\n" | |
2873 |
" them to regular mercurial changesets). The qfinish command should |
|
2868 | " them to regular mercurial changesets). The qfinish command should\n" | |
2874 |
" used as an alternative for qdel -r, as the latter option is |
|
2869 | " be used as an alternative for qdel -r, as the latter option is\n" | |
2875 | "\n" |
|
2870 | " deprecated.\n" | |
2876 | " With --keep, the patch files are preserved in the patch directory." |
|
2871 | "\n" | |
|
2872 | " With --keep, the patch files are preserved in the patch\n" | |||
|
2873 | " directory." | |||
2877 | msgstr "" |
|
2874 | msgstr "" | |
2878 |
|
2875 | |||
2879 | msgid "print the patches already applied" |
|
2876 | msgid "print the patches already applied" | |
@@ -2885,24 +2882,25 b' msgstr ""' | |||||
2885 | msgid "" |
|
2882 | msgid "" | |
2886 | "import a patch\n" |
|
2883 | "import a patch\n" | |
2887 | "\n" |
|
2884 | "\n" | |
2888 |
" The patch is inserted into the series after the last applied |
|
2885 | " The patch is inserted into the series after the last applied\n" | |
2889 | " If no patches have been applied, qimport prepends the patch\n" |
|
2886 | " patch. If no patches have been applied, qimport prepends the patch\n" | |
2890 | " to the series.\n" |
|
2887 | " to the series.\n" | |
2891 | "\n" |
|
2888 | "\n" | |
2892 | " The patch will have the same name as its source file unless you\n" |
|
2889 | " The patch will have the same name as its source file unless you\n" | |
2893 | " give it a new one with --name.\n" |
|
2890 | " give it a new one with --name.\n" | |
2894 | "\n" |
|
2891 | "\n" | |
2895 | " You can register an existing patch inside the patch directory\n" |
|
2892 | " You can register an existing patch inside the patch directory with\n" | |
2896 |
" |
|
2893 | " the --existing flag.\n" | |
2897 | "\n" |
|
2894 | "\n" | |
2898 |
" With --force, an existing patch of the same name will be |
|
2895 | " With --force, an existing patch of the same name will be\n" | |
|
2896 | " overwritten.\n" | |||
2899 | "\n" |
|
2897 | "\n" | |
2900 | " An existing changeset may be placed under mq control with --rev\n" |
|
2898 | " An existing changeset may be placed under mq control with --rev\n" | |
2901 | " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" |
|
2899 | " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" | |
2902 | " With --git, patches imported with --rev will use the git diff\n" |
|
2900 | " With --git, patches imported with --rev will use the git diff\n" | |
2903 | " format. See the diffs help topic for information on why this is\n" |
|
2901 | " format. See the diffs help topic for information on why this is\n" | |
2904 |
" important for preserving rename/copy information and permission |
|
2902 | " important for preserving rename/copy information and permission\n" | |
2905 | "changes.\n" |
|
2903 | " changes.\n" | |
2906 | " " |
|
2904 | " " | |
2907 | msgstr "" |
|
2905 | msgstr "" | |
2908 |
|
2906 | |||
@@ -2910,23 +2908,23 b' msgid ""' | |||||
2910 | "init a new queue repository\n" |
|
2908 | "init a new queue repository\n" | |
2911 | "\n" |
|
2909 | "\n" | |
2912 | " The queue repository is unversioned by default. If -c is\n" |
|
2910 | " The queue repository is unversioned by default. If -c is\n" | |
2913 | " specified, qinit will create a separate nested repository\n" |
|
2911 | " specified, qinit will create a separate nested repository for\n" | |
2914 |
" |
|
2912 | " patches (qinit -c may also be run later to convert an unversioned\n" | |
2915 |
" |
|
2913 | " patch repository into a versioned one). You can use qcommit to\n" | |
2916 |
" |
|
2914 | " commit changes to this queue repository." | |
2917 | msgstr "" |
|
2915 | msgstr "" | |
2918 |
|
2916 | |||
2919 | msgid "" |
|
2917 | msgid "" | |
2920 | "clone main and patch repository at same time\n" |
|
2918 | "clone main and patch repository at same time\n" | |
2921 | "\n" |
|
2919 | "\n" | |
2922 |
" If source is local, destination will have no patches applied. |
|
2920 | " If source is local, destination will have no patches applied. If\n" | |
2923 | " source is remote, this command can not check if patches are\n" |
|
2921 | " source is remote, this command can not check if patches are\n" | |
2924 | " applied in source, so cannot guarantee that patches are not\n" |
|
2922 | " applied in source, so cannot guarantee that patches are not\n" | |
2925 |
" applied in destination. |
|
2923 | " applied in destination. If you clone remote repository, be sure\n" | |
2926 | " before that it has no patches applied.\n" |
|
2924 | " before that it has no patches applied.\n" | |
2927 | "\n" |
|
2925 | "\n" | |
2928 | " Source patch repository is looked for in <src>/.hg/patches by\n" |
|
2926 | " Source patch repository is looked for in <src>/.hg/patches by\n" | |
2929 |
" default. |
|
2927 | " default. Use -p <url> to change.\n" | |
2930 | "\n" |
|
2928 | "\n" | |
2931 | " The patch directory must be a nested mercurial repository, as\n" |
|
2929 | " The patch directory must be a nested mercurial repository, as\n" | |
2932 | " would be created by qinit -c.\n" |
|
2930 | " would be created by qinit -c.\n" | |
@@ -2936,17 +2934,17 b' msgstr ""' | |||||
2936 | msgid "versioned patch repository not found (see qinit -c)" |
|
2934 | msgid "versioned patch repository not found (see qinit -c)" | |
2937 | msgstr "" |
|
2935 | msgstr "" | |
2938 |
|
2936 | |||
2939 | msgid "cloning main repo\n" |
|
2937 | msgid "cloning main repository\n" | |
2940 | msgstr "" |
|
2938 | msgstr "" | |
2941 |
|
2939 | |||
2942 | msgid "cloning patch repo\n" |
|
2940 | msgid "cloning patch repository\n" | |
2943 | msgstr "" |
|
2941 | msgstr "Klone Patch-Archiv\n" | |
2944 |
|
2942 | |||
2945 | msgid "stripping applied patches from destination repo\n" |
|
2943 | msgid "stripping applied patches from destination repository\n" | |
2946 | msgstr "" |
|
2944 | msgstr "" | |
2947 |
|
2945 | |||
2948 | msgid "updating destination repo\n" |
|
2946 | msgid "updating destination repository\n" | |
2949 | msgstr "" |
|
2947 | msgstr "Aktualisiere Zielarchiv\n" | |
2950 |
|
2948 | |||
2951 | msgid "commit changes in the queue repository" |
|
2949 | msgid "commit changes in the queue repository" | |
2952 | msgstr "" |
|
2950 | msgstr "" | |
@@ -2972,21 +2970,19 b' msgstr ""' | |||||
2972 | msgid "" |
|
2970 | msgid "" | |
2973 | "create a new patch\n" |
|
2971 | "create a new patch\n" | |
2974 | "\n" |
|
2972 | "\n" | |
2975 |
" qnew creates a new patch on top of the currently-applied patch (if |
|
2973 | " qnew creates a new patch on top of the currently-applied patch (if\n" | |
2976 | "any).\n" |
|
2974 | " any). It will refuse to run if there are any outstanding changes\n" | |
2977 | " It will refuse to run if there are any outstanding changes unless -f is\n" |
|
2975 | " unless -f is specified, in which case the patch will be\n" | |
2978 | " specified, in which case the patch will be initialized with them. You\n" |
|
2976 | " initialized with them. You may also use -I, -X, and/or a list of\n" | |
2979 | " may also use -I, -X, and/or a list of files after the patch name to add\n" |
|
2977 | " files after the patch name to add only changes to matching files\n" | |
2980 |
" |
|
2978 | " to the new patch, leaving the rest as uncommitted modifications.\n" | |
2981 | " uncommitted modifications.\n" |
|
|||
2982 | "\n" |
|
2979 | "\n" | |
2983 | " -u and -d can be used to set the (given) user and date, respectively.\n" |
|
2980 | " -u and -d can be used to set the (given) user and date, respectively.\n" | |
2984 | " -U and -D set user to current user and date to current date.\n" |
|
2981 | " -U and -D set user to current user and date to current date.\n" | |
2985 | "\n" |
|
2982 | "\n" | |
2986 |
" -e, -m or -l set the patch header as well as the commit message. |
|
2983 | " -e, -m or -l set the patch header as well as the commit message.\n" | |
2987 | "none\n" |
|
2984 | " If none is specified, the header is empty and the commit message\n" | |
2988 | " is specified, the header is empty and the commit message is '[mq]: " |
|
2985 | " is '[mq]: PATCH'.\n" | |
2989 | "PATCH'.\n" |
|
|||
2990 | "\n" |
|
2986 | "\n" | |
2991 | " Use the --git option to keep the patch in the git extended diff\n" |
|
2987 | " Use the --git option to keep the patch in the git extended diff\n" | |
2992 | " format. Read the diffs help topic for more information on why this\n" |
|
2988 | " format. Read the diffs help topic for more information on why this\n" | |
@@ -2998,18 +2994,17 b' msgstr ""' | |||||
2998 | msgid "" |
|
2994 | msgid "" | |
2999 | "update the current patch\n" |
|
2995 | "update the current patch\n" | |
3000 | "\n" |
|
2996 | "\n" | |
3001 |
" If any file patterns are provided, the refreshed patch will |
|
2997 | " If any file patterns are provided, the refreshed patch will\n" | |
3002 | "only\n" |
|
2998 | " contain only the modifications that match those patterns; the\n" | |
3003 | " the modifications that match those patterns; the remaining " |
|
2999 | " remaining modifications will remain in the working directory.\n" | |
3004 | "modifications\n" |
|
3000 | "\n" | |
3005 | " will remain in the working directory.\n" |
|
3001 | " If --short is specified, files currently included in the patch\n" | |
3006 | "\n" |
|
3002 | " will be refreshed just like matched files and remain in the patch.\n" | |
3007 | " If --short is specified, files currently included in the patch will\n" |
|
3003 | "\n" | |
3008 | " be refreshed just like matched files and remain in the patch.\n" |
|
3004 | " hg add/remove/copy/rename work as usual, though you might want to\n" | |
3009 | "\n" |
|
3005 | " use git-style patches (--git or [diff] git=1) to track copies and\n" | |
3010 | " hg add/remove/copy/rename work as usual, though you might want to use\n" |
|
3006 | " renames. See the diffs help topic for more information on the git\n" | |
3011 | " git-style patches (--git or [diff] git=1) to track copies and renames.\n" |
|
3007 | " diff format.\n" | |
3012 | " See the diffs help topic for more information on the git diff format.\n" |
|
|||
3013 | " " |
|
3008 | " " | |
3014 | msgstr "" |
|
3009 | msgstr "" | |
3015 |
|
3010 | |||
@@ -3019,14 +3014,15 b' msgstr ""' | |||||
3019 | msgid "" |
|
3014 | msgid "" | |
3020 | "diff of the current patch and subsequent modifications\n" |
|
3015 | "diff of the current patch and subsequent modifications\n" | |
3021 | "\n" |
|
3016 | "\n" | |
3022 |
" Shows a diff which includes the current patch as well as any |
|
3017 | " Shows a diff which includes the current patch as well as any\n" | |
3023 | "which\n" |
|
3018 | " changes which have been made in the working directory since the\n" | |
3024 | " have been made in the working directory since the last refresh (thus\n" |
|
3019 | " last refresh (thus showing what the current patch would become\n" | |
3025 | " showing what the current patch would become after a qrefresh).\n" |
|
3020 | " after a qrefresh).\n" | |
3026 | "\n" |
|
3021 | "\n" | |
3027 |
" Use 'hg diff' if you only want to see the changes made since the |
|
3022 | " Use 'hg diff' if you only want to see the changes made since the\n" | |
3028 |
" qrefresh, or 'hg export qtip' if you want to see changes mad |
|
3023 | " last qrefresh, or 'hg export qtip' if you want to see changes made\n" | |
3029 |
" current patch without including changes made since the |
|
3024 | " by the current patch without including changes made since the\n" | |
|
3025 | " qrefresh.\n" | |||
3030 | " " |
|
3026 | " " | |
3031 | msgstr "" |
|
3027 | msgstr "" | |
3032 |
|
3028 | |||
@@ -3036,12 +3032,12 b' msgid ""' | |||||
3036 | " Patches must not yet be applied. Each patch will be successively\n" |
|
3032 | " Patches must not yet be applied. Each patch will be successively\n" | |
3037 | " applied to the current patch in the order given. If all the\n" |
|
3033 | " applied to the current patch in the order given. If all the\n" | |
3038 | " patches apply successfully, the current patch will be refreshed\n" |
|
3034 | " patches apply successfully, the current patch will be refreshed\n" | |
3039 | " with the new cumulative patch, and the folded patches will\n" |
|
3035 | " with the new cumulative patch, and the folded patches will be\n" | |
3040 |
" |
|
3036 | " deleted. With -k/--keep, the folded patch files will not be\n" | |
3041 |
" |
|
3037 | " removed afterwards.\n" | |
3042 | "\n" |
|
3038 | "\n" | |
3043 | " The header for each folded patch will be concatenated with\n" |
|
3039 | " The header for each folded patch will be concatenated with the\n" | |
3044 |
" |
|
3040 | " current patch header, separated by a line of '* * *'." | |
3045 | msgstr "" |
|
3041 | msgstr "" | |
3046 |
|
3042 | |||
3047 | msgid "qfold requires at least one patch name" |
|
3043 | msgid "qfold requires at least one patch name" | |
@@ -3099,8 +3095,8 b' msgstr ""' | |||||
3099 | msgid "" |
|
3095 | msgid "" | |
3100 | "push the next patch onto the stack\n" |
|
3096 | "push the next patch onto the stack\n" | |
3101 | "\n" |
|
3097 | "\n" | |
3102 |
" When --force is applied, all local changes in patched files will |
|
3098 | " When --force is applied, all local changes in patched files will\n" | |
3103 | "lost.\n" |
|
3099 | " be lost.\n" | |
3104 | " " |
|
3100 | " " | |
3105 | msgstr "" |
|
3101 | msgstr "" | |
3106 |
|
3102 | |||
@@ -3114,9 +3110,9 b' msgstr ""' | |||||
3114 | msgid "" |
|
3110 | msgid "" | |
3115 | "pop the current patch off the stack\n" |
|
3111 | "pop the current patch off the stack\n" | |
3116 | "\n" |
|
3112 | "\n" | |
3117 |
" By default, pops off the top of the patch stack. If given a patch |
|
3113 | " By default, pops off the top of the patch stack. If given a patch\n" | |
3118 |
" keeps popping off patches until the named patch is at the |
|
3114 | " name, keeps popping off patches until the named patch is at the\n" | |
3119 | "stack.\n" |
|
3115 | " top of the stack.\n" | |
3120 | " " |
|
3116 | " " | |
3121 | msgstr "" |
|
3117 | msgstr "" | |
3122 |
|
3118 | |||
@@ -3139,7 +3135,7 b' msgstr ""' | |||||
3139 | msgid "A patch named %s already exists in the series file" |
|
3135 | msgid "A patch named %s already exists in the series file" | |
3140 | msgstr "" |
|
3136 | msgstr "" | |
3141 |
|
3137 | |||
3142 | msgid "restore the queue state saved by a rev" |
|
3138 | msgid "restore the queue state saved by a revision" | |
3143 | msgstr "" |
|
3139 | msgstr "" | |
3144 |
|
3140 | |||
3145 | msgid "save current queue state" |
|
3141 | msgid "save current queue state" | |
@@ -3160,8 +3156,9 b' msgstr ""' | |||||
3160 | msgid "" |
|
3156 | msgid "" | |
3161 | "strip a revision and all its descendants from the repository\n" |
|
3157 | "strip a revision and all its descendants from the repository\n" | |
3162 | "\n" |
|
3158 | "\n" | |
3163 |
" If one of the working dir's parent revisions is stripped, the |
|
3159 | " If one of the working directory's parent revisions is stripped, the\n" | |
3164 |
" directory will be updated to the parent of the stripped |
|
3160 | " working directory will be updated to the parent of the stripped\n" | |
|
3161 | " revision.\n" | |||
3165 | " " |
|
3162 | " " | |
3166 | msgstr "" |
|
3163 | msgstr "" | |
3167 |
|
3164 | |||
@@ -3169,34 +3166,34 b' msgid ""' | |||||
3169 | "set or print guarded patches to push\n" |
|
3166 | "set or print guarded patches to push\n" | |
3170 | "\n" |
|
3167 | "\n" | |
3171 | " Use the qguard command to set or print guards on patch, then use\n" |
|
3168 | " Use the qguard command to set or print guards on patch, then use\n" | |
3172 |
" qselect to tell mq which guards to use. A patch will be pushed if |
|
3169 | " qselect to tell mq which guards to use. A patch will be pushed if\n" | |
3173 |
" has no guards or any positive guards match the currently |
|
3170 | " it has no guards or any positive guards match the currently\n" | |
3174 | "guard,\n" |
|
3171 | " selected guard, but will not be pushed if any negative guards\n" | |
3175 | " but will not be pushed if any negative guards match the current guard.\n" |
|
3172 | " match the current guard. For example:\n" | |
3176 | " For example:\n" |
|
|||
3177 | "\n" |
|
3173 | "\n" | |
3178 | " qguard foo.patch -stable (negative guard)\n" |
|
3174 | " qguard foo.patch -stable (negative guard)\n" | |
3179 | " qguard bar.patch +stable (positive guard)\n" |
|
3175 | " qguard bar.patch +stable (positive guard)\n" | |
3180 | " qselect stable\n" |
|
3176 | " qselect stable\n" | |
3181 | "\n" |
|
3177 | "\n" | |
3182 | " This activates the \"stable\" guard. mq will skip foo.patch (because\n" |
|
3178 | " This activates the \"stable\" guard. mq will skip foo.patch (because\n" | |
3183 | " it has a negative match) but push bar.patch (because it\n" |
|
3179 | " it has a negative match) but push bar.patch (because it has a\n" | |
3184 |
" |
|
3180 | " positive match).\n" | |
3185 | "\n" |
|
3181 | "\n" | |
3186 | " With no arguments, prints the currently active guards.\n" |
|
3182 | " With no arguments, prints the currently active guards.\n" | |
3187 | " With one argument, sets the active guard.\n" |
|
3183 | " With one argument, sets the active guard.\n" | |
3188 | "\n" |
|
3184 | "\n" | |
3189 | " Use -n/--none to deactivate guards (no other arguments needed).\n" |
|
3185 | " Use -n/--none to deactivate guards (no other arguments needed).\n" | |
3190 |
" When no guards are active, patches with positive guards are |
|
3186 | " When no guards are active, patches with positive guards are\n" | |
3191 | " and patches with negative guards are pushed.\n" |
|
3187 | " skipped and patches with negative guards are pushed.\n" | |
3192 | "\n" |
|
3188 | "\n" | |
3193 | " qselect can change the guards on applied patches. It does not pop\n" |
|
3189 | " qselect can change the guards on applied patches. It does not pop\n" | |
3194 |
" guarded patches by default. Use --pop to pop back to the last |
|
3190 | " guarded patches by default. Use --pop to pop back to the last\n" | |
3195 |
" patch that is not guarded. Use --reapply (which implies |
|
3191 | " applied patch that is not guarded. Use --reapply (which implies\n" | |
3196 |
" back to the current patch afterwards, but skip |
|
3192 | " --pop) to push back to the current patch afterwards, but skip\n" | |
3197 | "\n" |
|
3193 | " guarded patches.\n" | |
3198 | " Use -s/--series to print a list of all guards in the series file (no\n" |
|
3194 | "\n" | |
3199 | " other arguments needed). Use -v for more information." |
|
3195 | " Use -s/--series to print a list of all guards in the series file\n" | |
|
3196 | " (no other arguments needed). Use -v for more information." | |||
3200 | msgstr "" |
|
3197 | msgstr "" | |
3201 |
|
3198 | |||
3202 | msgid "guards deactivated\n" |
|
3199 | msgid "guards deactivated\n" | |
@@ -3231,17 +3228,18 b' msgstr ""' | |||||
3231 | msgid "" |
|
3228 | msgid "" | |
3232 | "move applied patches into repository history\n" |
|
3229 | "move applied patches into repository history\n" | |
3233 | "\n" |
|
3230 | "\n" | |
3234 |
" Finishes the specified revisions (corresponding to applied |
|
3231 | " Finishes the specified revisions (corresponding to applied\n" | |
3235 |
" moving them out of mq control into regular repository |
|
3232 | " patches) by moving them out of mq control into regular repository\n" | |
|
3233 | " history.\n" | |||
3236 | "\n" |
|
3234 | "\n" | |
3237 | " Accepts a revision range or the --applied option. If --applied is\n" |
|
3235 | " Accepts a revision range or the --applied option. If --applied is\n" | |
3238 | " specified, all applied mq revisions are removed from mq control.\n" |
|
3236 | " specified, all applied mq revisions are removed from mq control.\n" | |
3239 | " Otherwise, the given revisions must be at the base of the stack of\n" |
|
3237 | " Otherwise, the given revisions must be at the base of the stack of\n" | |
3240 | " applied patches.\n" |
|
3238 | " applied patches.\n" | |
3241 | "\n" |
|
3239 | "\n" | |
3242 |
" This can be especially useful if your changes have been applied to |
|
3240 | " This can be especially useful if your changes have been applied to\n" | |
3243 |
" upstream repository, or if you are about to push your changes |
|
3241 | " an upstream repository, or if you are about to push your changes\n" | |
3244 | "upstream.\n" |
|
3242 | " to upstream.\n" | |
3245 | " " |
|
3243 | " " | |
3246 | msgstr "" |
|
3244 | msgstr "" | |
3247 |
|
3245 | |||
@@ -3280,7 +3278,7 b' msgstr ""' | |||||
3280 | msgid "use uncompressed transfer (fast over LAN)" |
|
3278 | msgid "use uncompressed transfer (fast over LAN)" | |
3281 | msgstr "Nutzt unkomprimierte Übertragung (schnell im LAN)" |
|
3279 | msgstr "Nutzt unkomprimierte Übertragung (schnell im LAN)" | |
3282 |
|
3280 | |||
3283 | msgid "location of source patch repo" |
|
3281 | msgid "location of source patch repository" | |
3284 | msgstr "" |
|
3282 | msgstr "" | |
3285 |
|
3283 | |||
3286 | msgid "hg qclone [OPTION]... SOURCE [DEST]" |
|
3284 | msgid "hg qclone [OPTION]... SOURCE [DEST]" | |
@@ -3328,7 +3326,7 b' msgstr ""' | |||||
3328 | msgid "hg qheader [PATCH]" |
|
3326 | msgid "hg qheader [PATCH]" | |
3329 | msgstr "" |
|
3327 | msgstr "" | |
3330 |
|
3328 | |||
3331 | msgid "import file in patch dir" |
|
3329 | msgid "import file in patch directory" | |
3332 | msgstr "" |
|
3330 | msgstr "" | |
3333 |
|
3331 | |||
3334 | msgid "patch file name" |
|
3332 | msgid "patch file name" | |
@@ -3430,7 +3428,7 b' msgstr ""' | |||||
3430 | msgid "delete save entry" |
|
3428 | msgid "delete save entry" | |
3431 | msgstr "" |
|
3429 | msgstr "" | |
3432 |
|
3430 | |||
3433 | msgid "update queue working dir" |
|
3431 | msgid "update queue working directory" | |
3434 | msgstr "" |
|
3432 | msgstr "" | |
3435 |
|
3433 | |||
3436 | msgid "hg qrestore [-d] [-u] REV" |
|
3434 | msgid "hg qrestore [-d] [-u] REV" | |
@@ -3554,10 +3552,10 b' msgid ""' | |||||
3554 | "emails\n" |
|
3552 | "emails\n" | |
3555 | " pattern = user@host\n" |
|
3553 | " pattern = user@host\n" | |
3556 | "\n" |
|
3554 | "\n" | |
3557 | " glob patterns are matched against path to repo root.\n" |
|
3555 | " glob patterns are matched against path to repository root.\n" | |
3558 | "\n" |
|
3556 | "\n" | |
3559 |
" if you like, you can put notify config file in repo that users |
|
3557 | " if you like, you can put notify config file in repository that users\n" | |
3560 | " push changes to, they can manage their own subscriptions." |
|
3558 | " can push changes to, they can manage their own subscriptions." | |
3561 | msgstr "" |
|
3559 | msgstr "" | |
3562 |
|
3560 | |||
3563 | msgid "email notification class." |
|
3561 | msgid "email notification class." | |
@@ -3611,7 +3609,7 b' msgid ""' | |||||
3611 | msgstr "" |
|
3609 | msgstr "" | |
3612 |
|
3610 | |||
3613 | #, python-format |
|
3611 | #, python-format | |
3614 | msgid "notify: no subscribers to repo %s\n" |
|
3612 | msgid "notify: no subscribers to repository %s\n" | |
3615 | msgstr "" |
|
3613 | msgstr "" | |
3616 |
|
3614 | |||
3617 | #, python-format |
|
3615 | #, python-format | |
@@ -3626,12 +3624,11 b' msgid ""' | |||||
3626 | " [pager]\n" |
|
3624 | " [pager]\n" | |
3627 | " pager = LESS='FSRX' less\n" |
|
3625 | " pager = LESS='FSRX' less\n" | |
3628 | "\n" |
|
3626 | "\n" | |
3629 | "If no pager is set, the pager extensions uses the environment\n" |
|
3627 | "If no pager is set, the pager extensions uses the environment variable\n" | |
3630 |
" |
|
3628 | "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" | |
3631 | "is used.\n" |
|
3629 | "\n" | |
3632 | "\n" |
|
3630 | "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" | |
3633 | "If you notice \"BROKEN PIPE\" error messages, you can disable them\n" |
|
3631 | "setting:\n" | |
3634 | "by setting:\n" |
|
|||
3635 | "\n" |
|
3632 | "\n" | |
3636 | " [pager]\n" |
|
3633 | " [pager]\n" | |
3637 | " quiet = True\n" |
|
3634 | " quiet = True\n" | |
@@ -3642,23 +3639,23 b' msgid ""' | |||||
3642 | " [pager]\n" |
|
3639 | " [pager]\n" | |
3643 | " ignore = version, help, update\n" |
|
3640 | " ignore = version, help, update\n" | |
3644 | "\n" |
|
3641 | "\n" | |
3645 |
"You can also enable the pager only for certain commands using |
|
3642 | "You can also enable the pager only for certain commands using\n" | |
|
3643 | "pager.attend:\n" | |||
3646 | "\n" |
|
3644 | "\n" | |
3647 | " [pager]\n" |
|
3645 | " [pager]\n" | |
3648 | " attend = log\n" |
|
3646 | " attend = log\n" | |
3649 | "\n" |
|
3647 | "\n" | |
3650 | "If pager.attend is present, pager.ignore will be ignored.\n" |
|
3648 | "If pager.attend is present, pager.ignore will be ignored.\n" | |
3651 | "\n" |
|
3649 | "\n" | |
3652 |
"To ignore global commands like \"hg version\" or \"hg help\", you have to |
|
3650 | "To ignore global commands like \"hg version\" or \"hg help\", you have to\n" | |
3653 | "specify\n" |
|
3651 | "specify them in the global .hgrc\n" | |
3654 | "them in the global .hgrc\n" |
|
|||
3655 | msgstr "" |
|
3652 | msgstr "" | |
3656 |
|
3653 | |||
3657 | msgid "" |
|
3654 | msgid "" | |
3658 | "use suffixes to refer to ancestor revisions\n" |
|
3655 | "use suffixes to refer to ancestor revisions\n" | |
3659 | "\n" |
|
3656 | "\n" | |
3660 | "This extension allows you to use git-style suffixes to refer to\n" |
|
3657 | "This extension allows you to use git-style suffixes to refer to the\n" | |
3661 |
" |
|
3658 | "ancestors of a specific revision.\n" | |
3662 | "\n" |
|
3659 | "\n" | |
3663 | "For example, if you can refer to a revision as \"foo\", then:\n" |
|
3660 | "For example, if you can refer to a revision as \"foo\", then:\n" | |
3664 | "\n" |
|
3661 | "\n" | |
@@ -3677,12 +3674,12 b' msgstr ""' | |||||
3677 | msgid "" |
|
3674 | msgid "" | |
3678 | "sending Mercurial changesets as a series of patch emails\n" |
|
3675 | "sending Mercurial changesets as a series of patch emails\n" | |
3679 | "\n" |
|
3676 | "\n" | |
3680 | "The series is started off with a \"[PATCH 0 of N]\" introduction,\n" |
|
3677 | "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" | |
3681 |
" |
|
3678 | "describes the series as a whole.\n" | |
3682 | "\n" |
|
3679 | "\n" | |
3683 | "Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
|
3680 | "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" | |
3684 |
" |
|
3681 | "first line of the changeset description as the subject text. The\n" | |
3685 |
" |
|
3682 | "message contains two or three body parts:\n" | |
3686 | "\n" |
|
3683 | "\n" | |
3687 | " The remainder of the changeset description.\n" |
|
3684 | " The remainder of the changeset description.\n" | |
3688 | "\n" |
|
3685 | "\n" | |
@@ -3691,11 +3688,11 b' msgid ""' | |||||
3691 | " The patch itself, as generated by \"hg export\".\n" |
|
3688 | " The patch itself, as generated by \"hg export\".\n" | |
3692 | "\n" |
|
3689 | "\n" | |
3693 | "Each message refers to all of its predecessors using the In-Reply-To\n" |
|
3690 | "Each message refers to all of its predecessors using the In-Reply-To\n" | |
3694 | "and References headers, so they will show up as a sequence in\n" |
|
3691 | "and References headers, so they will show up as a sequence in threaded\n" | |
3695 |
" |
|
3692 | "mail and news readers, and in mail archives.\n" | |
3696 | "\n" |
|
3693 | "\n" | |
3697 | "For each changeset, you will be prompted with a diffstat summary and\n" |
|
3694 | "For each changeset, you will be prompted with a diffstat summary and\n" | |
3698 |
"the changeset summary, so you can be sure you are sending the right |
|
3695 | "the changeset summary, so you can be sure you are sending the right\n" | |
3699 | "changes.\n" |
|
3696 | "changes.\n" | |
3700 | "\n" |
|
3697 | "\n" | |
3701 | "To enable this extension:\n" |
|
3698 | "To enable this extension:\n" | |
@@ -3703,7 +3700,8 b' msgid ""' | |||||
3703 | " [extensions]\n" |
|
3700 | " [extensions]\n" | |
3704 | " hgext.patchbomb =\n" |
|
3701 | " hgext.patchbomb =\n" | |
3705 | "\n" |
|
3702 | "\n" | |
3706 |
"To configure other defaults, add a section like this to your hgrc |
|
3703 | "To configure other defaults, add a section like this to your hgrc\n" | |
|
3704 | "file:\n" | |||
3707 | "\n" |
|
3705 | "\n" | |
3708 | " [email]\n" |
|
3706 | " [email]\n" | |
3709 | " from = My Name <my@email>\n" |
|
3707 | " from = My Name <my@email>\n" | |
@@ -3715,24 +3713,24 b' msgid ""' | |||||
3715 | "as a patchbomb.\n" |
|
3713 | "as a patchbomb.\n" | |
3716 | "\n" |
|
3714 | "\n" | |
3717 | "To avoid sending patches prematurely, it is a good idea to first run\n" |
|
3715 | "To avoid sending patches prematurely, it is a good idea to first run\n" | |
3718 |
"the \"email\" command with the \"-n\" option (test only). |
|
3716 | "the \"email\" command with the \"-n\" option (test only). You will be\n" | |
3719 | "prompted for an email recipient address, a subject an an introductory\n" |
|
3717 | "prompted for an email recipient address, a subject an an introductory\n" | |
3720 |
"message describing the patches of your patchbomb. |
|
3718 | "message describing the patches of your patchbomb. Then when all is\n" | |
3721 | "done, patchbomb messages are displayed. If PAGER environment variable\n" |
|
3719 | "done, patchbomb messages are displayed. If PAGER environment variable\n" | |
3722 |
"is set, your pager will be fired up once for each patchbomb message, |
|
3720 | "is set, your pager will be fired up once for each patchbomb message,\n" | |
3723 | "you can verify everything is alright.\n" |
|
3721 | "so you can verify everything is alright.\n" | |
3724 | "\n" |
|
3722 | "\n" | |
3725 |
"The \"-m\" (mbox) option is also very useful. |
|
3723 | "The \"-m\" (mbox) option is also very useful. Instead of previewing each\n" | |
3726 |
" |
|
3724 | "patchbomb message in a pager or sending the messages directly, it will\n" | |
3727 |
" |
|
3725 | "create a UNIX mailbox file with the patch emails. This mailbox file\n" | |
3728 |
" |
|
3726 | "can be previewed with any mail user agent which supports UNIX mbox\n" | |
3729 |
" |
|
3727 | "files, e.g. with mutt:\n" | |
3730 | "\n" |
|
3728 | "\n" | |
3731 | " % mutt -R -f mbox\n" |
|
3729 | " % mutt -R -f mbox\n" | |
3732 | "\n" |
|
3730 | "\n" | |
3733 | "When you are previewing the patchbomb messages, you can use `formail'\n" |
|
3731 | "When you are previewing the patchbomb messages, you can use `formail'\n" | |
3734 |
"(a utility that is commonly installed as part of the procmail |
|
3732 | "(a utility that is commonly installed as part of the procmail\n" | |
3735 | "to send each message out:\n" |
|
3733 | "package), to send each message out:\n" | |
3736 | "\n" |
|
3734 | "\n" | |
3737 | " % formail -s sendmail -bm -t < mbox\n" |
|
3735 | " % formail -s sendmail -bm -t < mbox\n" | |
3738 | "\n" |
|
3736 | "\n" | |
@@ -3740,9 +3738,9 b' msgid ""' | |||||
3740 | "\n" |
|
3738 | "\n" | |
3741 | "You can also either configure the method option in the email section\n" |
|
3739 | "You can also either configure the method option in the email section\n" | |
3742 | "to be a sendmail compatable mailer or fill out the [smtp] section so\n" |
|
3740 | "to be a sendmail compatable mailer or fill out the [smtp] section so\n" | |
3743 |
"that the patchbomb extension can automatically send patchbombs |
|
3741 | "that the patchbomb extension can automatically send patchbombs\n" | |
3744 |
"from the commandline. See the [email] and [smtp] sections in |
|
3742 | "directly from the commandline. See the [email] and [smtp] sections in\n" | |
3745 | "for details." |
|
3743 | "hgrc(5) for details." | |
3746 | msgstr "" |
|
3744 | msgstr "" | |
3747 |
|
3745 | |||
3748 | msgid "Please enter a valid value.\n" |
|
3746 | msgid "Please enter a valid value.\n" | |
@@ -3758,23 +3756,23 b' msgid ""' | |||||
3758 | "send changesets by email\n" |
|
3756 | "send changesets by email\n" | |
3759 | "\n" |
|
3757 | "\n" | |
3760 | " By default, diffs are sent in the format generated by hg export,\n" |
|
3758 | " By default, diffs are sent in the format generated by hg export,\n" | |
3761 |
" one per message. |
|
3759 | " one per message. The series starts with a \"[PATCH 0 of N]\"\n" | |
3762 | " introduction, which describes the series as a whole.\n" |
|
3760 | " introduction, which describes the series as a whole.\n" | |
3763 | "\n" |
|
3761 | "\n" | |
3764 | " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
|
3762 | " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" | |
3765 | " the first line of the changeset description as the subject text.\n" |
|
3763 | " the first line of the changeset description as the subject text.\n" | |
3766 |
" The message contains two or three body parts. |
|
3764 | " The message contains two or three body parts. First, the rest of\n" | |
3767 |
" the changeset description. |
|
3765 | " the changeset description. Next, (optionally) if the diffstat\n" | |
3768 | " program is installed, the result of running diffstat on the patch.\n" |
|
3766 | " program is installed, the result of running diffstat on the patch.\n" | |
3769 | " Finally, the patch itself, as generated by \"hg export\".\n" |
|
3767 | " Finally, the patch itself, as generated by \"hg export\".\n" | |
3770 | "\n" |
|
3768 | "\n" | |
3771 | " With --outgoing, emails will be generated for patches not\n" |
|
3769 | " With --outgoing, emails will be generated for patches not found in\n" | |
3772 |
" |
|
3770 | " the destination repository (or only those which are ancestors of\n" | |
3773 |
" |
|
3771 | " the specified revisions if any are provided)\n" | |
3774 | "\n" |
|
3772 | "\n" | |
3775 | " With --bundle, changesets are selected as for --outgoing,\n" |
|
3773 | " With --bundle, changesets are selected as for --outgoing, but a\n" | |
3776 |
" |
|
3774 | " single email containing a binary Mercurial bundle as an attachment\n" | |
3777 |
" |
|
3775 | " will be sent.\n" | |
3778 | "\n" |
|
3776 | "\n" | |
3779 | " Examples:\n" |
|
3777 | " Examples:\n" | |
3780 | "\n" |
|
3778 | "\n" | |
@@ -3794,8 +3792,8 b' msgid ""' | |||||
3794 | "default\n" |
|
3792 | "default\n" | |
3795 | " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" |
|
3793 | " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" | |
3796 | "\n" |
|
3794 | "\n" | |
3797 |
" Before using this command, you will need to enable email in your |
|
3795 | " Before using this command, you will need to enable email in your\n" | |
3798 | " See the [email] section in hgrc(5) for details.\n" |
|
3796 | " hgrc. See the [email] section in hgrc(5) for details.\n" | |
3799 | " " |
|
3797 | " " | |
3800 | msgstr "" |
|
3798 | msgstr "" | |
3801 |
|
3799 | |||
@@ -3871,6 +3869,9 b' msgstr ""' | |||||
3871 | msgid "subject of first message (intro or single patch)" |
|
3869 | msgid "subject of first message (intro or single patch)" | |
3872 | msgstr "" |
|
3870 | msgstr "" | |
3873 |
|
3871 | |||
|
3872 | msgid "\"message identifier to reply to\"" | |||
|
3873 | msgstr "" | |||
|
3874 | ||||
3874 | msgid "email addresses of recipients" |
|
3875 | msgid "email addresses of recipients" | |
3875 | msgstr "" |
|
3876 | msgstr "" | |
3876 |
|
3877 | |||
@@ -3904,13 +3905,13 b' msgstr ""' | |||||
3904 | msgid "" |
|
3905 | msgid "" | |
3905 | "removes files not tracked by Mercurial\n" |
|
3906 | "removes files not tracked by Mercurial\n" | |
3906 | "\n" |
|
3907 | "\n" | |
3907 |
" Delete files not known to Mercurial. This is useful to test local |
|
3908 | " Delete files not known to Mercurial. This is useful to test local\n" | |
3908 | " uncommitted changes in an otherwise-clean source tree.\n" |
|
3909 | " and uncommitted changes in an otherwise-clean source tree.\n" | |
3909 | "\n" |
|
3910 | "\n" | |
3910 | " This means that purge will delete:\n" |
|
3911 | " This means that purge will delete:\n" | |
3911 | " - Unknown files: files marked with \"?\" by \"hg status\"\n" |
|
3912 | " - Unknown files: files marked with \"?\" by \"hg status\"\n" | |
3912 |
" - Empty directories: in fact Mercurial ignores directories unless |
|
3913 | " - Empty directories: in fact Mercurial ignores directories unless\n" | |
3913 | " contain files under source control managment\n" |
|
3914 | " they contain files under source control managment\n" | |
3914 | " But it will leave untouched:\n" |
|
3915 | " But it will leave untouched:\n" | |
3915 | " - Modified and unmodified tracked files\n" |
|
3916 | " - Modified and unmodified tracked files\n" | |
3916 | " - Ignored files (unless --all is specified)\n" |
|
3917 | " - Ignored files (unless --all is specified)\n" | |
@@ -3919,9 +3920,10 b' msgid ""' | |||||
3919 | " If directories are given on the command line, only files in these\n" |
|
3920 | " If directories are given on the command line, only files in these\n" | |
3920 | " directories are considered.\n" |
|
3921 | " directories are considered.\n" | |
3921 | "\n" |
|
3922 | "\n" | |
3922 |
" Be careful with purge, as you could irreversibly delete some files |
|
3923 | " Be careful with purge, as you could irreversibly delete some files\n" | |
3923 |
" forgot to add to the repository. If you only want to print the |
|
3924 | " you forgot to add to the repository. If you only want to print the\n" | |
3924 |
" files that this program would delete, use the --print |
|
3925 | " list of files that this program would delete, use the --print\n" | |
|
3926 | " option.\n" | |||
3925 | " " |
|
3927 | " " | |
3926 | msgstr "" |
|
3928 | msgstr "" | |
3927 |
|
3929 | |||
@@ -3956,11 +3958,10 b' msgstr "Beendet Dateinamen mit NUL zur N' | |||||
3956 | msgid "hg purge [OPTION]... [DIR]..." |
|
3958 | msgid "hg purge [OPTION]... [DIR]..." | |
3957 | msgstr "" |
|
3959 | msgstr "" | |
3958 |
|
3960 | |||
3959 | # Nicht übersetzen |
|
|||
3960 | msgid "" |
|
3961 | msgid "" | |
3961 | "move sets of revisions to a different ancestor\n" |
|
3962 | "move sets of revisions to a different ancestor\n" | |
3962 | "\n" |
|
3963 | "\n" | |
3963 |
"This extension lets you rebase changesets in an existing Mercurial |
|
3964 | "This extension lets you rebase changesets in an existing Mercurial\n" | |
3964 | "repository.\n" |
|
3965 | "repository.\n" | |
3965 | "\n" |
|
3966 | "\n" | |
3966 | "For more information:\n" |
|
3967 | "For more information:\n" | |
@@ -3977,15 +3978,12 b' msgstr "Erste Revision, \xc3\xa4ndere den Vorg\xc3\xa4nger nicht\\n"' | |||||
3977 | msgid "" |
|
3978 | msgid "" | |
3978 | "move changeset (and descendants) to a different branch\n" |
|
3979 | "move changeset (and descendants) to a different branch\n" | |
3979 | "\n" |
|
3980 | "\n" | |
3980 |
" Rebase uses repeated merging to graft changesets from one part of |
|
3981 | " Rebase uses repeated merging to graft changesets from one part of\n" | |
3981 | "history\n" |
|
3982 | " history onto another. This can be useful for linearizing local\n" | |
3982 | " onto another. This can be useful for linearizing local changes relative " |
|
3983 | " changes relative to a master development tree.\n" | |
3983 |
" |
|
3984 | "\n" | |
3984 | " a master development tree.\n" |
|
3985 | " If a rebase is interrupted to manually resolve a merge, it can be\n" | |
3985 | "\n" |
|
3986 | " continued with --continue or aborted with --abort.\n" | |
3986 | " If a rebase is interrupted to manually resolve a merge, it can be " |
|
|||
3987 | "continued\n" |
|
|||
3988 | " with --continue or aborted with --abort.\n" |
|
|||
3989 | " " |
|
3987 | " " | |
3990 | msgstr "" |
|
3988 | msgstr "" | |
3991 | "Verschiebt Versionen (und ihre Nachfolger) auf einen abweichenden Zweig\n" |
|
3989 | "Verschiebt Versionen (und ihre Nachfolger) auf einen abweichenden Zweig\n" | |
@@ -4001,9 +3999,6 b' msgstr ""' | |||||
4001 | " abgebrochen werden.\n" |
|
3999 | " abgebrochen werden.\n" | |
4002 | " " |
|
4000 | " " | |
4003 |
|
4001 | |||
4004 | msgid "cannot use both keepbranches and extrafn" |
|
|||
4005 | msgstr "keepbranches und extrafn können nicht gleichzeitig genutzt werden" |
|
|||
4006 |
|
||||
4007 | msgid "cannot use both abort and continue" |
|
4002 | msgid "cannot use both abort and continue" | |
4008 | msgstr "abort und continue können nicht gleichzeitig genutzt werden" |
|
4003 | msgstr "abort und continue können nicht gleichzeitig genutzt werden" | |
4009 |
|
4004 | |||
@@ -4019,6 +4014,9 b' msgstr "Es k\xc3\xb6nnen nicht revision und base gleichzeitig angegeben werden"' | |||||
4019 | msgid "nothing to rebase\n" |
|
4014 | msgid "nothing to rebase\n" | |
4020 | msgstr "Kein Rebase nötig\n" |
|
4015 | msgstr "Kein Rebase nötig\n" | |
4021 |
|
4016 | |||
|
4017 | msgid "cannot use both keepbranches and extrafn" | |||
|
4018 | msgstr "keepbranches und extrafn können nicht gleichzeitig genutzt werden" | |||
|
4019 | ||||
4022 | msgid "rebase merging completed\n" |
|
4020 | msgid "rebase merging completed\n" | |
4023 | msgstr "Zusammenführungen des Rebase abgeschlossen\n" |
|
4021 | msgstr "Zusammenführungen des Rebase abgeschlossen\n" | |
4024 |
|
4022 | |||
@@ -4091,6 +4089,9 b' msgstr ""' | |||||
4091 | "Revision %d kann nicht als Basis genutzt werden, das Ergebnis hätte 3 " |
|
4089 | "Revision %d kann nicht als Basis genutzt werden, das Ergebnis hätte 3 " | |
4092 | "Vorgänger" |
|
4090 | "Vorgänger" | |
4093 |
|
4091 | |||
|
4092 | msgid "Return true if the given patch is in git format" | |||
|
4093 | msgstr "" | |||
|
4094 | ||||
4094 | # Nicht übersetzen |
|
4095 | # Nicht übersetzen | |
4095 | msgid "Update rebased mq patches - finalize and then import them" |
|
4096 | msgid "Update rebased mq patches - finalize and then import them" | |
4096 | msgstr "" |
|
4097 | msgstr "" | |
@@ -4175,12 +4176,6 b' msgstr ""' | |||||
4175 | msgid "rebase working directory to branch head" |
|
4176 | msgid "rebase working directory to branch head" | |
4176 | msgstr "Führt Rebase zu einem Zweigkopf auf dem Arbeitsverzeichnis aus" |
|
4177 | msgstr "Führt Rebase zu einem Zweigkopf auf dem Arbeitsverzeichnis aus" | |
4177 |
|
4178 | |||
4178 | msgid "keep original revisions" |
|
|||
4179 | msgstr "Behält die ursprünglichen Revisionen" |
|
|||
4180 |
|
||||
4181 | msgid "keep original branches" |
|
|||
4182 | msgstr "Behält die ursprünglichen Zweige" |
|
|||
4183 |
|
||||
4184 | msgid "rebase from a given revision" |
|
4179 | msgid "rebase from a given revision" | |
4185 | msgstr "Rebase ab einer angegebenen Revision" |
|
4180 | msgstr "Rebase ab einer angegebenen Revision" | |
4186 |
|
4181 | |||
@@ -4193,6 +4188,12 b' msgstr "Rebase der angegebene Revision"' | |||||
4193 | msgid "collapse the rebased revisions" |
|
4188 | msgid "collapse the rebased revisions" | |
4194 | msgstr "Faltet die erzeugten Revisionen nach dem Rebase zusammen" |
|
4189 | msgstr "Faltet die erzeugten Revisionen nach dem Rebase zusammen" | |
4195 |
|
4190 | |||
|
4191 | msgid "keep original revisions" | |||
|
4192 | msgstr "Behält die ursprünglichen Revisionen" | |||
|
4193 | ||||
|
4194 | msgid "keep original branches" | |||
|
4195 | msgstr "Behält die ursprünglichen Zweige" | |||
|
4196 | ||||
4196 | msgid "continue an interrupted rebase" |
|
4197 | msgid "continue an interrupted rebase" | |
4197 | msgstr "Führt einen unterbrochenen Rebase fort" |
|
4198 | msgstr "Führt einen unterbrochenen Rebase fort" | |
4198 |
|
4199 | |||
@@ -4200,7 +4201,8 b' msgid "abort an interrupted rebase"' | |||||
4200 | msgstr "Bricht einen unterbrochenen Rebase ab" |
|
4201 | msgstr "Bricht einen unterbrochenen Rebase ab" | |
4201 |
|
4202 | |||
4202 | msgid "" |
|
4203 | msgid "" | |
4203 |
"hg rebase [-s |
|
4204 | "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " | |
|
4205 | "| [-c] | [-a]" | |||
4204 | msgstr "" |
|
4206 | msgstr "" | |
4205 |
|
4207 | |||
4206 | # Nicht übersetzen |
|
4208 | # Nicht übersetzen | |
@@ -4339,7 +4341,7 b' msgid ""' | |||||
4339 | "\n" |
|
4341 | "\n" | |
4340 | " You will be prompted for whether to record changes to each\n" |
|
4342 | " You will be prompted for whether to record changes to each\n" | |
4341 | " modified file, and for files with multiple changes, for each\n" |
|
4343 | " modified file, and for files with multiple changes, for each\n" | |
4342 |
" change to use. |
|
4344 | " change to use. For each query, the following responses are\n" | |
4343 | " possible:\n" |
|
4345 | " possible:\n" | |
4344 | "\n" |
|
4346 | "\n" | |
4345 | " y - record this change\n" |
|
4347 | " y - record this change\n" | |
@@ -4441,8 +4443,8 b' msgid ""' | |||||
4441 | "\n" |
|
4443 | "\n" | |
4442 | "This extension allows you to transplant patches from another branch.\n" |
|
4444 | "This extension allows you to transplant patches from another branch.\n" | |
4443 | "\n" |
|
4445 | "\n" | |
4444 |
"Transplanted patches are recorded in .hg/transplant/transplants, as a |
|
4446 | "Transplanted patches are recorded in .hg/transplant/transplants, as a\n" | |
4445 | "from a changeset hash to its hash in the source repository.\n" |
|
4447 | "map from a changeset hash to its hash in the source repository.\n" | |
4446 | msgstr "" |
|
4448 | msgstr "" | |
4447 |
|
4449 | |||
4448 | msgid "" |
|
4450 | msgid "" | |
@@ -4534,8 +4536,8 b' msgid ""' | |||||
4534 | " (transplanted from CHANGESETHASH)\n" |
|
4536 | " (transplanted from CHANGESETHASH)\n" | |
4535 | "\n" |
|
4537 | "\n" | |
4536 | " You can rewrite the changelog message with the --filter option.\n" |
|
4538 | " You can rewrite the changelog message with the --filter option.\n" | |
4537 | " Its argument will be invoked with the current changelog message\n" |
|
4539 | " Its argument will be invoked with the current changelog message as\n" | |
4538 |
" |
|
4540 | " $1 and the patch as $2.\n" | |
4539 | "\n" |
|
4541 | "\n" | |
4540 | " If --source is specified, selects changesets from the named\n" |
|
4542 | " If --source is specified, selects changesets from the named\n" | |
4541 | " repository. If --branch is specified, selects changesets from the\n" |
|
4543 | " repository. If --branch is specified, selects changesets from the\n" | |
@@ -4543,19 +4545,21 b' msgid ""' | |||||
4543 | " is specified, all changesets on the branch will be transplanted,\n" |
|
4545 | " is specified, all changesets on the branch will be transplanted,\n" | |
4544 | " otherwise you will be prompted to select the changesets you want.\n" |
|
4546 | " otherwise you will be prompted to select the changesets you want.\n" | |
4545 | "\n" |
|
4547 | "\n" | |
4546 |
" hg transplant --branch REVISION --all will rebase the selected |
|
4548 | " hg transplant --branch REVISION --all will rebase the selected\n" | |
4547 |
" (up to the named revision) onto your current working |
|
4549 | " branch (up to the named revision) onto your current working\n" | |
4548 | "\n" |
|
4550 | " directory.\n" | |
4549 | " You can optionally mark selected transplanted changesets as\n" |
|
4551 | "\n" | |
4550 | " merge changesets. You will not be prompted to transplant any\n" |
|
4552 | " You can optionally mark selected transplanted changesets as merge\n" | |
4551 | " ancestors of a merged transplant, and you can merge descendants\n" |
|
4553 | " changesets. You will not be prompted to transplant any ancestors\n" | |
4552 | " of them normally instead of transplanting them.\n" |
|
4554 | " of a merged transplant, and you can merge descendants of them\n" | |
|
4555 | " normally instead of transplanting them.\n" | |||
4553 | "\n" |
|
4556 | "\n" | |
4554 | " If no merges or revisions are provided, hg transplant will start\n" |
|
4557 | " If no merges or revisions are provided, hg transplant will start\n" | |
4555 | " an interactive changeset browser.\n" |
|
4558 | " an interactive changeset browser.\n" | |
4556 | "\n" |
|
4559 | "\n" | |
4557 |
" If a changeset application fails, you can fix the merge by hand |
|
4560 | " If a changeset application fails, you can fix the merge by hand\n" | |
4558 |
" then resume where you left off by calling hg transplant |
|
4561 | " and then resume where you left off by calling hg transplant\n" | |
|
4562 | " --continue.\n" | |||
4559 | " " |
|
4563 | " " | |
4560 | msgstr "" |
|
4564 | msgstr "" | |
4561 |
|
4565 | |||
@@ -4611,18 +4615,18 b' msgstr ""' | |||||
4611 | msgid "" |
|
4615 | msgid "" | |
4612 | "allow to use MBCS path with problematic encoding.\n" |
|
4616 | "allow to use MBCS path with problematic encoding.\n" | |
4613 | "\n" |
|
4617 | "\n" | |
4614 | "Some MBCS encodings are not good for some path operations\n" |
|
4618 | "Some MBCS encodings are not good for some path operations (i.e.\n" | |
4615 |
" |
|
4619 | "splitting path, case conversion, etc.) with its encoded bytes. We call\n" | |
4616 |
" |
|
4620 | "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" | |
4617 |
" |
|
4621 | "This extension can be used to fix the issue with those encodings by\n" | |
4618 |
" |
|
4622 | "wrapping some functions to convert to unicode string before path\n" | |
4619 |
" |
|
4623 | "operation.\n" | |
4620 | "\n" |
|
4624 | "\n" | |
4621 | "This extension is usefull for:\n" |
|
4625 | "This extension is usefull for:\n" | |
4622 | " * Japanese Windows users using shift_jis encoding.\n" |
|
4626 | " * Japanese Windows users using shift_jis encoding.\n" | |
4623 | " * Chinese Windows users using big5 encoding.\n" |
|
4627 | " * Chinese Windows users using big5 encoding.\n" | |
4624 | " * All users who use a repository with one of problematic encodings\n" |
|
4628 | " * All users who use a repository with one of problematic encodings on\n" | |
4625 |
" |
|
4629 | " case-insensitive file system.\n" | |
4626 | "\n" |
|
4630 | "\n" | |
4627 | "This extension is not needed for:\n" |
|
4631 | "This extension is not needed for:\n" | |
4628 | " * Any user who use only ascii chars in path.\n" |
|
4632 | " * Any user who use only ascii chars in path.\n" | |
@@ -4630,15 +4634,17 b' msgid ""' | |||||
4630 | "\n" |
|
4634 | "\n" | |
4631 | "Note that there are some limitations on using this extension:\n" |
|
4635 | "Note that there are some limitations on using this extension:\n" | |
4632 | " * You should use single encoding in one repository.\n" |
|
4636 | " * You should use single encoding in one repository.\n" | |
4633 |
" * You should set same encoding for the repository by locale or |
|
4637 | " * You should set same encoding for the repository by locale or\n" | |
|
4638 | " HGENCODING.\n" | |||
4634 | "\n" |
|
4639 | "\n" | |
4635 | "To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" |
|
4640 | "To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" | |
4636 | "\n" |
|
4641 | "\n" | |
4637 | " [extensions]\n" |
|
4642 | " [extensions]\n" | |
4638 | " hgext.win32mbcs =\n" |
|
4643 | " hgext.win32mbcs =\n" | |
4639 | "\n" |
|
4644 | "\n" | |
4640 |
"Path encoding conversion are done between unicode and |
|
4645 | "Path encoding conversion are done between unicode and\n" | |
4641 |
"which is decided by mercurial from current locale |
|
4646 | "encoding.encoding which is decided by mercurial from current locale\n" | |
|
4647 | "setting or HGENCODING.\n" | |||
4642 | "\n" |
|
4648 | "\n" | |
4643 | msgstr "" |
|
4649 | msgstr "" | |
4644 |
|
4650 | |||
@@ -4691,19 +4697,18 b' msgstr ""' | |||||
4691 | msgid "" |
|
4697 | msgid "" | |
4692 | "zeroconf support for mercurial repositories\n" |
|
4698 | "zeroconf support for mercurial repositories\n" | |
4693 | "\n" |
|
4699 | "\n" | |
4694 |
"Zeroconf enabled repositories will be announced in a network without |
|
4700 | "Zeroconf enabled repositories will be announced in a network without\n" | |
4695 | "need\n" |
|
4701 | "the need to configure a server or a service. They can be discovered\n" | |
4696 | "to configure a server or a service. They can be discovered without knowing\n" |
|
4702 | "without knowing their actual IP address.\n" | |
4697 | "their actual IP address.\n" |
|
4703 | "\n" | |
4698 | "\n" |
|
4704 | "To use the zeroconf extension add the following entry to your hgrc\n" | |
4699 | "To use the zeroconf extension add the following entry to your hgrc file:\n" |
|
4705 | "file:\n" | |
4700 | "\n" |
|
4706 | "\n" | |
4701 | "[extensions]\n" |
|
4707 | "[extensions]\n" | |
4702 | "hgext.zeroconf =\n" |
|
4708 | "hgext.zeroconf =\n" | |
4703 | "\n" |
|
4709 | "\n" | |
4704 |
"To allow other people to discover your repository using run \"hg serve\" |
|
4710 | "To allow other people to discover your repository using run \"hg serve\"\n" | |
4705 | "your\n" |
|
4711 | "in your repository.\n" | |
4706 | "repository.\n" |
|
|||
4707 | "\n" |
|
4712 | "\n" | |
4708 | " $ cd test\n" |
|
4713 | " $ cd test\n" | |
4709 | " $ hg serve\n" |
|
4714 | " $ hg serve\n" | |
@@ -4949,7 +4954,8 b' msgstr "Datei %s steht nicht unter Versi' | |||||
4949 | msgid "" |
|
4954 | msgid "" | |
4950 | "add the specified files on the next commit\n" |
|
4955 | "add the specified files on the next commit\n" | |
4951 | "\n" |
|
4956 | "\n" | |
4952 |
" Schedule files to be version controlled and added to the |
|
4957 | " Schedule files to be version controlled and added to the\n" | |
|
4958 | " repository.\n" | |||
4953 | "\n" |
|
4959 | "\n" | |
4954 | " The files will be added to the repository at the next commit. To\n" |
|
4960 | " The files will be added to the repository at the next commit. To\n" | |
4955 | " undo an add before that, see hg revert.\n" |
|
4961 | " undo an add before that, see hg revert.\n" | |
@@ -4962,7 +4968,8 b' msgstr ""' | |||||
4962 | " Merkt Dateien zur Versionskontrolle im Projektarchiv vor.\n" |
|
4968 | " Merkt Dateien zur Versionskontrolle im Projektarchiv vor.\n" | |
4963 | "\n" |
|
4969 | "\n" | |
4964 | " Die Dateien werden dem Projektarchiv beim nächsten Übernehmen (commit)\n" |
|
4970 | " Die Dateien werden dem Projektarchiv beim nächsten Übernehmen (commit)\n" | |
4965 |
" hinzugefügt. Um diese Aktion vorher rückgängig zu machen, siehe hg |
|
4971 | " hinzugefügt. Um diese Aktion vorher rückgängig zu machen, siehe hg " | |
|
4972 | "revert.\n" | |||
4966 | "\n" |
|
4973 | "\n" | |
4967 | " Wenn keine Namen angegeben sind, füge alle Dateien dem Projektarchiv\n" |
|
4974 | " Wenn keine Namen angegeben sind, füge alle Dateien dem Projektarchiv\n" | |
4968 | " hinzu.\n" |
|
4975 | " hinzu.\n" | |
@@ -4971,17 +4978,19 b' msgstr ""' | |||||
4971 | msgid "" |
|
4978 | msgid "" | |
4972 | "add all new files, delete all missing files\n" |
|
4979 | "add all new files, delete all missing files\n" | |
4973 | "\n" |
|
4980 | "\n" | |
4974 |
" Add all new files and remove all missing files from the |
|
4981 | " Add all new files and remove all missing files from the\n" | |
4975 | "\n" |
|
4982 | " repository.\n" | |
4976 | " New files are ignored if they match any of the patterns in .hgignore. " |
|
4983 | "\n" | |
4977 | "As\n" |
|
4984 | " New files are ignored if they match any of the patterns in\n" | |
4978 |
" with add, these changes take effect at the next |
|
4985 | " .hgignore. As with add, these changes take effect at the next\n" | |
4979 | "\n" |
|
4986 | " commit.\n" | |
4980 | " Use the -s option to detect renamed files. With a parameter > 0,\n" |
|
4987 | "\n" | |
4981 | " this compares every removed file with every added file and records\n" |
|
4988 | " Use the -s/--similarity option to detect renamed files. With a\n" | |
4982 | " those similar enough as renames. This option takes a percentage\n" |
|
4989 | " parameter > 0, this compares every removed file with every added\n" | |
4983 | " between 0 (disabled) and 100 (files must be identical) as its\n" |
|
4990 | " file and records those similar enough as renames. This option\n" | |
4984 | " parameter. Detecting renamed files this way can be expensive.\n" |
|
4991 | " takes a percentage between 0 (disabled) and 100 (files must be\n" | |
|
4992 | " identical) as its parameter. Detecting renamed files this way can\n" | |||
|
4993 | " be expensive.\n" | |||
4985 | " " |
|
4994 | " " | |
4986 | msgstr "" |
|
4995 | msgstr "" | |
4987 | "Fügt alle neuen Dateien hinzu, löscht alle fehlenden Dateien\n" |
|
4996 | "Fügt alle neuen Dateien hinzu, löscht alle fehlenden Dateien\n" | |
@@ -5011,16 +5020,15 b' msgstr "similarity muss zwischen 0 und 1' | |||||
5011 | msgid "" |
|
5020 | msgid "" | |
5012 | "show changeset information per file line\n" |
|
5021 | "show changeset information per file line\n" | |
5013 | "\n" |
|
5022 | "\n" | |
5014 |
" List changes in files, showing the revision id responsible for |
|
5023 | " List changes in files, showing the revision id responsible for\n" | |
5015 | "line\n" |
|
5024 | " each line\n" | |
5016 | "\n" |
|
5025 | "\n" | |
5017 |
" This command is useful to discover who did a change or when a |
|
5026 | " This command is useful to discover who did a change or when a\n" | |
5018 | "took\n" |
|
5027 | " change took place.\n" | |
5019 | " place.\n" |
|
5028 | "\n" | |
5020 | "\n" |
|
5029 | " Without the -a/--text option, annotate will avoid processing files\n" | |
5021 | " Without the -a option, annotate will avoid processing files it\n" |
|
5030 | " it detects as binary. With -a, annotate will generate an\n" | |
5022 | " detects as binary. With -a, annotate will generate an annotation\n" |
|
5031 | " annotation anyway, probably with undesirable results.\n" | |
5023 | " anyway, probably with undesirable results.\n" |
|
|||
5024 | " " |
|
5032 | " " | |
5025 | msgstr "" |
|
5033 | msgstr "" | |
5026 | "Zeigt Änderungssatz (changeset) Informationen pro Dateizeile an\n" |
|
5034 | "Zeigt Änderungssatz (changeset) Informationen pro Dateizeile an\n" | |
@@ -5051,9 +5059,9 b' msgid ""' | |||||
5051 | "create unversioned archive of a repository revision\n" |
|
5059 | "create unversioned archive of a repository revision\n" | |
5052 | "\n" |
|
5060 | "\n" | |
5053 | " By default, the revision used is the parent of the working\n" |
|
5061 | " By default, the revision used is the parent of the working\n" | |
5054 |
" directory; use |
|
5062 | " directory; use -r/--rev to specify a different revision.\n" | |
5055 | "\n" |
|
5063 | "\n" | |
5056 |
" To specify the type of archive to create, use |
|
5064 | " To specify the type of archive to create, use -t/--type. Valid\n" | |
5057 | " types are:\n" |
|
5065 | " types are:\n" | |
5058 | "\n" |
|
5066 | "\n" | |
5059 | " \"files\" (default): a directory full of files\n" |
|
5067 | " \"files\" (default): a directory full of files\n" | |
@@ -5064,11 +5072,12 b' msgid ""' | |||||
5064 | " \"zip\": zip archive, compressed using deflate\n" |
|
5072 | " \"zip\": zip archive, compressed using deflate\n" | |
5065 | "\n" |
|
5073 | "\n" | |
5066 | " The exact name of the destination archive or directory is given\n" |
|
5074 | " The exact name of the destination archive or directory is given\n" | |
5067 |
" using a format string; see |
|
5075 | " using a format string; see 'hg help export' for details.\n" | |
5068 | "\n" |
|
5076 | "\n" | |
5069 | " Each member added to an archive file has a directory prefix\n" |
|
5077 | " Each member added to an archive file has a directory prefix\n" | |
5070 |
" prepended. Use |
|
5078 | " prepended. Use -p/--prefix to specify a format string for the\n" | |
5071 |
" The default is the basename of the archive, with suffixes |
|
5079 | " prefix. The default is the basename of the archive, with suffixes\n" | |
|
5080 | " removed.\n" | |||
5072 | " " |
|
5081 | " " | |
5073 | msgstr "" |
|
5082 | msgstr "" | |
5074 | "Erzeugt ein unversioniertes Archiv einer Projektarchiv-Revision\n" |
|
5083 | "Erzeugt ein unversioniertes Archiv einer Projektarchiv-Revision\n" | |
@@ -5088,10 +5097,10 b' msgstr ""' | |||||
5088 | " \"zip\": zip Archiv, komprimiert mit deflate\n" |
|
5097 | " \"zip\": zip Archiv, komprimiert mit deflate\n" | |
5089 | "\n" |
|
5098 | "\n" | |
5090 | " Der exakte Name des Zielarchivs oder -verzeichnises wird mit\n" |
|
5099 | " Der exakte Name des Zielarchivs oder -verzeichnises wird mit\n" | |
5091 |
" einem Format-String angegeben; siehe |
|
5100 | " einem Format-String angegeben; siehe 'hg help export' für Details.\n" | |
5092 | "\n" |
|
5101 | "\n" | |
5093 | " Jedem Element des Archivs wird ein Verzeichnis-Präfix vorangestellt.\n" |
|
5102 | " Jedem Element des Archivs wird ein Verzeichnis-Präfix vorangestellt.\n" | |
5094 |
" Nutze |
|
5103 | " Nutze -p/--prefix um eine Format-String für das Präfix anzugeben.\n" | |
5095 | " Als Standard wird der Dateiname des Archive ohne Dateiendung genutzt.\n" |
|
5104 | " Als Standard wird der Dateiname des Archive ohne Dateiendung genutzt.\n" | |
5096 | " " |
|
5105 | " " | |
5097 |
|
5106 | |||
@@ -5117,9 +5126,8 b' msgid ""' | |||||
5117 | "\n" |
|
5126 | "\n" | |
5118 | " The --merge option remembers the parent of the working directory\n" |
|
5127 | " The --merge option remembers the parent of the working directory\n" | |
5119 | " before starting the backout, then merges the new head with that\n" |
|
5128 | " before starting the backout, then merges the new head with that\n" | |
5120 | " changeset afterwards. This saves you from doing the merge by\n" |
|
5129 | " changeset afterwards. This saves you from doing the merge by hand.\n" | |
5121 |
" |
|
5130 | " The result of this merge is not committed, as with a normal merge.\n" | |
5122 | " merge.\n" |
|
|||
5123 | "\n" |
|
5131 | "\n" | |
5124 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
5132 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" | |
5125 | " " |
|
5133 | " " | |
@@ -5187,26 +5195,23 b' msgstr "(nutze \\"backout --merge\\" f\xc3\xbcr eine automatische Zusammenf\xc3\xbchrung)\\n"' | |||||
5187 | msgid "" |
|
5195 | msgid "" | |
5188 | "subdivision search of changesets\n" |
|
5196 | "subdivision search of changesets\n" | |
5189 | "\n" |
|
5197 | "\n" | |
5190 | " This command helps to find changesets which introduce problems.\n" |
|
5198 | " This command helps to find changesets which introduce problems. To\n" | |
5191 |
" |
|
5199 | " use, mark the earliest changeset you know exhibits the problem as\n" | |
5192 |
" |
|
5200 | " bad, then mark the latest changeset which is free from the problem\n" | |
5193 |
" |
|
5201 | " as good. Bisect will update your working directory to a revision\n" | |
5194 |
" |
|
5202 | " for testing (unless the -U/--noupdate option is specified). Once\n" | |
5195 |
" |
|
5203 | " you have performed tests, mark the working directory as bad or\n" | |
5196 |
" |
|
5204 | " good and bisect will either update to another candidate changeset\n" | |
5197 | " or announce that it has found the bad revision.\n" |
|
5205 | " or announce that it has found the bad revision.\n" | |
5198 | "\n" |
|
5206 | "\n" | |
5199 | " As a shortcut, you can also use the revision argument to mark a\n" |
|
5207 | " As a shortcut, you can also use the revision argument to mark a\n" | |
5200 | " revision as good or bad without checking it out first.\n" |
|
5208 | " revision as good or bad without checking it out first.\n" | |
5201 | "\n" |
|
5209 | "\n" | |
5202 |
" If you supply a command it will be used for automatic bisection. |
|
5210 | " If you supply a command it will be used for automatic bisection.\n" | |
5203 | "exit\n" |
|
5211 | " Its exit status will be used as flag to mark revision as bad or\n" | |
5204 | " status will be used as flag to mark revision as bad or good. In case " |
|
5212 | " good. In case exit status is 0 the revision is marked as good, 125\n" | |
5205 | "exit\n" |
|
5213 | " - skipped, 127 (command not found) - bisection will be aborted;\n" | |
5206 | " status is 0 the revision is marked as good, 125 - skipped, 127 (command " |
|
5214 | " any other status bigger than 0 will mark revision as bad.\n" | |
5207 | "not\n" |
|
|||
5208 | " found) - bisection will be aborted; any other status bigger than 0 will\n" |
|
|||
5209 | " mark revision as bad.\n" |
|
|||
5210 | " " |
|
5215 | " " | |
5211 | msgstr "" |
|
5216 | msgstr "" | |
5212 | "Binäre Suche von Änderungssätzen\n" |
|
5217 | "Binäre Suche von Änderungssätzen\n" | |
@@ -5277,14 +5282,16 b' msgid ""' | |||||
5277 | "set or show the current branch name\n" |
|
5282 | "set or show the current branch name\n" | |
5278 | "\n" |
|
5283 | "\n" | |
5279 | " With no argument, show the current branch name. With one argument,\n" |
|
5284 | " With no argument, show the current branch name. With one argument,\n" | |
5280 |
" set the working directory branch name (the branch does not exist |
|
5285 | " set the working directory branch name (the branch does not exist\n" | |
5281 | " the repository until the next commit).\n" |
|
5286 | " in the repository until the next commit). It is recommended to use\n" | |
5282 | "\n" |
|
5287 | " the 'default' branch as your primary development branch.\n" | |
5283 | " Unless --force is specified, branch will not let you set a\n" |
|
5288 | "\n" | |
|
5289 | " Unless -f/--force is specified, branch will not let you set a\n" | |||
5284 | " branch name that shadows an existing branch.\n" |
|
5290 | " branch name that shadows an existing branch.\n" | |
5285 | "\n" |
|
5291 | "\n" | |
5286 |
" Use --clean to reset the working directory branch to that of |
|
5292 | " Use -C/--clean to reset the working directory branch to that of\n" | |
5287 |
" parent of the working directory, negating a previous branch |
|
5293 | " the parent of the working directory, negating a previous branch\n" | |
|
5294 | " change.\n" | |||
5288 | "\n" |
|
5295 | "\n" | |
5289 | " Use the command 'hg update' to switch to an existing branch.\n" |
|
5296 | " Use the command 'hg update' to switch to an existing branch.\n" | |
5290 | " " |
|
5297 | " " | |
@@ -5294,6 +5301,8 b' msgstr ""' | |||||
5294 | " Ohne Parameter wird der Name des aktuellen Zweiges angezeigt. Mit einem\n" |
|
5301 | " Ohne Parameter wird der Name des aktuellen Zweiges angezeigt. Mit einem\n" | |
5295 | " Parameter wird der Zweigname des Arbeitsverzeichnisses gesetzt. Der\n" |
|
5302 | " Parameter wird der Zweigname des Arbeitsverzeichnisses gesetzt. Der\n" | |
5296 | " Zweig existiert nicht im Projektarchiv und muss erst übernommen werden.\n" |
|
5303 | " Zweig existiert nicht im Projektarchiv und muss erst übernommen werden.\n" | |
|
5304 | " Es wird empfohlen den 'default'-Zweig als Hauptentwicklungszweig zu\n" | |||
|
5305 | " nutzen.\n" | |||
5297 | "\n" |
|
5306 | "\n" | |
5298 | " Außer bei Angabe von --force lässt 'hg branch' nicht zu, einen Namen zu\n" |
|
5307 | " Außer bei Angabe von --force lässt 'hg branch' nicht zu, einen Namen zu\n" | |
5299 | " vergeben, der einen existierenden Zweig überdeckt.\n" |
|
5308 | " vergeben, der einen existierenden Zweig überdeckt.\n" | |
@@ -5347,13 +5356,14 b' msgid ""' | |||||
5347 | " If no destination repository is specified the destination is\n" |
|
5356 | " If no destination repository is specified the destination is\n" | |
5348 | " assumed to have all the nodes specified by one or more --base\n" |
|
5357 | " assumed to have all the nodes specified by one or more --base\n" | |
5349 | " parameters. To create a bundle containing all changesets, use\n" |
|
5358 | " parameters. To create a bundle containing all changesets, use\n" | |
5350 |
" --all (or --base null). To change the compression method |
|
5359 | " -a/--all (or --base null). To change the compression method\n" | |
5351 |
" use the -t option (by default, bundles are |
|
5360 | " applied, use the -t/--type option (by default, bundles are\n" | |
5352 | "\n" |
|
5361 | " compressed using bz2).\n" | |
5353 | " The bundle file can then be transferred using conventional means and\n" |
|
5362 | "\n" | |
5354 | " applied to another repository with the unbundle or pull command.\n" |
|
5363 | " The bundle file can then be transferred using conventional means\n" | |
5355 | " This is useful when direct push and pull are not available or when\n" |
|
5364 | " and applied to another repository with the unbundle or pull\n" | |
5356 | " exporting an entire repository is undesirable.\n" |
|
5365 | " command. This is useful when direct push and pull are not\n" | |
|
5366 | " available or when exporting an entire repository is undesirable.\n" | |||
5357 | "\n" |
|
5367 | "\n" | |
5358 | " Applying bundles preserves all changeset contents including\n" |
|
5368 | " Applying bundles preserves all changeset contents including\n" | |
5359 | " permissions, copy/rename information, and revision history.\n" |
|
5369 | " permissions, copy/rename information, and revision history.\n" | |
@@ -5391,8 +5401,8 b' msgstr "Unbekannter B\xc3\xbcndeltyp mit --type angegeben"' | |||||
5391 | msgid "" |
|
5401 | msgid "" | |
5392 | "output the current or given revision of files\n" |
|
5402 | "output the current or given revision of files\n" | |
5393 | "\n" |
|
5403 | "\n" | |
5394 | " Print the specified files as they were at the given revision.\n" |
|
5404 | " Print the specified files as they were at the given revision. If\n" | |
5395 |
" |
|
5405 | " no revision is given, the parent of the working directory is used,\n" | |
5396 | " or tip if no revision is checked out.\n" |
|
5406 | " or tip if no revision is checked out.\n" | |
5397 | "\n" |
|
5407 | "\n" | |
5398 | " Output may be to a file, in which case the name of the file is\n" |
|
5408 | " Output may be to a file, in which case the name of the file is\n" | |
@@ -5400,7 +5410,7 b' msgid ""' | |||||
5400 | " for the export command, with the following additions:\n" |
|
5410 | " for the export command, with the following additions:\n" | |
5401 | "\n" |
|
5411 | "\n" | |
5402 | " %s basename of file being printed\n" |
|
5412 | " %s basename of file being printed\n" | |
5403 | " %d dirname of file being printed, or '.' if in repo root\n" |
|
5413 | " %d dirname of file being printed, or '.' if in repository root\n" | |
5404 | " %p root-relative path name of file being printed\n" |
|
5414 | " %p root-relative path name of file being printed\n" | |
5405 | " " |
|
5415 | " " | |
5406 | msgstr "" |
|
5416 | msgstr "" | |
@@ -5421,6 +5431,7 b' msgstr ""' | |||||
5421 | " %p Pfad und Dateiname relativ zur Archiv-Wurzel\n" |
|
5431 | " %p Pfad und Dateiname relativ zur Archiv-Wurzel\n" | |
5422 | " " |
|
5432 | " " | |
5423 |
|
5433 | |||
|
5434 | ||||
5424 | msgid "" |
|
5435 | msgid "" | |
5425 | "make a copy of an existing repository\n" |
|
5436 | "make a copy of an existing repository\n" | |
5426 | "\n" |
|
5437 | "\n" | |
@@ -5432,6 +5443,23 b' msgid ""' | |||||
5432 | " The location of the source is added to the new repository's\n" |
|
5443 | " The location of the source is added to the new repository's\n" | |
5433 | " .hg/hgrc file, as the default to be used for future pulls.\n" |
|
5444 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
5434 | "\n" |
|
5445 | "\n" | |
|
5446 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |||
|
5447 | " no subsequent revisions (including subsequent tags) will be\n" | |||
|
5448 | " present in the cloned repository. This option implies --pull, even\n" | |||
|
5449 | " on local repositories.\n" | |||
|
5450 | "\n" | |||
|
5451 | " By default, clone will check out the head of the 'default' branch.\n" | |||
|
5452 | " If the -U/--noupdate option is used, the new clone will contain\n" | |||
|
5453 | " only a repository (.hg) and no working copy (the working copy\n" | |||
|
5454 | " parent is the null revision).\n" | |||
|
5455 | "\n" | |||
|
5456 | " See 'hg help urls' for valid source format details.\n" | |||
|
5457 | "\n" | |||
|
5458 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |||
|
5459 | " .hg/hgrc and working directory will be created on the remote side.\n" | |||
|
5460 | " Look at the help text for URLs for important details about ssh://\n" | |||
|
5461 | " URLs.\n" | |||
|
5462 | "\n" | |||
5435 | " For efficiency, hardlinks are used for cloning whenever the source\n" |
|
5463 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
5436 | " and destination are on the same filesystem (note this applies only\n" |
|
5464 | " and destination are on the same filesystem (note this applies only\n" | |
5437 | " to the repository data, not to the checked out files). Some\n" |
|
5465 | " to the repository data, not to the checked out files). Some\n" | |
@@ -5444,26 +5472,13 b' msgid ""' | |||||
5444 | "\n" |
|
5472 | "\n" | |
5445 | " $ cp -al REPO REPOCLONE\n" |
|
5473 | " $ cp -al REPO REPOCLONE\n" | |
5446 | "\n" |
|
5474 | "\n" | |
5447 |
" This is the fastest way to clone, but it is not always safe. |
|
5475 | " This is the fastest way to clone, but it is not always safe. The\n" | |
5448 | " operation is not atomic (making sure REPO is not modified during\n" |
|
5476 | " operation is not atomic (making sure REPO is not modified during\n" | |
5449 | " the operation is up to you) and you have to make sure your editor\n" |
|
5477 | " the operation is up to you) and you have to make sure your editor\n" | |
5450 |
" breaks hardlinks (Emacs and most Linux Kernel tools do so). |
|
5478 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
5451 | " this is not compatible with certain extensions that place their\n" |
|
5479 | " this is not compatible with certain extensions that place their\n" | |
5452 | " metadata under the .hg directory, such as mq.\n" |
|
5480 | " metadata under the .hg directory, such as mq.\n" | |
5453 | "\n" |
|
5481 | "\n" | |
5454 | " If you use the -r option to clone up to a specific revision, no\n" |
|
|||
5455 | " subsequent revisions will be present in the cloned repository.\n" |
|
|||
5456 | " This option implies --pull, even on local repositories.\n" |
|
|||
5457 | "\n" |
|
|||
5458 | " If the -U option is used, the new clone will contain only a repository\n" |
|
|||
5459 | " (.hg) and no working copy (the working copy parent is the null " |
|
|||
5460 | "revision).\n" |
|
|||
5461 | "\n" |
|
|||
5462 | " See 'hg help urls' for valid source format details.\n" |
|
|||
5463 | "\n" |
|
|||
5464 | " It is possible to specify an ssh:// URL as the destination, but no\n" |
|
|||
5465 | " .hg/hgrc and working directory will be created on the remote side.\n" |
|
|||
5466 | " Look at the help text for urls for important details about ssh:// URLs.\n" |
|
|||
5467 | " " |
|
5482 | " " | |
5468 | msgstr "" |
|
5483 | msgstr "" | |
5469 | "Erzeugt eine Kopie eines bestehenden Projektarchivs\n" |
|
5484 | "Erzeugt eine Kopie eines bestehenden Projektarchivs\n" | |
@@ -5476,6 +5491,22 b' msgstr ""' | |||||
5476 | " Die Adresse der Quelle wird der .hg/hgrc Datei des neuen Archivs\n" |
|
5491 | " Die Adresse der Quelle wird der .hg/hgrc Datei des neuen Archivs\n" | |
5477 | " als Standard für entfernte Aktionen (pull/push) hinzugefügt.\n" |
|
5492 | " als Standard für entfernte Aktionen (pull/push) hinzugefügt.\n" | |
5478 | "\n" |
|
5493 | "\n" | |
|
5494 | " Wenn die -r Option zum klonen bis zu einer bestimmten Revision genutzt\n" | |||
|
5495 | " wird, werden keine Folgeversionen (oder Marken) im geklonten Archiv\n" | |||
|
5496 | " vorhanden sein. Diese Option impliziert --pull, auch bei lokalen " | |||
|
5497 | "Archiven.\n" | |||
|
5498 | "\n" | |||
|
5499 | " Standardmäßig wird clone die Kopfversion des 'default'-Zweiges zum\n" | |||
|
5500 | " Arbeitsverzeichnis machen. Bei Nutzung der -U Option wird der Klon zwar\n" | |||
|
5501 | " das Projektarchiv enthalten (.hg) aber keine Arbeitskopie laden (die\n" | |||
|
5502 | " Vorgängerversion der Arbeitskopie ist die 'null'-Revision).\n" | |||
|
5503 | "\n" | |||
|
5504 | " Siehe 'hg help urls' für Details gültiger Quellformate.\n" | |||
|
5505 | "\n" | |||
|
5506 | " Es ist möglich eine ssh:// URL als Ziel anzugeben, aber es werden weder\n" | |||
|
5507 | " .hg/hgrc noch Arbeitsverzeichnis auf der entfernten Seite angelegt.\n" | |||
|
5508 | " Wichtige Details zu URLs mit ssh:// finden sich unter 'hg help urls'.\n" | |||
|
5509 | "\n" | |||
5479 | " Aus Effizienzgründen werden 'hardlinks' für das Klonen genutzt, wann " |
|
5510 | " Aus Effizienzgründen werden 'hardlinks' für das Klonen genutzt, wann " | |
5480 | "immer\n" |
|
5511 | "immer\n" | |
5481 | " Quelle und Ziel auf dem selben Dateisystem sind (dies gilt nur für die\n" |
|
5512 | " Quelle und Ziel auf dem selben Dateisystem sind (dies gilt nur für die\n" | |
@@ -5498,27 +5529,14 b' msgstr ""' | |||||
5498 | " Erweiterungen, die Metadaten unter dem .hg Verzeichnis ablegen, z.B. " |
|
5529 | " Erweiterungen, die Metadaten unter dem .hg Verzeichnis ablegen, z.B. " | |
5499 | "mq.\n" |
|
5530 | "mq.\n" | |
5500 | "\n" |
|
5531 | "\n" | |
5501 | " Wenn die -r Option zum klonen bis zu einer bestimmten Revision genutzt\n" |
|
|||
5502 | " wird, werden keine Folgeversionen im geklonten Archiv vorhanden sein.\n" |
|
|||
5503 | " Diese Option impliziert --pull, auch bei lokalen Archiven.\n" |
|
|||
5504 | "\n" |
|
|||
5505 | " Bei Nutzung der -U Option wird der Klon zwar das Projektarchiv " |
|
|||
5506 | "enthalten\n" |
|
|||
5507 | " (.hg) aber keine Arbeitskopie laden (die Vorgängerversion der " |
|
|||
5508 | "Arbeitskopie\n" |
|
|||
5509 | " ist die 'null'-Revision).\n" |
|
|||
5510 | "\n" |
|
|||
5511 | " Siehe 'hg help urls' für Details gültiger Quellformate.\n" |
|
|||
5512 | "\n" |
|
|||
5513 | " Es ist möglich eine ssh:// URL als Ziel anzugeben, aber es werden weder\n" |
|
|||
5514 | " .hg/hgrc noch Arbeitsverzeichnis auf der entfernten Seite angelegt.\n" |
|
|||
5515 | " Wichtige Details zu Urls mit ssh:// finden sich unter 'hg help urls'.\n" |
|
|||
5516 | " " |
|
5532 | " " | |
5517 |
|
5533 | |||
5518 | msgid "" |
|
5534 | msgid "" | |
5519 | "commit the specified files or all outstanding changes\n" |
|
5535 | "commit the specified files or all outstanding changes\n" | |
5520 | "\n" |
|
5536 | "\n" | |
5521 | " Commit changes to the given files into the repository.\n" |
|
5537 | " Commit changes to the given files into the repository. Unlike a\n" | |
|
5538 | " centralized RCS, this operation is a local operation. See hg push\n" | |||
|
5539 | " for means to actively distribute your changes.\n" | |||
5522 | "\n" |
|
5540 | "\n" | |
5523 | " If a list of files is omitted, all changes reported by \"hg status\"\n" |
|
5541 | " If a list of files is omitted, all changes reported by \"hg status\"\n" | |
5524 | " will be committed.\n" |
|
5542 | " will be committed.\n" | |
@@ -5526,18 +5544,21 b' msgid ""' | |||||
5526 | " If you are committing the result of a merge, do not provide any\n" |
|
5544 | " If you are committing the result of a merge, do not provide any\n" | |
5527 | " file names or -I/-X filters.\n" |
|
5545 | " file names or -I/-X filters.\n" | |
5528 | "\n" |
|
5546 | "\n" | |
5529 |
" If no commit message is specified, the configured editor is |
|
5547 | " If no commit message is specified, the configured editor is\n" | |
5530 | " prompt you for a message.\n" |
|
5548 | " started to prompt you for a message.\n" | |
5531 | "\n" |
|
5549 | "\n" | |
5532 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
5550 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" | |
5533 | " " |
|
5551 | " " | |
5534 | msgstr "" |
|
5552 | msgstr "" | |
5535 | "Übernimmt die vorgemerkten Änderungen und erzeugt eine neue Revision\n" |
|
5553 | "Übernimmt Änderungen der angegebenen Dateien oder alle ausstehenden " | |
5536 | "\n" |
|
5554 | "Änderungen ins Archiv\n" | |
5537 | " Erzeugt eine neue Revision mit allen (von \"hg status\" angezeigten) " |
|
5555 | "\n" | |
5538 | "oder\n" |
|
5556 | " Übernimmt Änderungen der angegebenen Dateien ins Archiv. Anders als\n" | |
5539 | " den angegegebenen geänderten Dateien des Arbeitsverzeichnisses im " |
|
5557 | " bei zentralen Versionsverwaltungssystem ist dies eine lokale Operation.\n" | |
5540 | "Archiv.\n" |
|
5558 | " Vergleiche hg push für Wege zur aktiven Verteilung der Änderungen.\n" | |
|
5559 | "\n" | |||
|
5560 | " Sollten keine Dateien übergeben werden, werden alle von 'hg status'\n" | |||
|
5561 | " angezeigten Änderungen Bestandteil der neuen Revision.\n" | |||
5541 | "\n" |
|
5562 | "\n" | |
5542 | " Wenn das Ergebnis einer Zusammenführung übernommen werden soll, dürfen\n" |
|
5563 | " Wenn das Ergebnis einer Zusammenführung übernommen werden soll, dürfen\n" | |
5543 | " keine Dateinamen oder -I/-X Filter angegeben werden.\n" |
|
5564 | " keine Dateinamen oder -I/-X Filter angegeben werden.\n" | |
@@ -5564,7 +5585,7 b' msgid ""' | |||||
5564 | " the source must be a single file.\n" |
|
5585 | " the source must be a single file.\n" | |
5565 | "\n" |
|
5586 | "\n" | |
5566 | " By default, this command copies the contents of files as they\n" |
|
5587 | " By default, this command copies the contents of files as they\n" | |
5567 | " stand in the working directory. If invoked with --after, the\n" |
|
5588 | " stand in the working directory. If invoked with -A/--after, the\n" | |
5568 | " operation is recorded, but no copying is performed.\n" |
|
5589 | " operation is recorded, but no copying is performed.\n" | |
5569 | "\n" |
|
5590 | "\n" | |
5570 | " This command takes effect with the next commit. To undo a copy\n" |
|
5591 | " This command takes effect with the next commit. To undo a copy\n" | |
@@ -5811,12 +5832,12 b' msgid ""' | |||||
5811 | " revisions are specified, the working directory files are compared\n" |
|
5832 | " revisions are specified, the working directory files are compared\n" | |
5812 | " to its parent.\n" |
|
5833 | " to its parent.\n" | |
5813 | "\n" |
|
5834 | "\n" | |
5814 |
" Without the -a option, diff will avoid generating diffs of |
|
5835 | " Without the -a/--text option, diff will avoid generating diffs of\n" | |
5815 |
" it detects as binary. With -a, diff will generate a diff |
|
5836 | " files it detects as binary. With -a, diff will generate a diff\n" | |
5816 | " probably with undesirable results.\n" |
|
5837 | " anyway, probably with undesirable results.\n" | |
5817 | "\n" |
|
5838 | "\n" | |
5818 | " Use the --git option to generate diffs in the git extended diff\n" |
|
5839 | " Use the -g/--git option to generate diffs in the git extended diff\n" | |
5819 | " format. For more information, read hg help diffs.\n" |
|
5840 | " format. For more information, read 'hg help diffs'.\n" | |
5820 | " " |
|
5841 | " " | |
5821 | msgstr "" |
|
5842 | msgstr "" | |
5822 | "Zeigt Änderungen des Projektarchiv oder angegebener Dateien an\n" |
|
5843 | "Zeigt Änderungen des Projektarchiv oder angegebener Dateien an\n" | |
@@ -5845,6 +5866,7 b' msgstr ""' | |||||
5845 | "aufschlussreich.\n" |
|
5866 | "aufschlussreich.\n" | |
5846 | " " |
|
5867 | " " | |
5847 |
|
5868 | |||
|
5869 | ||||
5848 | msgid "" |
|
5870 | msgid "" | |
5849 | "dump the header and diffs for one or more changesets\n" |
|
5871 | "dump the header and diffs for one or more changesets\n" | |
5850 | "\n" |
|
5872 | "\n" | |
@@ -5853,8 +5875,9 b' msgid ""' | |||||
5853 | " The information shown in the changeset header is: author,\n" |
|
5875 | " The information shown in the changeset header is: author,\n" | |
5854 | " changeset hash, parent(s) and commit comment.\n" |
|
5876 | " changeset hash, parent(s) and commit comment.\n" | |
5855 | "\n" |
|
5877 | "\n" | |
5856 |
" NOTE: export may generate unexpected diff output for merge |
|
5878 | " NOTE: export may generate unexpected diff output for merge\n" | |
5857 |
" as it will compare the merge changeset against its |
|
5879 | " changesets, as it will compare the merge changeset against its\n" | |
|
5880 | " first parent only.\n" | |||
5858 | "\n" |
|
5881 | "\n" | |
5859 | " Output may be to a file, in which case the name of the file is\n" |
|
5882 | " Output may be to a file, in which case the name of the file is\n" | |
5860 | " given using a format string. The formatting rules are as follows:\n" |
|
5883 | " given using a format string. The formatting rules are as follows:\n" | |
@@ -5868,15 +5891,15 b' msgid ""' | |||||
5868 | " %n zero-padded sequence number, starting at 1\n" |
|
5891 | " %n zero-padded sequence number, starting at 1\n" | |
5869 | " %r zero-padded changeset revision number\n" |
|
5892 | " %r zero-padded changeset revision number\n" | |
5870 | "\n" |
|
5893 | "\n" | |
5871 |
" Without the -a option, export will avoid generating diff |
|
5894 | " Without the -a/--text option, export will avoid generating diffs\n" | |
5872 |
" it detects as binary. With -a, export will generate a |
|
5895 | " of files it detects as binary. With -a, export will generate a\n" | |
5873 | " probably with undesirable results.\n" |
|
5896 | " diff anyway, probably with undesirable results.\n" | |
5874 | "\n" |
|
5897 | "\n" | |
5875 | " Use the --git option to generate diffs in the git extended diff\n" |
|
5898 | " Use the -g/--git option to generate diffs in the git extended diff\n" | |
5876 | " format. Read the diffs help topic for more information.\n" |
|
5899 | " format. Read the diffs help topic for more information.\n" | |
5877 | "\n" |
|
5900 | "\n" | |
5878 |
" With the --switch-parent option, the diff will be against the |
|
5901 | " With the --switch-parent option, the diff will be against the\n" | |
5879 | " parent. It can be useful to review a merge.\n" |
|
5902 | " second parent. It can be useful to review a merge.\n" | |
5880 | " " |
|
5903 | " " | |
5881 | msgstr "" |
|
5904 | msgstr "" | |
5882 | "Gibt Kopfzeilen und Änderungsverlauf einer oder mehrerer Versionen aus\n" |
|
5905 | "Gibt Kopfzeilen und Änderungsverlauf einer oder mehrerer Versionen aus\n" | |
@@ -5930,8 +5953,8 b' msgid ""' | |||||
5930 | "\n" |
|
5953 | "\n" | |
5931 | " This command behaves differently than Unix grep. It only accepts\n" |
|
5954 | " This command behaves differently than Unix grep. It only accepts\n" | |
5932 | " Python/Perl regexps. It searches repository history, not the\n" |
|
5955 | " Python/Perl regexps. It searches repository history, not the\n" | |
5933 | " working directory. It always prints the revision number in which\n" |
|
5956 | " working directory. It always prints the revision number in which a\n" | |
5934 |
" |
|
5957 | " match appears.\n" | |
5935 | "\n" |
|
5958 | "\n" | |
5936 | " By default, grep only prints output for the first revision of a\n" |
|
5959 | " By default, grep only prints output for the first revision of a\n" | |
5937 | " file in which it finds a match. To get it to print every revision\n" |
|
5960 | " file in which it finds a match. To get it to print every revision\n" | |
@@ -5940,6 +5963,23 b' msgid ""' | |||||
5940 | " use the --all flag.\n" |
|
5963 | " use the --all flag.\n" | |
5941 | " " |
|
5964 | " " | |
5942 | msgstr "" |
|
5965 | msgstr "" | |
|
5966 | "Sucht ein Muster in angegebenen Dateien und Revisionen\n" | |||
|
5967 | "\n" | |||
|
5968 | " Durchsucht Dateien in der Versionshistorie nach einem gegebenen Muster.\n" | |||
|
5969 | "\n" | |||
|
5970 | " Dieses Kommando unterscheidet sich von Unix grep, da es Reguläre " | |||
|
5971 | "Ausdrücke\n" | |||
|
5972 | " in Python/Perl Format erwartet und ausserdem nur die übernommenen " | |||
|
5973 | "Revisionen\n" | |||
|
5974 | " im Archiv durchsucht, nicht jedoch das Arbeitsverzeichnis.\n" | |||
|
5975 | "\n" | |||
|
5976 | " Standardmäßig gibt grep den Dateinamen und die jüngste Revision einer " | |||
|
5977 | "Datei\n" | |||
|
5978 | " aus, die das Suchmuster enthält. Mit der Option --all werden " | |||
|
5979 | "stattdessen\n" | |||
|
5980 | " alle Revisionen ausgegeben, in der das Muster hinzugefügt (\"+\") oder\n" | |||
|
5981 | " entfernt (\"-\") wurde.\n" | |||
|
5982 | " " | |||
5943 |
|
5983 | |||
5944 | #, python-format |
|
5984 | #, python-format | |
5945 | msgid "grep: invalid match pattern: %s\n" |
|
5985 | msgid "grep: invalid match pattern: %s\n" | |
@@ -5995,7 +6035,8 b' msgid ""' | |||||
5995 | "\n" |
|
6035 | "\n" | |
5996 | " With no arguments, print a list of commands and short help.\n" |
|
6036 | " With no arguments, print a list of commands and short help.\n" | |
5997 | "\n" |
|
6037 | "\n" | |
5998 |
" Given a topic, extension, or command name, print help for that |
|
6038 | " Given a topic, extension, or command name, print help for that\n" | |
|
6039 | " topic." | |||
5999 | msgstr "" |
|
6040 | msgstr "" | |
6000 | "Zeigt die Hilfe für ein gegebenes Thema oder eine Hilfsübersicht\n" |
|
6041 | "Zeigt die Hilfe für ein gegebenes Thema oder eine Hilfsübersicht\n" | |
6001 | "\n" |
|
6042 | "\n" | |
@@ -6085,17 +6126,19 b' msgstr ""' | |||||
6085 | "Zusätzliche Hilfethemen:\n" |
|
6126 | "Zusätzliche Hilfethemen:\n" | |
6086 | "\n" |
|
6127 | "\n" | |
6087 |
|
6128 | |||
|
6129 | ||||
6088 | msgid "" |
|
6130 | msgid "" | |
6089 | "identify the working copy or specified revision\n" |
|
6131 | "identify the working copy or specified revision\n" | |
6090 | "\n" |
|
6132 | "\n" | |
6091 |
" With no revision, print a summary of the current state of the |
|
6133 | " With no revision, print a summary of the current state of the\n" | |
|
6134 | " repository.\n" | |||
6092 | "\n" |
|
6135 | "\n" | |
6093 | " With a path, do a lookup in another repository.\n" |
|
6136 | " With a path, do a lookup in another repository.\n" | |
6094 | "\n" |
|
6137 | "\n" | |
6095 |
" This summary identifies the repository state using one or two |
|
6138 | " This summary identifies the repository state using one or two\n" | |
6096 |
" hash identifiers, followed by a \"+\" if there are |
|
6139 | " parent hash identifiers, followed by a \"+\" if there are\n" | |
6097 |
" in the working directory, a list of tags for |
|
6140 | " uncommitted changes in the working directory, a list of tags for\n" | |
6098 | " name for non-default branches.\n" |
|
6141 | " this revision and a branch name for non-default branches.\n" | |
6099 | " " |
|
6142 | " " | |
6100 | msgstr "" |
|
6143 | msgstr "" | |
6101 | "Beschreibt die Arbeitskopie oder die angegebene Revision\n" |
|
6144 | "Beschreibt die Arbeitskopie oder die angegebene Revision\n" | |
@@ -6113,13 +6156,14 b' msgstr ""' | |||||
6113 | " falls nicht der 'default'-Zweig vorliegt.\n" |
|
6156 | " falls nicht der 'default'-Zweig vorliegt.\n" | |
6114 | " " |
|
6157 | " " | |
6115 |
|
6158 | |||
|
6159 | ||||
6116 | msgid "" |
|
6160 | msgid "" | |
6117 | "import an ordered set of patches\n" |
|
6161 | "import an ordered set of patches\n" | |
6118 | "\n" |
|
6162 | "\n" | |
6119 | " Import a list of patches and commit them individually.\n" |
|
6163 | " Import a list of patches and commit them individually.\n" | |
6120 | "\n" |
|
6164 | "\n" | |
6121 | " If there are outstanding changes in the working directory, import\n" |
|
6165 | " If there are outstanding changes in the working directory, import\n" | |
6122 | " will abort unless given the -f flag.\n" |
|
6166 | " will abort unless given the -f/--force flag.\n" | |
6123 | "\n" |
|
6167 | "\n" | |
6124 | " You can import a patch straight from a mail message. Even patches\n" |
|
6168 | " You can import a patch straight from a mail message. Even patches\n" | |
6125 | " as attachments work (body part must be type text/plain or\n" |
|
6169 | " as attachments work (body part must be type text/plain or\n" | |
@@ -6128,21 +6172,22 b' msgid ""' | |||||
6128 | " text/plain body parts before first diff are added to commit\n" |
|
6172 | " text/plain body parts before first diff are added to commit\n" | |
6129 | " message.\n" |
|
6173 | " message.\n" | |
6130 | "\n" |
|
6174 | "\n" | |
6131 |
" If the imported patch was generated by hg export, user and |
|
6175 | " If the imported patch was generated by hg export, user and\n" | |
6132 |
" from patch override values from message headers and |
|
6176 | " description from patch override values from message headers and\n" | |
6133 |
" given on command line with -m and -u |
|
6177 | " body. Values given on command line with -m/--message and -u/--user\n" | |
6134 | "\n" |
|
6178 | " override these.\n" | |
6135 | " If --exact is specified, import will set the working directory\n" |
|
6179 | "\n" | |
6136 | " to the parent of each patch before applying it, and will abort\n" |
|
6180 | " If --exact is specified, import will set the working directory to\n" | |
6137 | " if the resulting changeset has a different ID than the one\n" |
|
6181 | " the parent of each patch before applying it, and will abort if the\n" | |
6138 | " recorded in the patch. This may happen due to character set\n" |
|
6182 | " resulting changeset has a different ID than the one recorded in\n" | |
6139 | " problems or other deficiencies in the text patch format.\n" |
|
6183 | " the patch. This may happen due to character set problems or other\n" | |
6140 | "\n" |
|
6184 | " deficiencies in the text patch format.\n" | |
6141 | " With --similarity, hg will attempt to discover renames and copies\n" |
|
6185 | "\n" | |
6142 | " in the patch in the same way as 'addremove'.\n" |
|
6186 | " With -s/--similarity, hg will attempt to discover renames and\n" | |
6143 | "\n" |
|
6187 | " copies in the patch in the same way as 'addremove'.\n" | |
6144 | " To read a patch from standard input, use patch name \"-\".\n" |
|
6188 | "\n" | |
6145 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
6189 | " To read a patch from standard input, use patch name \"-\". See 'hg\n" | |
|
6190 | " help dates' for a list of formats valid for -d/--date.\n" | |||
6146 | " " |
|
6191 | " " | |
6147 | msgstr "" |
|
6192 | msgstr "" | |
6148 | "Importiert eine Liste von Patches\n" |
|
6193 | "Importiert eine Liste von Patches\n" | |
@@ -6202,23 +6247,27 b' msgstr "Kein Mercurial Patch"' | |||||
6202 | msgid "patch is damaged or loses information" |
|
6247 | msgid "patch is damaged or loses information" | |
6203 | msgstr "Prüfsumme stimmt nicht überein: Patch korrumpiert" |
|
6248 | msgstr "Prüfsumme stimmt nicht überein: Patch korrumpiert" | |
6204 |
|
6249 | |||
|
6250 | ||||
6205 | msgid "" |
|
6251 | msgid "" | |
6206 | "show new changesets found in source\n" |
|
6252 | "show new changesets found in source\n" | |
6207 | "\n" |
|
6253 | "\n" | |
6208 | " Show new changesets found in the specified path/URL or the default\n" |
|
6254 | " Show new changesets found in the specified path/URL or the default\n" | |
6209 |
" pull location. These are the changesets that would be pulled if a |
|
6255 | " pull location. These are the changesets that would be pulled if a\n" | |
6210 | " was requested.\n" |
|
6256 | " pull was requested.\n" | |
6211 | "\n" |
|
6257 | "\n" | |
6212 |
" For remote repository, using --bundle avoids downloading the |
|
6258 | " For remote repository, using --bundle avoids downloading the\n" | |
6213 | " twice if the incoming is followed by a pull.\n" |
|
6259 | " changesets twice if the incoming is followed by a pull.\n" | |
6214 | "\n" |
|
6260 | "\n" | |
6215 | " See pull for valid source format details.\n" |
|
6261 | " See pull for valid source format details.\n" | |
6216 | " " |
|
6262 | " " | |
6217 | msgstr "" |
|
6263 | msgstr "" | |
6218 | "Zeigt neue Revisionen in einer externen Quelle an\n" |
|
6264 | "Zeigt neue Revisionen in einer externen Quelle an\n" | |
6219 | "\n" |
|
6265 | "\n" | |
6220 |
" Zeigt alle neuen Änderungen an, die durch ein \"hg pull\" vo |
|
6266 | " Zeigt alle neuen Änderungen an, die durch ein \"hg pull\" vom " | |
6221 | " gebenen oder Standardquelle geholt werden würden.\n" |
|
6267 | "angegebenen\n" | |
|
6268 | " Pfad/URL oder dem 'default'-Pfad geholt werden würden. Diese " | |||
|
6269 | "Änderungssätze\n" | |||
|
6270 | " würden geholt, wenn 'hg pull' ausgeführt würde.\n" | |||
6222 | "\n" |
|
6271 | "\n" | |
6223 | " Für entfernte Archive sorgt die Option --bundle dafür, dass die " |
|
6272 | " Für entfernte Archive sorgt die Option --bundle dafür, dass die " | |
6224 | "Änderungen\n" |
|
6273 | "Änderungen\n" | |
@@ -6250,6 +6299,7 b' msgstr ""' | |||||
6250 | " Siehe 'hg help urls' für mehr Informationen.\n" |
|
6299 | " Siehe 'hg help urls' für mehr Informationen.\n" | |
6251 | " " |
|
6300 | " " | |
6252 |
|
6301 | |||
|
6302 | ||||
6253 | msgid "" |
|
6303 | msgid "" | |
6254 | "locate files matching specific patterns\n" |
|
6304 | "locate files matching specific patterns\n" | |
6255 | "\n" |
|
6305 | "\n" | |
@@ -6264,9 +6314,9 b' msgid ""' | |||||
6264 | " names.\n" |
|
6314 | " names.\n" | |
6265 | "\n" |
|
6315 | "\n" | |
6266 | " If you want to feed the output of this command into the \"xargs\"\n" |
|
6316 | " If you want to feed the output of this command into the \"xargs\"\n" | |
6267 |
" command, use the |
|
6317 | " command, use the -0 option to both this command and \"xargs\". This\n" | |
6268 |
" |
|
6318 | " will avoid the problem of \"xargs\" treating single filenames that\n" | |
6269 |
" |
|
6319 | " contain white space as multiple filenames.\n" | |
6270 | " " |
|
6320 | " " | |
6271 | msgstr "" |
|
6321 | msgstr "" | |
6272 | "Suche Dateien mit bestimmtem Namen\n" |
|
6322 | "Suche Dateien mit bestimmtem Namen\n" | |
@@ -6287,6 +6337,7 b' msgstr ""' | |||||
6287 | " mit Leerzeichen in Dateinamen vermeidet.\n" |
|
6337 | " mit Leerzeichen in Dateinamen vermeidet.\n" | |
6288 | " " |
|
6338 | " " | |
6289 |
|
6339 | |||
|
6340 | ||||
6290 | msgid "" |
|
6341 | msgid "" | |
6291 | "show revision history of entire repository or files\n" |
|
6342 | "show revision history of entire repository or files\n" | |
6292 | "\n" |
|
6343 | "\n" | |
@@ -6310,7 +6361,7 b' msgid ""' | |||||
6310 | " commit. When the -v/--verbose switch is used, the list of changed\n" |
|
6361 | " commit. When the -v/--verbose switch is used, the list of changed\n" | |
6311 | " files and full commit message is shown.\n" |
|
6362 | " files and full commit message is shown.\n" | |
6312 | "\n" |
|
6363 | "\n" | |
6313 | " NOTE: log -p may generate unexpected diff output for merge\n" |
|
6364 | " NOTE: log -p/--patch may generate unexpected diff output for merge\n" | |
6314 | " changesets, as it will only compare the merge changeset against\n" |
|
6365 | " changesets, as it will only compare the merge changeset against\n" | |
6315 | " its first parent. Also, the files: list will only reflect files\n" |
|
6366 | " its first parent. Also, the files: list will only reflect files\n" | |
6316 | " that are different from BOTH parents.\n" |
|
6367 | " that are different from BOTH parents.\n" | |
@@ -6363,23 +6414,20 b' msgid ""' | |||||
6363 | "output the current or given revision of the project manifest\n" |
|
6414 | "output the current or given revision of the project manifest\n" | |
6364 | "\n" |
|
6415 | "\n" | |
6365 | " Print a list of version controlled files for the given revision.\n" |
|
6416 | " Print a list of version controlled files for the given revision.\n" | |
6366 |
" If no revision is given, the parent of the working directory |
|
6417 | " If no revision is given, the first parent of the working directory\n" | |
6367 | " or tip if no revision is checked out.\n" |
|
6418 | " is used, or tip if no revision is checked out.\n" | |
6368 | "\n" |
|
6419 | "\n" | |
6369 | " The manifest is the list of files being version controlled. If no " |
|
6420 | " With -v flag, print file permissions, symlink and executable bits.\n" | |
6370 | "revision\n" |
|
6421 | " With --debug flag, print file revision hashes.\n" | |
6371 | " is given then the first parent of the working directory is used.\n" |
|
|||
6372 | "\n" |
|
|||
6373 | " With -v flag, print file permissions, symlink and executable bits. With\n" |
|
|||
6374 | " --debug flag, print file revision hashes.\n" |
|
|||
6375 | " " |
|
6422 | " " | |
6376 | msgstr "" |
|
6423 | msgstr "" | |
6377 | "Gibt das Manifest der angegebenen oder aktuellen Revision aus.\n" |
|
6424 | "Gibt das Manifest der angegebenen oder aktuellen Revision aus.\n" | |
6378 | "\n" |
|
6425 | "\n" | |
6379 |
" |
|
6426 | " Gibt eine Liste aller Dateien unter Versionskontrolle für die " | |
6380 | " Wenn keine Revision angegeben ist, wird die Vorgängerversion des " |
|
6427 | "angegebene\n" | |
6381 | "Arbeits-\n" |
|
6428 | " Revision aus. Wenn keine Revision angegeben wird, wird die erste\n" | |
6382 | " verzeichnisses (bzw. die Spitze, falls dies leer ist) verwendet.\n" |
|
6429 | " Vorgängerversion des Arbeitsverzeichnis genutzt oder die Spitze (tip)\n" | |
|
6430 | " falls keine Revision ausgecheckt ist.\n" | |||
6383 | "\n" |
|
6431 | "\n" | |
6384 | " Mit dem Schalter -v werden zusätzlich zum Dateinamen auch die Rechte " |
|
6432 | " Mit dem Schalter -v werden zusätzlich zum Dateinamen auch die Rechte " | |
6385 | "und\n" |
|
6433 | "und\n" | |
@@ -6390,26 +6438,29 b' msgstr ""' | |||||
6390 | msgid "" |
|
6438 | msgid "" | |
6391 | "merge working directory with another revision\n" |
|
6439 | "merge working directory with another revision\n" | |
6392 | "\n" |
|
6440 | "\n" | |
6393 |
" |
|
6441 | " The contents of the current working directory is updated with all\n" | |
6394 | " requested revision. Files that changed between either parent are\n" |
|
6442 | " changes made in the requested revision since the last common\n" | |
6395 | " marked as changed for the next commit and a commit must be\n" |
|
6443 | " predecessor revision.\n" | |
6396 | " performed before any further updates are allowed.\n" |
|
6444 | "\n" | |
|
6445 | " Files that changed between either parent are marked as changed for\n" | |||
|
6446 | " the next commit and a commit must be performed before any further\n" | |||
|
6447 | " updates are allowed. The next commit has two parents.\n" | |||
6397 | "\n" |
|
6448 | "\n" | |
6398 | " If no revision is specified, the working directory's parent is a\n" |
|
6449 | " If no revision is specified, the working directory's parent is a\n" | |
6399 |
" head revision, and the current branch contains exactly one other |
|
6450 | " head revision, and the current branch contains exactly one other\n" | |
6400 |
" the other head is merged with by default. Otherwise, an |
|
6451 | " head, the other head is merged with by default. Otherwise, an\n" | |
6401 | " revision to merge with must be provided.\n" |
|
6452 | " explicit revision to merge with must be provided.\n" | |
6402 | " " |
|
6453 | " " | |
6403 | msgstr "" |
|
6454 | msgstr "" | |
6404 | "Führt das Arbeitsverzeichnis mit einer anderen Revision zusammen\n" |
|
6455 | "Führt das Arbeitsverzeichnis mit einer anderen Revision zusammen\n" | |
6405 | "\n" |
|
6456 | "\n" | |
6406 | " Wendet die Änderungen der angegebenen Revision (seit einem gemeinsamen\n" |
|
6457 | " Wendet die Änderungen der angegebenen Revision (seit einem gemeinsamen\n" | |
6407 |
" Vorfahr) im Arbeitsverzeichnis an. |
|
6458 | " Vorfahr) im Arbeitsverzeichnis an.\n" | |
6408 | "zunächst\n" |
|
6459 | "\n" | |
6409 | " übernommen werden, bevor weitere Änderungen (add, delete, merge) zuge-\n" |
|
6460 | " Dateien, die in sich in einer der beiden Vorgängerversionen änderten\n" | |
6410 | " lassen werden.\n" |
|
6461 | " werden als verändert markiert und es muss 'hg commit' ausgeführt bevor\n" | |
6411 | "\n" |
|
6462 | " weitere Änderungen durchgeführt werden dürfen. Nach dem Übernehmen hat\n" | |
6412 |
" |
|
6463 | " die neue Revision zwei Vorfahren.\n" | |
6413 | "\n" |
|
6464 | "\n" | |
6414 | " Wenn keine Revision angegeben wird und der Vorgänger des Arbeits-\n" |
|
6465 | " Wenn keine Revision angegeben wird und der Vorgänger des Arbeits-\n" | |
6415 | " verzeichnisses eine Kopfversion eines Zweiges mit genau zwei Köpfen " |
|
6466 | " verzeichnisses eine Kopfversion eines Zweiges mit genau zwei Köpfen " | |
@@ -6442,13 +6493,13 b' msgstr ""' | |||||
6442 | "Arbeitsverzeichnis ist keine Kopfversion - Nutze \"hg update\" oder gib eine " |
|
6493 | "Arbeitsverzeichnis ist keine Kopfversion - Nutze \"hg update\" oder gib eine " | |
6443 | "explizite Revision an" |
|
6494 | "explizite Revision an" | |
6444 |
|
6495 | |||
|
6496 | ||||
6445 | msgid "" |
|
6497 | msgid "" | |
6446 | "show changesets not found in destination\n" |
|
6498 | "show changesets not found in destination\n" | |
6447 | "\n" |
|
6499 | "\n" | |
6448 |
" Show changesets not found in the specified destination repository |
|
6500 | " Show changesets not found in the specified destination repository\n" | |
6449 |
" the default push location. These are the changesets that would |
|
6501 | " or the default push location. These are the changesets that would\n" | |
6450 | "pushed\n" |
|
6502 | " be pushed if a push was requested.\n" | |
6451 | " if a push was requested.\n" |
|
|||
6452 | "\n" |
|
6503 | "\n" | |
6453 | " See pull for valid destination format details.\n" |
|
6504 | " See pull for valid destination format details.\n" | |
6454 | " " |
|
6505 | " " | |
@@ -6457,19 +6508,20 b' msgstr ""' | |||||
6457 | "\n" |
|
6508 | "\n" | |
6458 | " Zeigt alle Änderungssätze des lokalen Archivs, die nicht im angegebenen\n" |
|
6509 | " Zeigt alle Änderungssätze des lokalen Archivs, die nicht im angegebenen\n" | |
6459 | " Zielarchiv oder dem Standardziel vorhanden sind. Dies sind genau jene,\n" |
|
6510 | " Zielarchiv oder dem Standardziel vorhanden sind. Dies sind genau jene,\n" | |
6460 |
" die durch ein |
|
6511 | " die durch ein 'hg push' übertragen werden würden.\n" | |
6461 | "\n" |
|
6512 | "\n" | |
6462 |
" Siehe Hilfe zu |
|
6513 | " Siehe Hilfe zu 'pull' für das Format der Zieladresse.\n" | |
6463 | " " |
|
6514 | " " | |
6464 |
|
6515 | |||
6465 | msgid "" |
|
6516 | ||
6466 | "show the parents of the working dir or revision\n" |
|
6517 | msgid "" | |
6467 | "\n" |
|
6518 | "show the parents of the working directory or revision\n" | |
6468 | " Print the working directory's parent revisions. If a\n" |
|
6519 | "\n" | |
6469 | " revision is given via --rev, the parent of that revision\n" |
|
6520 | " Print the working directory's parent revisions. If a revision is\n" | |
6470 | " will be printed. If a file argument is given, revision in\n" |
|
6521 | " given via -r/--rev, the parent of that revision will be printed.\n" | |
6471 | " which the file was last changed (before the working directory\n" |
|
6522 | " If a file argument is given, revision in which the file was last\n" | |
6472 | " revision or the argument to --rev if given) is printed.\n" |
|
6523 | " changed (before the working directory revision or the argument to\n" | |
|
6524 | " --rev if given) is printed.\n" | |||
6473 | " " |
|
6525 | " " | |
6474 | msgstr "" |
|
6526 | msgstr "" | |
6475 | "Zeigt die Vorgänger des Arbeitsverzeichnisses oder einer Revision\n" |
|
6527 | "Zeigt die Vorgänger des Arbeitsverzeichnisses oder einer Revision\n" | |
@@ -6492,8 +6544,8 b' msgstr "\'%s\' nicht im Manifest gefunden!' | |||||
6492 | msgid "" |
|
6544 | msgid "" | |
6493 | "show aliases for remote repositories\n" |
|
6545 | "show aliases for remote repositories\n" | |
6494 | "\n" |
|
6546 | "\n" | |
6495 |
" Show definition of symbolic path name NAME. If no name is given, |
|
6547 | " Show definition of symbolic path name NAME. If no name is given,\n" | |
6496 | " definition of available names.\n" |
|
6548 | " show definition of available names.\n" | |
6497 | "\n" |
|
6549 | "\n" | |
6498 | " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" |
|
6550 | " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" | |
6499 | " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" |
|
6551 | " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" | |
@@ -6503,7 +6555,8 b' msgid ""' | |||||
6503 | msgstr "" |
|
6555 | msgstr "" | |
6504 | "Zeigt Adresse für Aliasnamen von entfernten Projektarchiven an\n" |
|
6556 | "Zeigt Adresse für Aliasnamen von entfernten Projektarchiven an\n" | |
6505 | "\n" |
|
6557 | "\n" | |
6506 |
" Zeigt die Adressdefinition des Kurznamens NAME an. Wenn kein Name |
|
6558 | " Zeigt die Adressdefinition des Kurznamens NAME an. Wenn kein Name " | |
|
6559 | "gegeben\n" | |||
6507 | " ist, werden alle Alias-Definitionen angezeigt.\n" |
|
6560 | " ist, werden alle Alias-Definitionen angezeigt.\n" | |
6508 | "\n" |
|
6561 | "\n" | |
6509 | " Kurznamen für entfernte Archive werden im Abschnitt [paths] der Dateien\n" |
|
6562 | " Kurznamen für entfernte Archive werden im Abschnitt [paths] der Dateien\n" | |
@@ -6529,12 +6582,15 b' msgstr "(f\xc3\xbchre \\"hg update\\" aus, um ein Arbeitsverzeichnis zu erstellen)\\n"' | |||||
6529 | msgid "" |
|
6582 | msgid "" | |
6530 | "pull changes from the specified source\n" |
|
6583 | "pull changes from the specified source\n" | |
6531 | "\n" |
|
6584 | "\n" | |
6532 |
" Pull changes from a remote repository to |
|
6585 | " Pull changes from a remote repository to the local one.\n" | |
6533 | "\n" |
|
6586 | "\n" | |
6534 | " This finds all changes from the repository at the specified path\n" |
|
6587 | " This finds all changes from the repository at the specified path\n" | |
6535 | " or URL and adds them to the local repository. By default, this\n" |
|
6588 | " or URL and adds them to the local repository. By default, this\n" | |
6536 | " does not update the copy of the project in the working directory.\n" |
|
6589 | " does not update the copy of the project in the working directory.\n" | |
6537 | "\n" |
|
6590 | "\n" | |
|
6591 | " Use hg incoming if you want to see what will be added by the next\n" | |||
|
6592 | " pull without actually adding the changes to the repository.\n" | |||
|
6593 | "\n" | |||
6538 | " If SOURCE is omitted, the 'default' path will be used.\n" |
|
6594 | " If SOURCE is omitted, the 'default' path will be used.\n" | |
6539 | " See 'hg help urls' for more information.\n" |
|
6595 | " See 'hg help urls' for more information.\n" | |
6540 | " " |
|
6596 | " " | |
@@ -6547,7 +6603,11 b' msgstr ""' | |||||
6547 | " URL gesucht und dem lokalen Archiv hinzugefügt. Standardmäßig\n" |
|
6603 | " URL gesucht und dem lokalen Archiv hinzugefügt. Standardmäßig\n" | |
6548 | " wird die Kopie des Projektes im Arbeitsverzeichnis nicht aktualisiert.\n" |
|
6604 | " wird die Kopie des Projektes im Arbeitsverzeichnis nicht aktualisiert.\n" | |
6549 | "\n" |
|
6605 | "\n" | |
6550 | " Beim Weglassen der QUELLE wird standardmäßig der 'default'-Pfad genutzt.\n" |
|
6606 | " Um zu sehen, was beim nächsten 'pull' geholt würde, ohne dem Archiv\n" | |
|
6607 | " tatsächlich Änderungen hinzuzufügen, nutze hg incoming.\n" | |||
|
6608 | "\n" | |||
|
6609 | " Beim Weglassen der QUELLE wird standardmäßig der 'default'-Pfad " | |||
|
6610 | "genutzt.\n" | |||
6551 | " Siehe Hilfe zu \"paths\" zu Pfad-Kurznamen und \"urls\" für erlaubte\n" |
|
6611 | " Siehe Hilfe zu \"paths\" zu Pfad-Kurznamen und \"urls\" für erlaubte\n" | |
6552 | " Formate für die Quellangabe.\n" |
|
6612 | " Formate für die Quellangabe.\n" | |
6553 | " " |
|
6613 | " " | |
@@ -6564,20 +6624,20 b' msgid ""' | |||||
6564 | "\n" |
|
6624 | "\n" | |
6565 | " Push changes from the local repository to the given destination.\n" |
|
6625 | " Push changes from the local repository to the given destination.\n" | |
6566 | "\n" |
|
6626 | "\n" | |
6567 |
" This is the symmetrical operation for pull. It |
|
6627 | " This is the symmetrical operation for pull. It moves changes from\n" | |
6568 |
" |
|
6628 | " the current repository to a different one. If the destination is\n" | |
6569 |
" |
|
6629 | " local this is identical to a pull in that directory from the\n" | |
6570 |
" |
|
6630 | " current one.\n" | |
6571 | "\n" |
|
6631 | "\n" | |
6572 | " By default, push will refuse to run if it detects the result would\n" |
|
6632 | " By default, push will refuse to run if it detects the result would\n" | |
6573 | " increase the number of remote heads. This generally indicates the\n" |
|
6633 | " increase the number of remote heads. This generally indicates the\n" | |
6574 | " the client has forgotten to pull and merge before pushing.\n" |
|
6634 | " the client has forgotten to pull and merge before pushing.\n" | |
6575 | "\n" |
|
6635 | "\n" | |
6576 |
" If -r is used, the named |
|
6636 | " If -r/--rev is used, the named revision and all its ancestors will\n" | |
6577 | " to the remote repository.\n" |
|
6637 | " be pushed to the remote repository.\n" | |
6578 | "\n" |
|
6638 | "\n" | |
6579 |
" Look at the help text for |
|
6639 | " Look at the help text for URLs for important details about ssh://\n" | |
6580 | " If DESTINATION is omitted, a default path will be used.\n" |
|
6640 | " URLs. If DESTINATION is omitted, a default path will be used.\n" | |
6581 | " See 'hg help urls' for more information.\n" |
|
6641 | " See 'hg help urls' for more information.\n" | |
6582 | " " |
|
6642 | " " | |
6583 | msgstr "" |
|
6643 | msgstr "" | |
@@ -6591,16 +6651,16 b' msgstr ""' | |||||
6591 | "\n" |
|
6651 | "\n" | |
6592 | " Im Regelfall wird \"hg push\" die Ausführung verweigern, wenn das\n" |
|
6652 | " Im Regelfall wird \"hg push\" die Ausführung verweigern, wenn das\n" | |
6593 | " Resultat die Anzahl der Kopfversionen im entfernten Archiv erhöht, da\n" |
|
6653 | " Resultat die Anzahl der Kopfversionen im entfernten Archiv erhöht, da\n" | |
6594 |
" dies normalerweise bedeutet, dass der Nutzer vergessen hat vor der |
|
6654 | " dies normalerweise bedeutet, dass der Nutzer vergessen hat vor der " | |
|
6655 | "Über-\n" | |||
6595 | " tragung die entfernten Änderungen zu holen und zusammenzuführen.\n" |
|
6656 | " tragung die entfernten Änderungen zu holen und zusammenzuführen.\n" | |
6596 | " Mit der -f/--force Option kann eine Übertragung erzwungen werden.\n" |
|
|||
6597 | "\n" |
|
6657 | "\n" | |
6598 | " Bei Nutzung von -r wird die benannte Revision mit allen Vorgängern in\n" |
|
6658 | " Bei Nutzung von -r wird die benannte Revision mit allen Vorgängern in\n" | |
6599 | " das entfernte Archiv übertragen.\n" |
|
6659 | " das entfernte Archiv übertragen.\n" | |
6600 | "\n" |
|
6660 | "\n" | |
6601 | " Beim Weglassen des ZIELs wird standardmäßig der 'default'-Pfad genutzt.\n" |
|
6661 | " Für wichtige Details zu ssh://-URLS kann die URL-Hilfe zu Rate gezogen\n" | |
6602 | " Siehe Hilfe zu \"paths\" zu Pfad-Kurznamen und \"urls\" für erlaubte\n" |
|
6662 | " werden. Beim Weglassen des ZIELs wird standardmäßig der 'default'-Pfad\n" | |
6603 | " Formate für die Zielangabe.\n" |
|
6663 | " genutzt. Weitere Hilfe gibt unter 'hg help urls'.\n" | |
6604 | " " |
|
6664 | " " | |
6605 |
|
6665 | |||
6606 | #, python-format |
|
6666 | #, python-format | |
@@ -6631,32 +6691,38 b' msgid ""' | |||||
6631 | "\n" |
|
6691 | "\n" | |
6632 | " Recover from an interrupted commit or pull.\n" |
|
6692 | " Recover from an interrupted commit or pull.\n" | |
6633 | "\n" |
|
6693 | "\n" | |
6634 |
" This command tries to fix the repository status after an |
|
6694 | " This command tries to fix the repository status after an\n" | |
6635 |
" operation. It should only be necessary when Mercurial |
|
6695 | " interrupted operation. It should only be necessary when Mercurial\n" | |
|
6696 | " suggests it.\n" | |||
6636 | " " |
|
6697 | " " | |
6637 | msgstr "" |
|
6698 | msgstr "" | |
6638 | "Setzt eine unterbrochene Transaktion zurück\n" |
|
6699 | "Setzt eine unterbrochene Transaktion zurück\n" | |
6639 | "\n" |
|
6700 | "\n" | |
6640 |
" Setzt ein unterbrochenes Übernehmen (commit) oder Abholen (pull) |
|
6701 | " Setzt ein unterbrochenes Übernehmen (commit) oder Abholen (pull) " | |
6641 | "\n" |
|
6702 | "zurück.\n" | |
6642 | " Der ungültige Status durch die Unterbrechung wird repariert. Dies sollte\n" |
|
6703 | "\n" | |
|
6704 | " Der ungültige Status durch die Unterbrechung wird repariert. Dies " | |||
|
6705 | "sollte\n" | |||
6643 | " nur dann nötig sein, wenn eine Meldung von Mercurial es vorschlägt.\n" |
|
6706 | " nur dann nötig sein, wenn eine Meldung von Mercurial es vorschlägt.\n" | |
6644 | " " |
|
6707 | " " | |
6645 |
|
6708 | |||
|
6709 | ||||
6646 | msgid "" |
|
6710 | msgid "" | |
6647 | "remove the specified files on the next commit\n" |
|
6711 | "remove the specified files on the next commit\n" | |
6648 | "\n" |
|
6712 | "\n" | |
6649 | " Schedule the indicated files for removal from the repository.\n" |
|
6713 | " Schedule the indicated files for removal from the repository.\n" | |
6650 | "\n" |
|
6714 | "\n" | |
6651 |
" This only removes files from the current branch, not from the |
|
6715 | " This only removes files from the current branch, not from the\n" | |
6652 |
" project history. -A can be used to remove onl |
|
6716 | " entire project history. -A/--after can be used to remove only\n" | |
6653 | " been deleted, -f can be used to force deletion, and -Af can be used\n" |
|
6717 | " files that have already been deleted, -f/--force can be used to\n" | |
6654 | " to remove files from the next revision without deleting them.\n" |
|
6718 | " force deletion, and -Af can be used to remove files from the next\n" | |
6655 | "\n" |
|
6719 | " revision without deleting them.\n" | |
6656 | " The following table details the behavior of remove for different file\n" |
|
6720 | "\n" | |
6657 | " states (columns) and option combinations (rows). The file states are\n" |
|
6721 | " The following table details the behavior of remove for different\n" | |
6658 | " Added, Clean, Modified and Missing (as reported by hg status). The\n" |
|
6722 | " file states (columns) and option combinations (rows). The file\n" | |
6659 | " actions are Warn, Remove (from branch) and Delete (from disk).\n" |
|
6723 | " states are Added, Clean, Modified and Missing (as reported by hg\n" | |
|
6724 | " status). The actions are Warn, Remove (from branch) and Delete\n" | |||
|
6725 | " (from disk).\n" | |||
6660 | "\n" |
|
6726 | "\n" | |
6661 | " A C M !\n" |
|
6727 | " A C M !\n" | |
6662 | " none W RD W R\n" |
|
6728 | " none W RD W R\n" | |
@@ -6712,15 +6778,16 b' msgstr "Ist modifiziert"' | |||||
6712 | msgid "has been marked for add" |
|
6778 | msgid "has been marked for add" | |
6713 | msgstr "Wurde als hinzugefügt markiert" |
|
6779 | msgstr "Wurde als hinzugefügt markiert" | |
6714 |
|
6780 | |||
|
6781 | ||||
6715 | msgid "" |
|
6782 | msgid "" | |
6716 | "rename files; equivalent of copy + remove\n" |
|
6783 | "rename files; equivalent of copy + remove\n" | |
6717 | "\n" |
|
6784 | "\n" | |
6718 | " Mark dest as copies of sources; mark sources for deletion. If\n" |
|
6785 | " Mark dest as copies of sources; mark sources for deletion. If dest\n" | |
6719 |
" |
|
6786 | " is a directory, copies are put in that directory. If dest is a\n" | |
6720 |
" |
|
6787 | " file, there can only be one source.\n" | |
6721 | "\n" |
|
6788 | "\n" | |
6722 | " By default, this command copies the contents of files as they\n" |
|
6789 | " By default, this command copies the contents of files as they\n" | |
6723 | " exist in the working directory. If invoked with --after, the\n" |
|
6790 | " exist in the working directory. If invoked with -A/--after, the\n" | |
6724 | " operation is recorded, but no copying is performed.\n" |
|
6791 | " operation is recorded, but no copying is performed.\n" | |
6725 | "\n" |
|
6792 | "\n" | |
6726 | " This command takes effect at the next commit. To undo a rename\n" |
|
6793 | " This command takes effect at the next commit. To undo a rename\n" | |
@@ -6742,34 +6809,44 b' msgstr ""' | |||||
6742 | "\n" |
|
6809 | "\n" | |
6743 | " Die neue Datei wird wie üblich nicht sofort übernommen, sondern " |
|
6810 | " Die neue Datei wird wie üblich nicht sofort übernommen, sondern " | |
6744 | "existiert\n" |
|
6811 | "existiert\n" | |
6745 |
" als lokale |
|
6812 | " als lokale Änderung im Arbeitsverzeichnis. Die Umbenennung kann durch\n" | |
6746 | " \"hg revert\" rückgängig gemacht werden.\n" |
|
6813 | " \"hg revert\" rückgängig gemacht werden.\n" | |
6747 | " " |
|
6814 | " " | |
6748 |
|
6815 | |||
|
6816 | #, fuzzy | |||
6749 | msgid "" |
|
6817 | msgid "" | |
6750 | "retry file merges from a merge or update\n" |
|
6818 | "retry file merges from a merge or update\n" | |
6751 | "\n" |
|
6819 | "\n" | |
6752 | " This command will cleanly retry unresolved file merges using file\n" |
|
6820 | " This command will cleanly retry unresolved file merges using file\n" | |
6753 | " revisions preserved from the last update or merge. To attempt to\n" |
|
6821 | " revisions preserved from the last update or merge. To attempt to\n" | |
6754 | " resolve all unresolved files, use the -a switch.\n" |
|
6822 | " resolve all unresolved files, use the -a/--all switch.\n" | |
|
6823 | "\n" | |||
|
6824 | " If a conflict is resolved manually, please note that the changes\n" | |||
|
6825 | " will be overwritten if the merge is retried with resolve. The\n" | |||
|
6826 | " -m/--mark switch should be used to mark the file as resolved.\n" | |||
6755 | "\n" |
|
6827 | "\n" | |
6756 | " This command will also allow listing resolved files and manually\n" |
|
6828 | " This command will also allow listing resolved files and manually\n" | |
6757 | " marking and unmarking files as resolved.\n" |
|
6829 | " marking and unmarking files as resolved. All files must be marked\n" | |
|
6830 | " as resolved before the new commits are permitted.\n" | |||
6758 | "\n" |
|
6831 | "\n" | |
6759 | " The codes used to show the status of files are:\n" |
|
6832 | " The codes used to show the status of files are:\n" | |
6760 | " U = unresolved\n" |
|
6833 | " U = unresolved\n" | |
6761 | " R = resolved\n" |
|
6834 | " R = resolved\n" | |
6762 | " " |
|
6835 | " " | |
6763 | msgstr "" |
|
6836 | msgstr "" | |
6764 | "Führt eine lokal geänderte Datei mit Änderungen erneut zusammen\n" |
|
6837 | "Wiederholt Dateizusammenführungen einer Zusammenführung oder einer " | |
|
6838 | "Aktualisierung\n" | |||
6765 | "\n" |
|
6839 | "\n" | |
6766 | " Änderungen, die einen Konflikt erzeugt haben, werden erneut auf die\n" |
|
6840 | " Änderungen, die einen Konflikt erzeugt haben, werden erneut auf die\n" | |
6767 |
" Version einer Datei angewendet, wie sie vor der konflikterzeugenden |
|
6841 | " Version einer Datei angewendet, wie sie vor der konflikterzeugenden " | |
6768 | " im Arbeitsverzeichnis vorlag. Dies macht manuelle Versuche, den Konflikt\n" |
|
6842 | "Aktion\n" | |
|
6843 | " im Arbeitsverzeichnis vorlag. Dies macht manuelle Versuche, den " | |||
|
6844 | "Konflikt\n" | |||
6769 | " zu lösen, rückgängig.\n" |
|
6845 | " zu lösen, rückgängig.\n" | |
6770 | " Mit der Option --all wird dies an allen markierten Dateien ausgeführt.\n" |
|
6846 | " Mit der Option --all wird dies an allen markierten Dateien ausgeführt.\n" | |
6771 | "\n" |
|
6847 | "\n" | |
6772 |
" Die Optionen --mark und --unmark markieren Konflikte als aufgelöst, |
|
6848 | " Die Optionen --mark und --unmark markieren Konflikte als aufgelöst, " | |
|
6849 | "bzw.\n" | |||
6773 | " heben dies wieder auf. Der aktuelle Status wird mit --list angezeigt.\n" |
|
6850 | " heben dies wieder auf. Der aktuelle Status wird mit --list angezeigt.\n" | |
6774 | "\n" |
|
6851 | "\n" | |
6775 | " Die verwendeten Zeichen bei --list bedeuten:\n" |
|
6852 | " Die verwendeten Zeichen bei --list bedeuten:\n" | |
@@ -6787,10 +6864,10 b' msgid "no files or directories specified' | |||||
6787 | msgstr "Keine Dateien oder Verzeichnisse angegeben; nutze --all für alle" |
|
6864 | msgstr "Keine Dateien oder Verzeichnisse angegeben; nutze --all für alle" | |
6788 |
|
6865 | |||
6789 | msgid "" |
|
6866 | msgid "" | |
6790 | "restore individual files or dirs to an earlier state\n" |
|
6867 | "restore individual files or directories to an earlier state\n" | |
6791 | "\n" |
|
6868 | "\n" | |
6792 | " (use update -r to check out earlier revisions, revert does not\n" |
|
6869 | " (use update -r to check out earlier revisions, revert does not\n" | |
6793 | " change the working dir parents)\n" |
|
6870 | " change the working directory parents)\n" | |
6794 | "\n" |
|
6871 | "\n" | |
6795 | " With no revision specified, revert the named files or directories\n" |
|
6872 | " With no revision specified, revert the named files or directories\n" | |
6796 | " to the contents they had in the parent of the working directory.\n" |
|
6873 | " to the contents they had in the parent of the working directory.\n" | |
@@ -6799,10 +6876,10 b' msgid ""' | |||||
6799 | " working directory has two parents, you must explicitly specify the\n" |
|
6876 | " working directory has two parents, you must explicitly specify the\n" | |
6800 | " revision to revert to.\n" |
|
6877 | " revision to revert to.\n" | |
6801 | "\n" |
|
6878 | "\n" | |
6802 |
" Using the -r option, revert the given files or directories |
|
6879 | " Using the -r/--rev option, revert the given files or directories\n" | |
6803 |
" contents as of a specific revision. This can be helpfu |
|
6880 | " to their contents as of a specific revision. This can be helpful\n" | |
6804 | " back\" some or all of an earlier change.\n" |
|
6881 | " to \"roll back\" some or all of an earlier change. See 'hg help\n" | |
6805 |
" |
|
6882 | " dates' for a list of formats valid for -d/--date.\n" | |
6806 | "\n" |
|
6883 | "\n" | |
6807 | " Revert modifies the working directory. It does not commit any\n" |
|
6884 | " Revert modifies the working directory. It does not commit any\n" | |
6808 | " changes, or change the parent of the working directory. If you\n" |
|
6885 | " changes, or change the parent of the working directory. If you\n" | |
@@ -6810,8 +6887,8 b' msgid ""' | |||||
6810 | " directory, the reverted files will thus appear modified\n" |
|
6887 | " directory, the reverted files will thus appear modified\n" | |
6811 | " afterwards.\n" |
|
6888 | " afterwards.\n" | |
6812 | "\n" |
|
6889 | "\n" | |
6813 | " If a file has been deleted, it is restored. If the executable\n" |
|
6890 | " If a file has been deleted, it is restored. If the executable mode\n" | |
6814 |
" |
|
6891 | " of a file was changed, it is reset.\n" | |
6815 | "\n" |
|
6892 | "\n" | |
6816 | " If names are given, all files matching the names are reverted.\n" |
|
6893 | " If names are given, all files matching the names are reverted.\n" | |
6817 | " If no arguments are given, no files are reverted.\n" |
|
6894 | " If no arguments are given, no files are reverted.\n" | |
@@ -6880,7 +6957,7 b' msgid ""' | |||||
6880 | msgstr "" |
|
6957 | msgstr "" | |
6881 |
|
6958 | |||
6882 | msgid "" |
|
6959 | msgid "" | |
6883 | "print the root (top) of the current working dir\n" |
|
6960 | "print the root (top) of the current working directory\n" | |
6884 | "\n" |
|
6961 | "\n" | |
6885 | " Print the root directory of the current repository.\n" |
|
6962 | " Print the root directory of the current repository.\n" | |
6886 | " " |
|
6963 | " " | |
@@ -6892,7 +6969,7 b' msgid ""' | |||||
6892 | " Start a local HTTP repository browser and pull server.\n" |
|
6969 | " Start a local HTTP repository browser and pull server.\n" | |
6893 | "\n" |
|
6970 | "\n" | |
6894 | " By default, the server logs accesses to stdout and errors to\n" |
|
6971 | " By default, the server logs accesses to stdout and errors to\n" | |
6895 |
" stderr. Use the |
|
6972 | " stderr. Use the -A and -E options to log to files.\n" | |
6896 | " " |
|
6973 | " " | |
6897 | msgstr "" |
|
6974 | msgstr "" | |
6898 | "Exportiert das Projektarchiv via HTTP\n" |
|
6975 | "Exportiert das Projektarchiv via HTTP\n" | |
@@ -6913,12 +6990,13 b' msgid ""' | |||||
6913 | "\n" |
|
6990 | "\n" | |
6914 | " Show status of files in the repository. If names are given, only\n" |
|
6991 | " Show status of files in the repository. If names are given, only\n" | |
6915 | " files that match are shown. Files that are clean or ignored or\n" |
|
6992 | " files that match are shown. Files that are clean or ignored or\n" | |
6916 |
" source of a copy/move operation, are not listed unless -c |
|
6993 | " source of a copy/move operation, are not listed unless -c/--clean,\n" | |
6917 |
" -i |
|
6994 | " -i/--ignored, -C/--copies or -A/--all is given. Unless options\n" | |
6918 |
" with \"show only ...\" are given, the options -mardu are |
|
6995 | " described with \"show only ...\" are given, the options -mardu are\n" | |
|
6996 | " used.\n" | |||
6919 | "\n" |
|
6997 | "\n" | |
6920 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" |
|
6998 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" | |
6921 | " unless explicitly requested with -u/--unknown or -i/-ignored.\n" |
|
6999 | " unless explicitly requested with -u/--unknown or -i/--ignored.\n" | |
6922 | "\n" |
|
7000 | "\n" | |
6923 | " NOTE: status may appear to disagree with diff if permissions have\n" |
|
7001 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
6924 | " changed or a merge has occurred. The standard diff format does not\n" |
|
7002 | " changed or a merge has occurred. The standard diff format does not\n" | |
@@ -6933,7 +7011,7 b' msgid ""' | |||||
6933 | " A = added\n" |
|
7011 | " A = added\n" | |
6934 | " R = removed\n" |
|
7012 | " R = removed\n" | |
6935 | " C = clean\n" |
|
7013 | " C = clean\n" | |
6936 | " ! = deleted, but still tracked\n" |
|
7014 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
6937 | " ? = not tracked\n" |
|
7015 | " ? = not tracked\n" | |
6938 | " I = ignored\n" |
|
7016 | " I = ignored\n" | |
6939 | " = the previous added file was copied from here\n" |
|
7017 | " = the previous added file was copied from here\n" | |
@@ -6972,7 +7050,8 b' msgstr ""' | |||||
6972 | " A = hinzugefügt (added)\n" |
|
7050 | " A = hinzugefügt (added)\n" | |
6973 | " R = entfernt (removed)\n" |
|
7051 | " R = entfernt (removed)\n" | |
6974 | " C = unverändert (clean)\n" |
|
7052 | " C = unverändert (clean)\n" | |
6975 | " ! = gelöscht, aber immer noch überwacht\n" |
|
7053 | " ! = verschwunden (nicht durch einen hg-Befehl gelöscht, aber immer\n" | |
|
7054 | " noch überwacht)\n" | |||
6976 | " ? = nicht überwacht\n" |
|
7055 | " ? = nicht überwacht\n" | |
6977 | " I = ignoriert\n" |
|
7056 | " I = ignoriert\n" | |
6978 | " = die zuvor hinzugefügt Datei wurde von hier kopiert\n" |
|
7057 | " = die zuvor hinzugefügt Datei wurde von hier kopiert\n" | |
@@ -6987,8 +7066,8 b' msgid ""' | |||||
6987 | " very useful to compare different revisions, to go back to significant\n" |
|
7066 | " very useful to compare different revisions, to go back to significant\n" | |
6988 | " earlier versions or to mark branch points as releases, etc.\n" |
|
7067 | " earlier versions or to mark branch points as releases, etc.\n" | |
6989 | "\n" |
|
7068 | "\n" | |
6990 |
" If no revision is given, the parent of the working directory is |
|
7069 | " If no revision is given, the parent of the working directory is\n" | |
6991 | " or tip if no revision is checked out.\n" |
|
7070 | " used, or tip if no revision is checked out.\n" | |
6992 | "\n" |
|
7071 | "\n" | |
6993 | " To facilitate version control, distribution, and merging of tags,\n" |
|
7072 | " To facilitate version control, distribution, and merging of tags,\n" | |
6994 | " they are stored as a file named \".hgtags\" which is managed\n" |
|
7073 | " they are stored as a file named \".hgtags\" which is managed\n" | |
@@ -7015,7 +7094,11 b' msgid "tag \'%s\' does not exist"' | |||||
7015 | msgstr "" |
|
7094 | msgstr "" | |
7016 |
|
7095 | |||
7017 | #, python-format |
|
7096 | #, python-format | |
7018 |
msgid "tag '%s' is not a |
|
7097 | msgid "tag '%s' is not a global tag" | |
|
7098 | msgstr "" | |||
|
7099 | ||||
|
7100 | #, python-format | |||
|
7101 | msgid "tag '%s' is not a local tag" | |||
7019 | msgstr "" |
|
7102 | msgstr "" | |
7020 |
|
7103 | |||
7021 | #, python-format |
|
7104 | #, python-format | |
@@ -7033,8 +7116,8 b' msgstr ""' | |||||
7033 | msgid "" |
|
7116 | msgid "" | |
7034 | "list repository tags\n" |
|
7117 | "list repository tags\n" | |
7035 | "\n" |
|
7118 | "\n" | |
7036 |
" This lists both regular and local tags. When the -v/--verbose |
|
7119 | " This lists both regular and local tags. When the -v/--verbose\n" | |
7037 | " is used, a third column \"local\" is printed for local tags.\n" |
|
7120 | " switch is used, a third column \"local\" is printed for local tags.\n" | |
7038 | " " |
|
7121 | " " | |
7039 | msgstr "" |
|
7122 | msgstr "" | |
7040 |
|
7123 | |||
@@ -7060,32 +7143,36 b' msgid ""' | |||||
7060 | " " |
|
7143 | " " | |
7061 | msgstr "" |
|
7144 | msgstr "" | |
7062 |
|
7145 | |||
|
7146 | ||||
7063 | msgid "" |
|
7147 | msgid "" | |
7064 | "update working directory\n" |
|
7148 | "update working directory\n" | |
7065 | "\n" |
|
7149 | "\n" | |
7066 |
" Update the repository's working directory to the specified |
|
7150 | " Update the repository's working directory to the specified\n" | |
7067 |
" or the tip of the current branch if none is specified. |
|
7151 | " revision, or the tip of the current branch if none is specified.\n" | |
7068 |
" the revision to remove the working copy (like 'hg |
|
7152 | " Use null as the revision to remove the working copy (like 'hg\n" | |
7069 | "\n" |
|
7153 | " clone -U').\n" | |
7070 | " When the working dir contains no uncommitted changes, it will be\n" |
|
7154 | "\n" | |
7071 | " replaced by the state of the requested revision from the repo. When\n" |
|
7155 | " When the working directory contains no uncommitted changes, it\n" | |
7072 | " the requested revision is on a different branch, the working dir\n" |
|
7156 | " will be replaced by the state of the requested revision from the\n" | |
7073 | " will additionally be switched to that branch.\n" |
|
7157 | " repository. When the requested revision is on a different branch,\n" | |
|
7158 | " the working directory will additionally be switched to that\n" | |||
|
7159 | " branch.\n" | |||
7074 | "\n" |
|
7160 | "\n" | |
7075 | " When there are uncommitted changes, use option -C to discard them,\n" |
|
7161 | " When there are uncommitted changes, use option -C to discard them,\n" | |
7076 |
" forcibly replacing the state of the working dir with the |
|
7162 | " forcibly replacing the state of the working directory with the\n" | |
7077 | " revision.\n" |
|
7163 | " requested revision.\n" | |
7078 | "\n" |
|
7164 | "\n" | |
7079 | " When there are uncommitted changes and option -C is not used, and\n" |
|
7165 | " When there are uncommitted changes and option -C is not used, and\n" | |
7080 | " the parent revision and requested revision are on the same branch,\n" |
|
7166 | " the parent revision and requested revision are on the same branch,\n" | |
7081 | " and one of them is an ancestor of the other, then the new working\n" |
|
7167 | " and one of them is an ancestor of the other, then the new working\n" | |
7082 | " directory will contain the requested revision merged with the\n" |
|
7168 | " directory will contain the requested revision merged with the\n" | |
7083 |
" uncommitted changes. |
|
7169 | " uncommitted changes. Otherwise, the update will fail with a\n" | |
7084 | " suggestion to use 'merge' or 'update -C' instead.\n" |
|
7170 | " suggestion to use 'merge' or 'update -C' instead.\n" | |
7085 | "\n" |
|
7171 | "\n" | |
7086 |
" If you want to update just one file to an older revision, use |
|
7172 | " If you want to update just one file to an older revision, use\n" | |
7087 | "\n" |
|
7173 | " revert.\n" | |
7088 | " See 'hg help dates' for a list of formats valid for --date.\n" |
|
7174 | "\n" | |
|
7175 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" | |||
7089 | " " |
|
7176 | " " | |
7090 | msgstr "" |
|
7177 | msgstr "" | |
7091 | "Aktualisiert das Arbeitsverzeichnis\n" |
|
7178 | "Aktualisiert das Arbeitsverzeichnis\n" | |
@@ -7130,23 +7217,6 b' msgid ""' | |||||
7130 | " integrity of their crosslinks and indices.\n" |
|
7217 | " integrity of their crosslinks and indices.\n" | |
7131 | " " |
|
7218 | " " | |
7132 | msgstr "" |
|
7219 | msgstr "" | |
7133 | "Sucht ein Muster in angegebenen Dateien und Revisionen\n" |
|
|||
7134 | "\n" |
|
|||
7135 | " Durchsucht Dateien in der Versionshistorie nach einem gegebenen Muster.\n" |
|
|||
7136 | "\n" |
|
|||
7137 | " Dieses Kommando unterscheidet sich von Unix grep, da es Reguläre " |
|
|||
7138 | "Ausdrücke\n" |
|
|||
7139 | " in Python/Perl Format erwartet und ausserdem nur die übernommenen " |
|
|||
7140 | "Revisionen\n" |
|
|||
7141 | " im Archiv durchsucht, nicht jedoch das Arbeitsverzeichnis.\n" |
|
|||
7142 | "\n" |
|
|||
7143 | " Standardmäßig gibt grep den Dateinamen und die jüngste Revision einer " |
|
|||
7144 | "Datei\n" |
|
|||
7145 | " aus, die das Suchmuster enthält. Mit der Option --all werden " |
|
|||
7146 | "stattdessen\n" |
|
|||
7147 | " alle Revisionen ausgegeben, in der das Muster hinzugefügt (\"+\") oder\n" |
|
|||
7148 | " entfernt (\"-\") wurde.\n" |
|
|||
7149 | " " |
|
|||
7150 |
|
7220 | |||
7151 | msgid "output version and copyright information" |
|
7221 | msgid "output version and copyright information" | |
7152 | msgstr "" |
|
7222 | msgstr "" | |
@@ -7192,9 +7262,6 b' msgstr "Setzt die Zeichenkodierung"' | |||||
7192 | msgid "set the charset encoding mode" |
|
7262 | msgid "set the charset encoding mode" | |
7193 | msgstr "Setzt den Modus der Zeichenkodierung" |
|
7263 | msgstr "Setzt den Modus der Zeichenkodierung" | |
7194 |
|
7264 | |||
7195 | msgid "print improved command execution profile" |
|
|||
7196 | msgstr "Gibt erweitertes Ausführungsprofil der Befehle aus" |
|
|||
7197 |
|
||||
7198 | msgid "print traceback on exception" |
|
7265 | msgid "print traceback on exception" | |
7199 | msgstr "Gibt den Traceback einer Exception aus" |
|
7266 | msgstr "Gibt den Traceback einer Exception aus" | |
7200 |
|
7267 | |||
@@ -7491,7 +7558,7 b' msgstr ""' | |||||
7491 | msgid "ignore case when matching" |
|
7558 | msgid "ignore case when matching" | |
7492 | msgstr "" |
|
7559 | msgstr "" | |
7493 |
|
7560 | |||
7494 | msgid "print only filenames and revs that match" |
|
7561 | msgid "print only filenames and revisions that match" | |
7495 | msgstr "" |
|
7562 | msgstr "" | |
7496 |
|
7563 | |||
7497 | msgid "print matching line numbers" |
|
7564 | msgid "print matching line numbers" | |
@@ -7503,7 +7570,7 b' msgstr ""' | |||||
7503 | msgid "[OPTION]... PATTERN [FILE]..." |
|
7570 | msgid "[OPTION]... PATTERN [FILE]..." | |
7504 | msgstr "" |
|
7571 | msgstr "" | |
7505 |
|
7572 | |||
7506 |
msgid "show only heads which are descendants of |
|
7573 | msgid "show only heads which are descendants of REV" | |
7507 | msgstr "" |
|
7574 | msgstr "" | |
7508 |
|
7575 | |||
7509 | msgid "show only the active heads from open branches" |
|
7576 | msgid "show only the active heads from open branches" | |
@@ -7515,8 +7582,8 b' msgstr ""' | |||||
7515 | msgid "[TOPIC]" |
|
7582 | msgid "[TOPIC]" | |
7516 | msgstr "" |
|
7583 | msgstr "" | |
7517 |
|
7584 | |||
7518 | msgid "identify the specified rev" |
|
7585 | msgid "identify the specified revision" | |
7519 | msgstr "" |
|
7586 | msgstr "Identifiziert die angegebene Revision" | |
7520 |
|
7587 | |||
7521 | msgid "show local revision number" |
|
7588 | msgid "show local revision number" | |
7522 | msgstr "" |
|
7589 | msgstr "" | |
@@ -7534,8 +7601,8 b' msgid "[-nibt] [-r REV] [SOURCE]"' | |||||
7534 | msgstr "" |
|
7601 | msgstr "" | |
7535 |
|
7602 | |||
7536 | msgid "" |
|
7603 | msgid "" | |
7537 |
"directory strip option for patch. This has the same |
|
7604 | "directory strip option for patch. This has the same meaning as the " | |
7538 |
" |
|
7605 | "corresponding patch option" | |
7539 | msgstr "" |
|
7606 | msgstr "" | |
7540 |
|
7607 | |||
7541 | msgid "base path" |
|
7608 | msgid "base path" | |
@@ -7550,7 +7617,7 b' msgstr ""' | |||||
7550 | msgid "apply patch to the nodes from which it was generated" |
|
7617 | msgid "apply patch to the nodes from which it was generated" | |
7551 | msgstr "" |
|
7618 | msgstr "" | |
7552 |
|
7619 | |||
7553 |
msgid " |
|
7620 | msgid "use any branch information in patch (implied by --exact)" | |
7554 | msgstr "" |
|
7621 | msgstr "" | |
7555 |
|
7622 | |||
7556 | msgid "[OPTION]... PATCH..." |
|
7623 | msgid "[OPTION]... PATCH..." | |
@@ -7571,7 +7638,7 b' msgstr ""' | |||||
7571 | msgid "[-e CMD] [--remotecmd CMD] [DEST]" |
|
7638 | msgid "[-e CMD] [--remotecmd CMD] [DEST]" | |
7572 | msgstr "" |
|
7639 | msgstr "" | |
7573 |
|
7640 | |||
7574 |
msgid "search the repository as it stood at |
|
7641 | msgid "search the repository as it stood at REV" | |
7575 | msgstr "" |
|
7642 | msgstr "" | |
7576 |
|
7643 | |||
7577 | msgid "end filenames with NUL, for use with xargs" |
|
7644 | msgid "end filenames with NUL, for use with xargs" | |
@@ -7586,7 +7653,7 b' msgstr ""' | |||||
7586 | msgid "only follow the first parent of merge changesets" |
|
7653 | msgid "only follow the first parent of merge changesets" | |
7587 | msgstr "Folgt nur dem ersten Vorgänger einer Zusammenführungsversion" |
|
7654 | msgstr "Folgt nur dem ersten Vorgänger einer Zusammenführungsversion" | |
7588 |
|
7655 | |||
7589 | msgid "show revs matching date spec" |
|
7656 | msgid "show revisions matching date spec" | |
7590 | msgstr "Zeigt Revisionen passend zur Datums-Spezifikation" |
|
7657 | msgstr "Zeigt Revisionen passend zur Datums-Spezifikation" | |
7591 |
|
7658 | |||
7592 | msgid "show copied files" |
|
7659 | msgid "show copied files" | |
@@ -7595,13 +7662,13 b' msgstr "Zeigt kopierte Dateien"' | |||||
7595 | msgid "do case-insensitive search for a keyword" |
|
7662 | msgid "do case-insensitive search for a keyword" | |
7596 | msgstr "Sucht unabhängig von Groß- und Kleinschreibung ein Stichwort" |
|
7663 | msgstr "Sucht unabhängig von Groß- und Kleinschreibung ein Stichwort" | |
7597 |
|
7664 | |||
7598 | msgid "include revs where files were removed" |
|
7665 | msgid "include revisions where files were removed" | |
7599 | msgstr "Revisionen hinzufügen, in denen Dateien entfernt wurden" |
|
7666 | msgstr "Revisionen hinzufügen, in denen Dateien entfernt wurden" | |
7600 |
|
7667 | |||
7601 | msgid "show only merges" |
|
7668 | msgid "show only merges" | |
7602 | msgstr "Zeigt nur Zusammenführungen" |
|
7669 | msgstr "Zeigt nur Zusammenführungen" | |
7603 |
|
7670 | |||
7604 | msgid "revs committed by user" |
|
7671 | msgid "revisions committed by user" | |
7605 | msgstr "Revisionen erzeugt vom Nutzer" |
|
7672 | msgstr "Revisionen erzeugt vom Nutzer" | |
7606 |
|
7673 | |||
7607 | msgid "show only changesets within the given named branch" |
|
7674 | msgid "show only changesets within the given named branch" | |
@@ -7634,7 +7701,7 b' msgstr "eine bestimmte Revision bis zu d' | |||||
7634 | msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" |
|
7701 | msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" | |
7635 | msgstr "[-M] [-p] [-n] [-f] [-r REV]... [ZIEL]" |
|
7702 | msgstr "[-M] [-p] [-n] [-f] [-r REV]... [ZIEL]" | |
7636 |
|
7703 | |||
7637 | msgid "show parents from the specified rev" |
|
7704 | msgid "show parents from the specified revision" | |
7638 | msgstr "Zeigt die Vorgänger der angegeben Revision" |
|
7705 | msgstr "Zeigt die Vorgänger der angegeben Revision" | |
7639 |
|
7706 | |||
7640 | msgid "hg parents [-r REV] [FILE]" |
|
7707 | msgid "hg parents [-r REV] [FILE]" | |
@@ -7709,11 +7776,11 b' msgstr "Adresse auf der gehorcht wird (S' | |||||
7709 | msgid "prefix path to serve from (default: server root)" |
|
7776 | msgid "prefix path to serve from (default: server root)" | |
7710 | msgstr "Pfadpräfix von dem ausgeliefert wird (Standard: Serverwurzel '/')" |
|
7777 | msgstr "Pfadpräfix von dem ausgeliefert wird (Standard: Serverwurzel '/')" | |
7711 |
|
7778 | |||
7712 | msgid "name to show in web pages (default: working dir)" |
|
7779 | msgid "name to show in web pages (default: working directory)" | |
7713 | msgstr "" |
|
7780 | msgstr "" | |
7714 | "Name der auf der Webseite angezeigt wird (Standard: Arbeitsverzeichnis)" |
|
7781 | "Name der auf der Webseite angezeigt wird (Standard: Arbeitsverzeichnis)" | |
7715 |
|
7782 | |||
7716 | msgid "name of the webdir config file (serve more than one repo)" |
|
7783 | msgid "name of the webdir config file (serve more than one repository)" | |
7717 | msgstr "Name der webdir-Konfigurationsdatei (mehr als ein Archiv ausliefern)" |
|
7784 | msgstr "Name der webdir-Konfigurationsdatei (mehr als ein Archiv ausliefern)" | |
7718 |
|
7785 | |||
7719 | msgid "for remote clients" |
|
7786 | msgid "for remote clients" | |
@@ -8006,7 +8073,8 b' msgstr ""' | |||||
8006 | msgid "invalid arguments" |
|
8073 | msgid "invalid arguments" | |
8007 | msgstr "" |
|
8074 | msgstr "" | |
8008 |
|
8075 | |||
8009 | msgid "exception raised - generating profile anyway\n" |
|
8076 | #, python-format | |
|
8077 | msgid "unrecognized profiling format '%s' - Ignored\n" | |||
8010 | msgstr "" |
|
8078 | msgstr "" | |
8011 |
|
8079 | |||
8012 | msgid "" |
|
8080 | msgid "" | |
@@ -8096,6 +8164,7 b' msgstr ""' | |||||
8096 | msgid "Date Formats" |
|
8164 | msgid "Date Formats" | |
8097 | msgstr "Datumsformate" |
|
8165 | msgstr "Datumsformate" | |
8098 |
|
8166 | |||
|
8167 | ||||
8099 | msgid "" |
|
8168 | msgid "" | |
8100 | "\n" |
|
8169 | "\n" | |
8101 | " Some commands allow the user to specify a date, e.g.:\n" |
|
8170 | " Some commands allow the user to specify a date, e.g.:\n" | |
@@ -8123,9 +8192,9 b' msgid ""' | |||||
8123 | " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" |
|
8192 | " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" | |
8124 | "\n" |
|
8193 | "\n" | |
8125 | " This is the internal representation format for dates. unixtime is\n" |
|
8194 | " This is the internal representation format for dates. unixtime is\n" | |
8126 |
" the number of seconds since the epoch (1970-01-01 00:00 UTC). |
|
8195 | " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" | |
8127 |
" is the offset of the local timezone, in seconds west of UTC |
|
8196 | " offset is the offset of the local timezone, in seconds west of UTC\n" | |
8128 | " if the timezone is east of UTC).\n" |
|
8197 | " (negative if the timezone is east of UTC).\n" | |
8129 | "\n" |
|
8198 | "\n" | |
8130 | " The log command also accepts date ranges:\n" |
|
8199 | " The log command also accepts date ranges:\n" | |
8131 | "\n" |
|
8200 | "\n" | |
@@ -8288,10 +8357,10 b' msgstr "Umgebungsvariablen"' | |||||
8288 | msgid "" |
|
8357 | msgid "" | |
8289 | "\n" |
|
8358 | "\n" | |
8290 | "HG::\n" |
|
8359 | "HG::\n" | |
8291 |
" Path to the 'hg' executable, automatically passed when running |
|
8360 | " Path to the 'hg' executable, automatically passed when running\n" | |
8292 |
" extensions or external tools. If unset or empty, this is |
|
8361 | " hooks, extensions or external tools. If unset or empty, this is\n" | |
8293 |
" executable's name if it's frozen, or an executable named |
|
8362 | " the hg executable's name if it's frozen, or an executable named\n" | |
8294 | " (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" |
|
8363 | " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
8295 | " Windows) is searched.\n" |
|
8364 | " Windows) is searched.\n" | |
8296 | "\n" |
|
8365 | "\n" | |
8297 | "HGEDITOR::\n" |
|
8366 | "HGEDITOR::\n" | |
@@ -8352,32 +8421,32 b' msgid ""' | |||||
8352 | " This is the name of the editor to use when committing. See EDITOR.\n" |
|
8421 | " This is the name of the editor to use when committing. See EDITOR.\n" | |
8353 | "\n" |
|
8422 | "\n" | |
8354 | "EDITOR::\n" |
|
8423 | "EDITOR::\n" | |
8355 | " Sometimes Mercurial needs to open a text file in an editor\n" |
|
8424 | " Sometimes Mercurial needs to open a text file in an editor for a\n" | |
8356 |
" |
|
8425 | " user to modify, for example when writing commit messages. The\n" | |
8357 |
" |
|
8426 | " editor it uses is determined by looking at the environment\n" | |
8358 | " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" |
|
8427 | " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" | |
8359 | " non-empty one is chosen. If all of them are empty, the editor\n" |
|
8428 | " non-empty one is chosen. If all of them are empty, the editor\n" | |
8360 | " defaults to 'vi'.\n" |
|
8429 | " defaults to 'vi'.\n" | |
8361 | "\n" |
|
8430 | "\n" | |
8362 | "PYTHONPATH::\n" |
|
8431 | "PYTHONPATH::\n" | |
8363 |
" This is used by Python to find imported modules and may need to be |
|
8432 | " This is used by Python to find imported modules and may need to be\n" | |
8364 | " appropriately if this Mercurial is not installed system-wide.\n" |
|
8433 | " set appropriately if this Mercurial is not installed system-wide.\n" | |
8365 | " " |
|
8434 | " " | |
8366 | msgstr "" |
|
8435 | msgstr "" | |
8367 |
|
8436 | |||
8368 | msgid "Specifying Single Revisions" |
|
8437 | msgid "Specifying Single Revisions" | |
8369 | msgstr "Angabe Einzelner Revisionen" |
|
8438 | msgstr "Angabe Einzelner Revisionen" | |
8370 |
|
8439 | |||
8371 | msgid "" |
|
8440 | ||
8372 | "\n" |
|
8441 | msgid "" | |
8373 | " Mercurial supports several ways to specify individual\n" |
|
8442 | "\n" | |
8374 | " revisions.\n" |
|
8443 | " Mercurial supports several ways to specify individual revisions.\n" | |
8375 | "\n" |
|
8444 | "\n" | |
8376 | " A plain integer is treated as a revision number. Negative\n" |
|
8445 | " A plain integer is treated as a revision number. Negative integers\n" | |
8377 |
" |
|
8446 | " are treated as topological offsets from the tip, with -1 denoting\n" | |
8378 |
" |
|
8447 | " the tip. As such, negative numbers are only useful if you've\n" | |
8379 |
" |
|
8448 | " memorized your local tree numbers and want to save typing a single\n" | |
8380 |
" |
|
8449 | " digit. This editor suggests copy and paste.\n" | |
8381 | "\n" |
|
8450 | "\n" | |
8382 | " A 40-digit hexadecimal string is treated as a unique revision\n" |
|
8451 | " A 40-digit hexadecimal string is treated as a unique revision\n" | |
8383 | " identifier.\n" |
|
8452 | " identifier.\n" | |
@@ -8398,9 +8467,9 b' msgid ""' | |||||
8398 | " revision of an empty repository, and the parent of revision 0.\n" |
|
8467 | " revision of an empty repository, and the parent of revision 0.\n" | |
8399 | "\n" |
|
8468 | "\n" | |
8400 | " The reserved name \".\" indicates the working directory parent. If\n" |
|
8469 | " The reserved name \".\" indicates the working directory parent. If\n" | |
8401 | " no working directory is checked out, it is equivalent to null.\n" |
|
8470 | " no working directory is checked out, it is equivalent to null. If\n" | |
8402 |
" |
|
8471 | " an uncommitted merge is in progress, \".\" is the revision of the\n" | |
8403 |
" |
|
8472 | " first parent.\n" | |
8404 | " " |
|
8473 | " " | |
8405 | msgstr "" |
|
8474 | msgstr "" | |
8406 | "\n" |
|
8475 | "\n" | |
@@ -8443,6 +8512,7 b' msgstr ""' | |||||
8443 | msgid "Specifying Multiple Revisions" |
|
8512 | msgid "Specifying Multiple Revisions" | |
8444 | msgstr "Angabe Mehrerer Revisionen" |
|
8513 | msgstr "Angabe Mehrerer Revisionen" | |
8445 |
|
8514 | |||
|
8515 | ||||
8446 | msgid "" |
|
8516 | msgid "" | |
8447 | "\n" |
|
8517 | "\n" | |
8448 | " When Mercurial accepts more than one revision, they may be\n" |
|
8518 | " When Mercurial accepts more than one revision, they may be\n" | |
@@ -8452,8 +8522,8 b' msgid ""' | |||||
8452 | " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" |
|
8522 | " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" | |
8453 | " are revision identifiers. Both BEGIN and END are optional. If\n" |
|
8523 | " are revision identifiers. Both BEGIN and END are optional. If\n" | |
8454 | " BEGIN is not specified, it defaults to revision number 0. If END\n" |
|
8524 | " BEGIN is not specified, it defaults to revision number 0. If END\n" | |
8455 | " is not specified, it defaults to the tip. The range \":\" thus\n" |
|
8525 | " is not specified, it defaults to the tip. The range \":\" thus means\n" | |
8456 |
" |
|
8526 | " \"all revisions\".\n" | |
8457 | "\n" |
|
8527 | "\n" | |
8458 | " If BEGIN is greater than END, revisions are treated in reverse\n" |
|
8528 | " If BEGIN is greater than END, revisions are treated in reverse\n" | |
8459 | " order.\n" |
|
8529 | " order.\n" | |
@@ -8487,9 +8557,10 b' msgstr "Diff-Formate"' | |||||
8487 |
|
8557 | |||
8488 | msgid "" |
|
8558 | msgid "" | |
8489 | "\n" |
|
8559 | "\n" | |
8490 |
" Mercurial's default format for showing changes between two |
|
8560 | " Mercurial's default format for showing changes between two\n" | |
8491 |
" of a file is compatible with the unified format of GNU |
|
8561 | " versions of a file is compatible with the unified format of GNU\n" | |
8492 |
" can be used by GNU patch and many other standard |
|
8562 | " diff, which can be used by GNU patch and many other standard\n" | |
|
8563 | " tools.\n" | |||
8493 | "\n" |
|
8564 | "\n" | |
8494 | " While this standard format is often enough, it does not encode the\n" |
|
8565 | " While this standard format is often enough, it does not encode the\n" | |
8495 | " following information:\n" |
|
8566 | " following information:\n" | |
@@ -8507,15 +8578,16 b' msgid ""' | |||||
8507 | " This means that when generating diffs from a Mercurial repository\n" |
|
8578 | " This means that when generating diffs from a Mercurial repository\n" | |
8508 | " (e.g. with \"hg export\"), you should be careful about things like\n" |
|
8579 | " (e.g. with \"hg export\"), you should be careful about things like\n" | |
8509 | " file copies and renames or other things mentioned above, because\n" |
|
8580 | " file copies and renames or other things mentioned above, because\n" | |
8510 |
" when applying a standard diff to a different repository, this |
|
8581 | " when applying a standard diff to a different repository, this\n" | |
8511 |
" information is lost. Mercurial's internal operations (like |
|
8582 | " extra information is lost. Mercurial's internal operations (like\n" | |
8512 |
" pull) are not affected by this, because they use an |
|
8583 | " push and pull) are not affected by this, because they use an\n" | |
8513 | " format for communicating changes.\n" |
|
8584 | " internal binary format for communicating changes.\n" | |
8514 | "\n" |
|
8585 | "\n" | |
8515 | " To make Mercurial produce the git extended diff format, use the\n" |
|
8586 | " To make Mercurial produce the git extended diff format, use the\n" | |
8516 |
" --git option available for many commands, or set 'git = True' in |
|
8587 | " --git option available for many commands, or set 'git = True' in\n" | |
8517 |
" [diff] section of your hgrc. You do not need to set this |
|
8588 | " the [diff] section of your hgrc. You do not need to set this\n" | |
8518 |
" importing diffs in this format or using them in the mq |
|
8589 | " option when importing diffs in this format or using them in the mq\n" | |
|
8590 | " extension.\n" | |||
8519 | " " |
|
8591 | " " | |
8520 | msgstr "" |
|
8592 | msgstr "" | |
8521 |
|
8593 | |||
@@ -8525,51 +8597,52 b' msgstr "Nutzung von Vorlagen"' | |||||
8525 | msgid "" |
|
8597 | msgid "" | |
8526 | "\n" |
|
8598 | "\n" | |
8527 | " Mercurial allows you to customize output of commands through\n" |
|
8599 | " Mercurial allows you to customize output of commands through\n" | |
8528 |
" templates. You can either pass in a template from the command |
|
8600 | " templates. You can either pass in a template from the command\n" | |
8529 |
" via the --template option, or select an existing |
|
8601 | " line, via the --template option, or select an existing\n" | |
8530 | "style).\n" |
|
8602 | " template-style (--style).\n" | |
8531 | "\n" |
|
8603 | "\n" | |
8532 |
" You can customize output for any \"log-like\" command: log, |
|
8604 | " You can customize output for any \"log-like\" command: log,\n" | |
8533 | " incoming, tip, parents, heads and glog.\n" |
|
8605 | " outgoing, incoming, tip, parents, heads and glog.\n" | |
8534 | "\n" |
|
8606 | "\n" | |
8535 | " Three styles are packaged with Mercurial: default (the style used\n" |
|
8607 | " Three styles are packaged with Mercurial: default (the style used\n" | |
8536 |
" when no explicit preference is passed), compact and changelog. |
|
8608 | " when no explicit preference is passed), compact and changelog.\n" | |
|
8609 | " Usage:\n" | |||
8537 | "\n" |
|
8610 | "\n" | |
8538 | " $ hg log -r1 --style changelog\n" |
|
8611 | " $ hg log -r1 --style changelog\n" | |
8539 | "\n" |
|
8612 | "\n" | |
8540 |
" A template is a piece of text, with markup to invoke variable |
|
8613 | " A template is a piece of text, with markup to invoke variable\n" | |
8541 | "expansion:\n" |
|
8614 | " expansion:\n" | |
8542 | "\n" |
|
8615 | "\n" | |
8543 | " $ hg log -r1 --template \"{node}\\n\"\n" |
|
8616 | " $ hg log -r1 --template \"{node}\\n\"\n" | |
8544 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" |
|
8617 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" | |
8545 | "\n" |
|
8618 | "\n" | |
8546 | " Strings in curly braces are called keywords. The availability of\n" |
|
8619 | " Strings in curly braces are called keywords. The availability of\n" | |
8547 |
" keywords depends on the exact context of the templater. These |
|
8620 | " keywords depends on the exact context of the templater. These\n" | |
8548 | " are usually available for templating a log-like command:\n" |
|
8621 | " keywords are usually available for templating a log-like command:\n" | |
8549 | "\n" |
|
8622 | "\n" | |
8550 | " - author: String. The unmodified author of the changeset.\n" |
|
8623 | " - author: String. The unmodified author of the changeset.\n" | |
8551 | " - branches: String. The name of the branch on which the changeset\n" |
|
8624 | " - branches: String. The name of the branch on which the changeset\n" | |
8552 | " was committed. Will be empty if the branch name was default.\n" |
|
8625 | " was committed. Will be empty if the branch name was default.\n" | |
8553 | " - date: Date information. The date when the changeset was committed.\n" |
|
8626 | " - date: Date information. The date when the changeset was committed.\n" | |
8554 | " - desc: String. The text of the changeset description.\n" |
|
8627 | " - desc: String. The text of the changeset description.\n" | |
8555 |
" - diffstat: String. Statistics of changes with the following |
|
8628 | " - diffstat: String. Statistics of changes with the following\n" | |
8556 | " \"modified files: +added/-removed lines\"\n" |
|
8629 | " format: \"modified files: +added/-removed lines\"\n" | |
8557 | " - files: List of strings. All files modified, added, or removed by\n" |
|
8630 | " - files: List of strings. All files modified, added, or removed by\n" | |
8558 | " this changeset.\n" |
|
8631 | " this changeset.\n" | |
8559 | " - file_adds: List of strings. Files added by this changeset.\n" |
|
8632 | " - file_adds: List of strings. Files added by this changeset.\n" | |
8560 | " - file_mods: List of strings. Files modified by this changeset.\n" |
|
8633 | " - file_mods: List of strings. Files modified by this changeset.\n" | |
8561 | " - file_dels: List of strings. Files removed by this changeset.\n" |
|
8634 | " - file_dels: List of strings. Files removed by this changeset.\n" | |
8562 |
" - node: String. The changeset identification hash, as a |
|
8635 | " - node: String. The changeset identification hash, as a\n" | |
8563 | " hexadecimal string.\n" |
|
8636 | " 40-character hexadecimal string.\n" | |
8564 | " - parents: List of strings. The parents of the changeset.\n" |
|
8637 | " - parents: List of strings. The parents of the changeset.\n" | |
8565 | " - rev: Integer. The repository-local changeset revision number.\n" |
|
8638 | " - rev: Integer. The repository-local changeset revision number.\n" | |
8566 | " - tags: List of strings. Any tags associated with the changeset.\n" |
|
8639 | " - tags: List of strings. Any tags associated with the changeset.\n" | |
8567 | "\n" |
|
8640 | "\n" | |
8568 | " The \"date\" keyword does not produce human-readable output. If you\n" |
|
8641 | " The \"date\" keyword does not produce human-readable output. If you\n" | |
8569 |
" want to use a date in your output, you can use a filter to process |
|
8642 | " want to use a date in your output, you can use a filter to process\n" | |
8570 |
" Filters are functions which return a string based on the input |
|
8643 | " it. Filters are functions which return a string based on the input\n" | |
8571 | "variable.\n" |
|
8644 | " variable. You can also use a chain of filters to get the desired\n" | |
8572 | " You can also use a chain of filters to get the desired output:\n" |
|
8645 | " output:\n" | |
8573 | "\n" |
|
8646 | "\n" | |
8574 | " $ hg tip --template \"{date|isodate}\\n\"\n" |
|
8647 | " $ hg tip --template \"{date|isodate}\\n\"\n" | |
8575 | " 2008-08-21 18:22 +0000\n" |
|
8648 | " 2008-08-21 18:22 +0000\n" | |
@@ -8587,11 +8660,11 b' msgid ""' | |||||
8587 | "\".\n" |
|
8660 | "\".\n" | |
8588 | " - date: Date. Returns a date in a Unix date format, including\n" |
|
8661 | " - date: Date. Returns a date in a Unix date format, including\n" | |
8589 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" |
|
8662 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" | |
8590 |
" - domain: Any text. Finds the first string that looks like an |
|
8663 | " - domain: Any text. Finds the first string that looks like an\n" | |
8591 | " address, and extracts just the domain component.\n" |
|
8664 | " email address, and extracts just the domain component.\n" | |
8592 | " Example: 'User <user@example.com>' becomes 'example.com'.\n" |
|
8665 | " Example: 'User <user@example.com>' becomes 'example.com'.\n" | |
8593 |
" - email: Any text. Extracts the first string that looks like an |
|
8666 | " - email: Any text. Extracts the first string that looks like an\n" | |
8594 | " address. Example: 'User <user@example.com>' becomes\n" |
|
8667 | " email address. Example: 'User <user@example.com>' becomes\n" | |
8595 | " 'user@example.com'.\n" |
|
8668 | " 'user@example.com'.\n" | |
8596 | " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" |
|
8669 | " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" | |
8597 | " \"<\" and \">\" with XML entities.\n" |
|
8670 | " \"<\" and \">\" with XML entities.\n" | |
@@ -8601,25 +8674,25 b' msgid ""' | |||||
8601 | " - hgdate: Date. Returns the date as a pair of numbers:\n" |
|
8674 | " - hgdate: Date. Returns the date as a pair of numbers:\n" | |
8602 | " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" |
|
8675 | " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" | |
8603 | " - isodate: Date. Returns the date in ISO 8601 format.\n" |
|
8676 | " - isodate: Date. Returns the date in ISO 8601 format.\n" | |
8604 |
" - obfuscate: Any text. Returns the input text rendered as a |
|
8677 | " - obfuscate: Any text. Returns the input text rendered as a\n" | |
8605 | " of XML entities.\n" |
|
8678 | " sequence of XML entities.\n" | |
8606 | " - person: Any text. Returns the text before an email address.\n" |
|
8679 | " - person: Any text. Returns the text before an email address.\n" | |
8607 | " - rfc822date: Date. Returns a date using the same format used\n" |
|
8680 | " - rfc822date: Date. Returns a date using the same format used\n" | |
8608 | " in email headers.\n" |
|
8681 | " in email headers.\n" | |
8609 |
" - short: Changeset hash. Returns the short form of a changeset |
|
8682 | " - short: Changeset hash. Returns the short form of a changeset\n" | |
8610 | " i.e. a 12-byte hexadecimal string.\n" |
|
8683 | " hash, i.e. a 12-byte hexadecimal string.\n" | |
8611 | " - shortdate: Date. Returns a date like \"2006-09-18\".\n" |
|
8684 | " - shortdate: Date. Returns a date like \"2006-09-18\".\n" | |
8612 | " - strip: Any text. Strips all leading and trailing whitespace.\n" |
|
8685 | " - strip: Any text. Strips all leading and trailing whitespace.\n" | |
8613 |
" - tabindent: Any text. Returns the text, with every line except |
|
8686 | " - tabindent: Any text. Returns the text, with every line except\n" | |
8614 | " first starting with a tab character.\n" |
|
8687 | " the first starting with a tab character.\n" | |
8615 |
" - urlescape: Any text. Escapes all \"special\" characters. For |
|
8688 | " - urlescape: Any text. Escapes all \"special\" characters. For\n" | |
8616 | " \"foo bar\" becomes \"foo%20bar\".\n" |
|
8689 | " example, \"foo bar\" becomes \"foo%20bar\".\n" | |
8617 | " - user: Any text. Returns the user portion of an email address.\n" |
|
8690 | " - user: Any text. Returns the user portion of an email address.\n" | |
8618 | " " |
|
8691 | " " | |
8619 | msgstr "" |
|
8692 | msgstr "" | |
8620 |
|
8693 | |||
8621 |
msgid "U |
|
8694 | msgid "URL Paths" | |
8622 |
msgstr "U |
|
8695 | msgstr "URL-Pfade" | |
8623 |
|
8696 | |||
8624 | msgid "" |
|
8697 | msgid "" | |
8625 | "\n" |
|
8698 | "\n" | |
@@ -8638,43 +8711,45 b' msgid ""' | |||||
8638 | " or changeset to use from the remote repository.\n" |
|
8711 | " or changeset to use from the remote repository.\n" | |
8639 | "\n" |
|
8712 | "\n" | |
8640 | " Some features, such as pushing to http:// and https:// URLs are\n" |
|
8713 | " Some features, such as pushing to http:// and https:// URLs are\n" | |
8641 | " only possible if the feature is explicitly enabled on the\n" |
|
8714 | " only possible if the feature is explicitly enabled on the remote\n" | |
8642 |
" |
|
8715 | " Mercurial server.\n" | |
8643 | "\n" |
|
8716 | "\n" | |
8644 | " Some notes about using SSH with Mercurial:\n" |
|
8717 | " Some notes about using SSH with Mercurial:\n" | |
8645 |
" - SSH requires an accessible shell account on the destination |
|
8718 | " - SSH requires an accessible shell account on the destination\n" | |
8646 |
" and a copy of hg in the remote path or specified with as |
|
8719 | " machine and a copy of hg in the remote path or specified with as\n" | |
|
8720 | " remotecmd.\n" | |||
8647 | " - path is relative to the remote user's home directory by default.\n" |
|
8721 | " - path is relative to the remote user's home directory by default.\n" | |
8648 | " Use an extra slash at the start of a path to specify an absolute " |
|
8722 | " Use an extra slash at the start of a path to specify an absolute " | |
8649 | "path:\n" |
|
8723 | "path:\n" | |
8650 | " ssh://example.com//tmp/repository\n" |
|
8724 | " ssh://example.com//tmp/repository\n" | |
8651 |
" - Mercurial doesn't use its own compression via SSH; the right |
|
8725 | " - Mercurial doesn't use its own compression via SSH; the right\n" | |
8652 | " to do is to configure it in your ~/.ssh/config, e.g.:\n" |
|
8726 | " thing to do is to configure it in your ~/.ssh/config, e.g.:\n" | |
8653 | " Host *.mylocalnetwork.example.com\n" |
|
8727 | " Host *.mylocalnetwork.example.com\n" | |
8654 | " Compression no\n" |
|
8728 | " Compression no\n" | |
8655 | " Host *\n" |
|
8729 | " Host *\n" | |
8656 | " Compression yes\n" |
|
8730 | " Compression yes\n" | |
8657 |
" Alternatively specify \"ssh -C\" as your ssh command in your hgrc |
|
8731 | " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" | |
8658 | " with the --ssh command line option.\n" |
|
8732 | " or with the --ssh command line option.\n" | |
8659 | "\n" |
|
8733 | "\n" | |
8660 |
" These |
|
8734 | " These URLs can all be stored in your hgrc with path aliases under\n" | |
8661 | " [paths] section like so:\n" |
|
8735 | " the [paths] section like so:\n" | |
8662 | " [paths]\n" |
|
8736 | " [paths]\n" | |
8663 | " alias1 = URL1\n" |
|
8737 | " alias1 = URL1\n" | |
8664 | " alias2 = URL2\n" |
|
8738 | " alias2 = URL2\n" | |
8665 | " ...\n" |
|
8739 | " ...\n" | |
8666 | "\n" |
|
8740 | "\n" | |
8667 |
" You can then use the alias for any command that uses a |
|
8741 | " You can then use the alias for any command that uses a URL (for\n" | |
8668 | " 'hg pull alias1' would pull from the 'alias1' path).\n" |
|
8742 | " example 'hg pull alias1' would pull from the 'alias1' path).\n" | |
8669 | "\n" |
|
8743 | "\n" | |
8670 | " Two path aliases are special because they are used as defaults\n" |
|
8744 | " Two path aliases are special because they are used as defaults\n" | |
8671 |
" when you do not provide the |
|
8745 | " when you do not provide the URL to a command:\n" | |
8672 | "\n" |
|
8746 | "\n" | |
8673 | " default:\n" |
|
8747 | " default:\n" | |
8674 |
" When you create a repository with hg clone, the clone command |
|
8748 | " When you create a repository with hg clone, the clone command\n" | |
8675 |
" the location of the source repository as the new |
|
8749 | " saves the location of the source repository as the new\n" | |
8676 |
" 'default' path. This is then used when you omit |
|
8750 | " repository's 'default' path. This is then used when you omit\n" | |
8677 |
" and pull-like commands (including in and |
|
8751 | " path from push- and pull-like commands (including incoming and\n" | |
|
8752 | " outgoing).\n" | |||
8678 | "\n" |
|
8753 | "\n" | |
8679 | " default-push:\n" |
|
8754 | " default-push:\n" | |
8680 | " The push command will look for a path named 'default-push', and\n" |
|
8755 | " The push command will look for a path named 'default-push', and\n" | |
@@ -8739,9 +8814,8 b' msgstr ""' | |||||
8739 | " Bei Erstellung eines Projektarchivs mit hg clone, sichert der clone\n" |
|
8814 | " Bei Erstellung eines Projektarchivs mit hg clone, sichert der clone\n" | |
8740 | " Befehl die Herkunft des Quellarchivs als 'default'-Pfad des neuen\n" |
|
8815 | " Befehl die Herkunft des Quellarchivs als 'default'-Pfad des neuen\n" | |
8741 | " Archivs. Dieser Pfad wird immer dann genutzt, wenn bei 'push' oder\n" |
|
8816 | " Archivs. Dieser Pfad wird immer dann genutzt, wenn bei 'push' oder\n" | |
8742 |
" 'pull'-ähnlichen Befehlen der Pfad nicht angegeben wurde (auch bei |
|
8817 | " 'pull'-ähnlichen Befehlen der Pfad nicht angegeben wurde (auch bei\n" | |
8743 | "'in'\n" |
|
8818 | " 'incoming' oder 'outgoing').\n" | |
8744 | " oder 'out').\n" |
|
|||
8745 | "\n" |
|
8819 | "\n" | |
8746 | " default-push:\n" |
|
8820 | " default-push:\n" | |
8747 | " Der 'push'-Befehl sucht nach dem 'default-push'-Alias und zieht\n" |
|
8821 | " Der 'push'-Befehl sucht nach dem 'default-push'-Alias und zieht\n" | |
@@ -9507,6 +9581,10 b' msgstr ""' | |||||
9507 | msgid "index %s unknown format %d" |
|
9581 | msgid "index %s unknown format %d" | |
9508 | msgstr "" |
|
9582 | msgstr "" | |
9509 |
|
9583 | |||
|
9584 | #, python-format | |||
|
9585 | msgid "index %s is corrupted" | |||
|
9586 | msgstr "" | |||
|
9587 | ||||
9510 | msgid "no node" |
|
9588 | msgid "no node" | |
9511 | msgstr "" |
|
9589 | msgstr "" | |
9512 |
|
9590 | |||
@@ -9710,10 +9788,6 b' msgid "http auth: user %s, password %s\\n' | |||||
9710 | msgstr "HTTP Auth: Benutzer %s, Passwort%s\n" |
|
9788 | msgstr "HTTP Auth: Benutzer %s, Passwort%s\n" | |
9711 |
|
9789 | |||
9712 | #, python-format |
|
9790 | #, python-format | |
9713 | msgid "%s, please check your locale settings" |
|
|||
9714 | msgstr "%s, bitte überprüfe deine locale Einstellungen" |
|
|||
9715 |
|
||||
9716 | #, python-format |
|
|||
9717 | msgid "command '%s' failed: %s" |
|
9791 | msgid "command '%s' failed: %s" | |
9718 | msgstr "Befehl '%s' fehlgeschlagen: %s" |
|
9792 | msgstr "Befehl '%s' fehlgeschlagen: %s" | |
9719 |
|
9793 |
General Comments 0
You need to be logged in to leave comments.
Login now