Show More
@@ -23,7 +23,7 b' msgid ""' | |||||
23 | msgstr "" |
|
23 | msgstr "" | |
24 | "Project-Id-Version: Mercurial\n" |
|
24 | "Project-Id-Version: Mercurial\n" | |
25 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
25 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
26 |
"POT-Creation-Date: 2009-1 |
|
26 | "POT-Creation-Date: 2009-11-02 16:48+0200\n" | |
27 | "PO-Revision-Date: 2009-10-20 18:09+0200\n" |
|
27 | "PO-Revision-Date: 2009-10-20 18:09+0200\n" | |
28 | "Last-Translator: Fabian Kreutz <fabian.kreutz@starnet.fi>\n" |
|
28 | "Last-Translator: Fabian Kreutz <fabian.kreutz@starnet.fi>\n" | |
29 | "Language-Team: German (Tobias Bell, Fabian Kreutz, Lutz Horn)\n" |
|
29 | "Language-Team: German (Tobias Bell, Fabian Kreutz, Lutz Horn)\n" | |
@@ -57,7 +57,6 b' msgstr ""' | |||||
57 | " Aliase: %s\n" |
|
57 | " Aliase: %s\n" | |
58 | "\n" |
|
58 | "\n" | |
59 |
|
59 | |||
60 | #: help/dates.txt:1 |
|
|||
61 | msgid "" |
|
60 | msgid "" | |
62 | "Some commands allow the user to specify a date, e.g.:\n" |
|
61 | "Some commands allow the user to specify a date, e.g.:\n" | |
63 | "\n" |
|
62 | "\n" | |
@@ -133,7 +132,6 b' msgstr ""' | |||||
133 | " \"{datetime} to {datetime}\" - ein Datumsbereich, inklusive\n" |
|
132 | " \"{datetime} to {datetime}\" - ein Datumsbereich, inklusive\n" | |
134 | " \"-{tage}\" - innerhalb der angegebenen Anzahl von Tagen vor heute\n" |
|
133 | " \"-{tage}\" - innerhalb der angegebenen Anzahl von Tagen vor heute\n" | |
135 |
|
134 | |||
136 | #: help/diffs.txt:1 |
|
|||
137 | msgid "" |
|
135 | msgid "" | |
138 | "Mercurial's default format for showing changes between two versions of\n" |
|
136 | "Mercurial's default format for showing changes between two versions of\n" | |
139 | "a file is compatible with the unified format of GNU diff, which can be\n" |
|
137 | "a file is compatible with the unified format of GNU diff, which can be\n" | |
@@ -166,7 +164,6 b' msgid ""' | |||||
166 | "importing diffs in this format or using them in the mq extension.\n" |
|
164 | "importing diffs in this format or using them in the mq extension.\n" | |
167 | msgstr "" |
|
165 | msgstr "" | |
168 |
|
166 | |||
169 | #: help/environment.txt:1 |
|
|||
170 | msgid "" |
|
167 | msgid "" | |
171 | "HG\n" |
|
168 | "HG\n" | |
172 | " Path to the 'hg' executable, automatically passed when running\n" |
|
169 | " Path to the 'hg' executable, automatically passed when running\n" | |
@@ -246,7 +243,6 b' msgid ""' | |||||
246 | " set appropriately if this Mercurial is not installed system-wide.\n" |
|
243 | " set appropriately if this Mercurial is not installed system-wide.\n" | |
247 | msgstr "" |
|
244 | msgstr "" | |
248 |
|
245 | |||
249 | #: help/extensions.txt:1 |
|
|||
250 | msgid "" |
|
246 | msgid "" | |
251 | "Mercurial has the ability to add new features through the use of\n" |
|
247 | "Mercurial has the ability to add new features through the use of\n" | |
252 | "extensions. Extensions may add new commands, add options to\n" |
|
248 | "extensions. Extensions may add new commands, add options to\n" | |
@@ -283,7 +279,6 b' msgid ""' | |||||
283 | " hgext.baz = !\n" |
|
279 | " hgext.baz = !\n" | |
284 | msgstr "" |
|
280 | msgstr "" | |
285 |
|
281 | |||
286 | #: help/multirevs.txt:1 |
|
|||
287 | msgid "" |
|
282 | msgid "" | |
288 | "When Mercurial accepts more than one revision, they may be specified\n" |
|
283 | "When Mercurial accepts more than one revision, they may be specified\n" | |
289 | "individually, or provided as a topologically continuous range,\n" |
|
284 | "individually, or provided as a topologically continuous range,\n" | |
@@ -316,7 +311,6 b' msgstr ""' | |||||
316 | "Bereich 3:5 die Revisionen 3, 4 und 5 enthält. Ebenso enthält der Bereich\n" |
|
311 | "Bereich 3:5 die Revisionen 3, 4 und 5 enthält. Ebenso enthält der Bereich\n" | |
317 | "9:6 die Revisionen 9, 8, 7 und 6.\n" |
|
312 | "9:6 die Revisionen 9, 8, 7 und 6.\n" | |
318 |
|
313 | |||
319 | #: help/patterns.txt:1 |
|
|||
320 | msgid "" |
|
314 | msgid "" | |
321 | "Mercurial accepts several notations for identifying one or more files\n" |
|
315 | "Mercurial accepts several notations for identifying one or more files\n" | |
322 | "at a time.\n" |
|
316 | "at a time.\n" | |
@@ -327,17 +321,17 b' msgid ""' | |||||
327 | "Alternate pattern notations must be specified explicitly.\n" |
|
321 | "Alternate pattern notations must be specified explicitly.\n" | |
328 | "\n" |
|
322 | "\n" | |
329 | "To use a plain path name without any pattern matching, start it with\n" |
|
323 | "To use a plain path name without any pattern matching, start it with\n" | |
330 |
" |
|
324 | "``path:``. These path names must completely match starting at the\n" | |
331 | "current repository root.\n" |
|
325 | "current repository root.\n" | |
332 | "\n" |
|
326 | "\n" | |
333 |
"To use an extended glob, start a name with |
|
327 | "To use an extended glob, start a name with ``glob:``. Globs are rooted\n" | |
334 |
"at the current directory; a glob such as |
|
328 | "at the current directory; a glob such as ``*.c`` will only match files\n" | |
335 |
" |
|
329 | "in the current directory ending with ``.c``.\n" | |
336 | "\n" |
|
330 | "\n" | |
337 |
"The supported glob syntax extensions are |
|
331 | "The supported glob syntax extensions are ``**`` to match any string\n" | |
338 |
"across path separators and |
|
332 | "across path separators and ``{a,b}`` to mean \"a or b\".\n" | |
339 | "\n" |
|
333 | "\n" | |
340 |
"To use a Perl/Python regular expression, start a name with |
|
334 | "To use a Perl/Python regular expression, start a name with ``re:``.\n" | |
341 | "Regexp pattern matching is anchored at the root of the repository.\n" |
|
335 | "Regexp pattern matching is anchored at the root of the repository.\n" | |
342 | "\n" |
|
336 | "\n" | |
343 | "Plain examples::\n" |
|
337 | "Plain examples::\n" | |
@@ -368,21 +362,21 b' msgstr ""' | |||||
368 | "\n" |
|
362 | "\n" | |
369 | "Andere Schreibweisen von Mustern müssen explizit angegeben werden.\n" |
|
363 | "Andere Schreibweisen von Mustern müssen explizit angegeben werden.\n" | |
370 | "\n" |
|
364 | "\n" | |
371 |
"Mit dem Prefix |
|
365 | "Mit dem Prefix ``path:`` wird ein Pfad relativ zur Wurzel des " | |
372 | "Projektarchivs\n" |
|
366 | "Projektarchivs\n" | |
373 | "ohne Mustererkennung angenommen.\n" |
|
367 | "ohne Mustererkennung angenommen.\n" | |
374 | "\n" |
|
368 | "\n" | |
375 |
"Für erweiterte Glob-Muster muss das Muster mit |
|
369 | "Für erweiterte Glob-Muster muss das Muster mit ``glob:`` beginnen. Globs\n" | |
376 |
"sind am aktuellen Verzeichnis verankert; ein Glob-Muster wie |
|
370 | "sind am aktuellen Verzeichnis verankert; ein Glob-Muster wie ````*.c````\n" | |
377 |
"stimmt nur mit Dateien im aktuellen Verzeichnis überein, die mit |
|
371 | "stimmt nur mit Dateien im aktuellen Verzeichnis überein, die mit ``.c``\n" | |
378 | "enden.\n" |
|
372 | "enden.\n" | |
379 | "\n" |
|
373 | "\n" | |
380 |
"Die unterstützen Erweiterungen der Glob-Syntax sind |
|
374 | "Die unterstützen Erweiterungen der Glob-Syntax sind ``**`` für\n" | |
381 |
"Zeichenketten über Pfadtrenner hinweg und |
|
375 | "Zeichenketten über Pfadtrenner hinweg und ``{a,b}`` in der Bedeutung \"a\n" | |
382 | "oder b\".\n" |
|
376 | "oder b\".\n" | |
383 | "\n" |
|
377 | "\n" | |
384 | "Zur Nutzung von regulären Ausdrücken (Perl/Python) beginne einen Namen mit\n" |
|
378 | "Zur Nutzung von regulären Ausdrücken (Perl/Python) beginne einen Namen mit\n" | |
385 |
" |
|
379 | "``re:``. Erkennung mit regulären Ausdrücken ist relativ zur Wurzel des\n" | |
386 | "Projektarchivs.\n" |
|
380 | "Projektarchivs.\n" | |
387 | "\n" |
|
381 | "\n" | |
388 | "Einfache Beispiele::\n" |
|
382 | "Einfache Beispiele::\n" | |
@@ -406,7 +400,6 b' msgstr ""' | |||||
406 | "\n" |
|
400 | "\n" | |
407 | " re:.*\\.c$ jeder Name endend mit \".c\" überall im Projektarchiv\n" |
|
401 | " re:.*\\.c$ jeder Name endend mit \".c\" überall im Projektarchiv\n" | |
408 |
|
402 | |||
409 | #: help/revisions.txt:1 |
|
|||
410 | msgid "" |
|
403 | msgid "" | |
411 | "Mercurial supports several ways to specify individual revisions.\n" |
|
404 | "Mercurial supports several ways to specify individual revisions.\n" | |
412 | "\n" |
|
405 | "\n" | |
@@ -466,7 +459,6 b' msgstr ""' | |||||
466 | "äquivalent zu \"null\". Falls eine nicht versionierte Zusammenführung\n" |
|
459 | "äquivalent zu \"null\". Falls eine nicht versionierte Zusammenführung\n" | |
467 | "in Bearbeitung ist, bezeichnet \".\" die Revision des ersten Vorgängers.\n" |
|
460 | "in Bearbeitung ist, bezeichnet \".\" die Revision des ersten Vorgängers.\n" | |
468 |
|
461 | |||
469 | #: help/templates.txt:1 |
|
|||
470 | msgid "" |
|
462 | msgid "" | |
471 | "Mercurial allows you to customize output of commands through\n" |
|
463 | "Mercurial allows you to customize output of commands through\n" | |
472 | "templates. You can either pass in a template from the command\n" |
|
464 | "templates. You can either pass in a template from the command\n" | |
@@ -583,7 +575,6 b' msgid ""' | |||||
583 | " address.\n" |
|
575 | " address.\n" | |
584 | msgstr "" |
|
576 | msgstr "" | |
585 |
|
577 | |||
586 | #: help/urls.txt:1 |
|
|||
587 | msgid "" |
|
578 | msgid "" | |
588 | "Valid URLs are of the form::\n" |
|
579 | "Valid URLs are of the form::\n" | |
589 | "\n" |
|
580 | "\n" | |
@@ -634,7 +625,7 b' msgid ""' | |||||
634 | " ...\n" |
|
625 | " ...\n" | |
635 | "\n" |
|
626 | "\n" | |
636 | "You can then use the alias for any command that uses a URL (for\n" |
|
627 | "You can then use the alias for any command that uses a URL (for\n" | |
637 |
"example 'hg pull alias1' w |
|
628 | "example 'hg pull alias1' will be treated as 'hg pull URL1').\n" | |
638 | "\n" |
|
629 | "\n" | |
639 | "Two path aliases are special because they are used as defaults when\n" |
|
630 | "Two path aliases are special because they are used as defaults when\n" | |
640 | "you do not provide the URL to a command:\n" |
|
631 | "you do not provide the URL to a command:\n" | |
@@ -701,7 +692,7 b' msgstr ""' | |||||
701 | " ...\n" |
|
692 | " ...\n" | |
702 | "\n" |
|
693 | "\n" | |
703 | "Diese Aliase können dann bei jedem Befehl genutzt werden der URLs nutzt\n" |
|
694 | "Diese Aliase können dann bei jedem Befehl genutzt werden der URLs nutzt\n" | |
704 |
"( |
|
695 | "(z.B. 'hg pull alias1' würde als 'hg pull URL1' gewertet werden).\n" | |
705 | "\n" |
|
696 | "\n" | |
706 | "Es gibt zwei besondere Pfad-Aliase, die standardmäßig genutzt\n" |
|
697 | "Es gibt zwei besondere Pfad-Aliase, die standardmäßig genutzt\n" | |
707 | "werden wenn einem Befehl keine URL übergeben wurde:\n" |
|
698 | "werden wenn einem Befehl keine URL übergeben wurde:\n" | |
@@ -1571,7 +1562,10 b' msgid ""' | |||||
1571 | " revision control system whose parents should be modified (same\n" |
|
1562 | " revision control system whose parents should be modified (same\n" | |
1572 | " format as a key in .hg/shamap). The values are the revision IDs\n" |
|
1563 | " format as a key in .hg/shamap). The values are the revision IDs\n" | |
1573 | " (in either the source or destination revision control system) that\n" |
|
1564 | " (in either the source or destination revision control system) that\n" | |
1574 | " should be used as the new parents for that node.\n" |
|
1565 | " should be used as the new parents for that node. For example, if\n" | |
|
1566 | " you have merged \"release-1.0\" into \"trunk\", then you should\n" | |||
|
1567 | " specify the revision on \"trunk\" as the first parent and the one on\n" | |||
|
1568 | " the \"release-1.0\" branch as the second.\n" | |||
1575 | "\n" |
|
1569 | "\n" | |
1576 | " The branchmap is a file that allows you to rename a branch when it is\n" |
|
1570 | " The branchmap is a file that allows you to rename a branch when it is\n" | |
1577 | " being brought in from whatever external repository. When used in\n" |
|
1571 | " being brought in from whatever external repository. When used in\n" | |
@@ -1782,8 +1776,10 b' msgstr ""' | |||||
1782 | " Revisions-ID des Quellarchivs, eine Leerstelle und eine oder (mit " |
|
1776 | " Revisions-ID des Quellarchivs, eine Leerstelle und eine oder (mit " | |
1783 | "Komma)\n" |
|
1777 | "Komma)\n" | |
1784 | " zwei Revisions-IDs, die als Vorfahren der ersten angenommen werden\n" |
|
1778 | " zwei Revisions-IDs, die als Vorfahren der ersten angenommen werden\n" | |
1785 | " sollen. Die Vorfahren-IDs können entweder im Format der Quelle oder des\n" |
|
1779 | " sollen. Wurde z.B. \"trunk\" mit \"release-1.0\" zusammengeführt, so\n" | |
1786 | " Ziels angegeben werden.\n" |
|
1780 | " sollte die Revision aus \"trunk\" als erster und die aus dem Zweig\n" | |
|
1781 | " \"release-1.0\" als zweiter Vorfahr angegeben werden. Die Vorfahren-IDs\n" | |||
|
1782 | " können entweder im Format der Quelle oder des Ziels angegeben werden.\n" | |||
1787 | "\n" |
|
1783 | "\n" | |
1788 | " Die Zweig-Abbildungsdatei erlaubt das Umbenennen von Zweigen. Zusammen\n" |
|
1784 | " Die Zweig-Abbildungsdatei erlaubt das Umbenennen von Zweigen. Zusammen\n" | |
1789 | " mit der Spleißdatei können so auch sehr unorganisierte Archive in\n" |
|
1785 | " mit der Spleißdatei können so auch sehr unorganisierte Archive in\n" | |
@@ -4417,11 +4413,11 b' msgstr ""' | |||||
4417 |
|
4413 | |||
4418 | #, python-format |
|
4414 | #, python-format | |
4419 | msgid "%s: %d new changesets" |
|
4415 | msgid "%s: %d new changesets" | |
4420 | msgstr "" |
|
4416 | msgstr "%s: %d neue Änderungssätze" | |
4421 |
|
4417 | |||
4422 | #, python-format |
|
4418 | #, python-format | |
4423 | msgid "notify: sending %d subscribers %d changes\n" |
|
4419 | msgid "notify: sending %d subscribers %d changes\n" | |
4424 | msgstr "" |
|
4420 | msgstr "notify: Sende %d Empfängern %d Änderungen\n" | |
4425 |
|
4421 | |||
4426 | #, python-format |
|
4422 | #, python-format | |
4427 | msgid "" |
|
4423 | msgid "" | |
@@ -4429,6 +4425,9 b' msgid ""' | |||||
4429 | "diffs (truncated from %d to %d lines):\n" |
|
4425 | "diffs (truncated from %d to %d lines):\n" | |
4430 | "\n" |
|
4426 | "\n" | |
4431 | msgstr "" |
|
4427 | msgstr "" | |
|
4428 | "\n" | |||
|
4429 | "Unterschiede (Ausschnitt von %d bis %d Zeilen):\n" | |||
|
4430 | "\n" | |||
4432 |
|
4431 | |||
4433 | #, python-format |
|
4432 | #, python-format | |
4434 | msgid "" |
|
4433 | msgid "" | |
@@ -4436,10 +4435,13 b' msgid ""' | |||||
4436 | "diffs (%d lines):\n" |
|
4435 | "diffs (%d lines):\n" | |
4437 | "\n" |
|
4436 | "\n" | |
4438 | msgstr "" |
|
4437 | msgstr "" | |
|
4438 | "\n" | |||
|
4439 | "Unterschiede (%d Zeilen):\n" | |||
|
4440 | "\n" | |||
4439 |
|
4441 | |||
4440 | #, python-format |
|
4442 | #, python-format | |
4441 | msgid "notify: suppressing notification for merge %d:%s\n" |
|
4443 | msgid "notify: suppressing notification for merge %d:%s\n" | |
4442 | msgstr "" |
|
4444 | msgstr "notify: unterdrücke Benachrichtigung über Zusammenführung %d:%s\n" | |
4443 |
|
4445 | |||
4444 | msgid "" |
|
4446 | msgid "" | |
4445 | "browse command output with an external pager\n" |
|
4447 | "browse command output with an external pager\n" | |
@@ -4561,14 +4563,18 b' msgid ""' | |||||
4561 | "hgrc(5) for details.\n" |
|
4563 | "hgrc(5) for details.\n" | |
4562 | msgstr "" |
|
4564 | msgstr "" | |
4563 |
|
4565 | |||
|
4566 | #, python-format | |||
|
4567 | msgid "%s Please enter a valid value" | |||
|
4568 | msgstr "%s Bitte einen gültigen Wert angeben" | |||
|
4569 | ||||
4564 | msgid "Please enter a valid value.\n" |
|
4570 | msgid "Please enter a valid value.\n" | |
4565 | msgstr "" |
|
4571 | msgstr "Bitte einen gültigen Wert angeben.\n" | |
4566 |
|
4572 | |||
4567 |
msgid "does the diffstat above look okay? |
|
4573 | msgid "does the diffstat above look okay?" | |
4568 | msgstr "" |
|
4574 | msgstr "Ist die obige diffstat-Ausgabe in Ordnung?" | |
4569 |
|
4575 | |||
4570 | msgid "diffstat rejected" |
|
4576 | msgid "diffstat rejected" | |
4571 | msgstr "" |
|
4577 | msgstr "diffstat abgelehnt" | |
4572 |
|
4578 | |||
4573 | msgid "" |
|
4579 | msgid "" | |
4574 | "send changesets by email\n" |
|
4580 | "send changesets by email\n" | |
@@ -6821,6 +6827,9 b' msgstr ""' | |||||
6821 | "Grundlegende Befehle:\n" |
|
6827 | "Grundlegende Befehle:\n" | |
6822 | "\n" |
|
6828 | "\n" | |
6823 |
|
6829 | |||
|
6830 | msgid "DEPRECATED" | |||
|
6831 | msgstr "VERALTET" | |||
|
6832 | ||||
6824 | msgid "" |
|
6833 | msgid "" | |
6825 | "\n" |
|
6834 | "\n" | |
6826 | "additional help topics:\n" |
|
6835 | "additional help topics:\n" | |
@@ -6864,7 +6873,8 b' msgstr ""' | |||||
6864 | msgid "" |
|
6873 | msgid "" | |
6865 | "import an ordered set of patches\n" |
|
6874 | "import an ordered set of patches\n" | |
6866 | "\n" |
|
6875 | "\n" | |
6867 |
" Import a list of patches and commit them individually |
|
6876 | " Import a list of patches and commit them individually (unless\n" | |
|
6877 | " --no-commit is specified).\n" | |||
6868 | "\n" |
|
6878 | "\n" | |
6869 | " If there are outstanding changes in the working directory, import\n" |
|
6879 | " If there are outstanding changes in the working directory, import\n" | |
6870 | " will abort unless given the -f/--force flag.\n" |
|
6880 | " will abort unless given the -f/--force flag.\n" | |
@@ -7471,7 +7481,7 b' msgstr ""' | |||||
7471 | msgid "" |
|
7481 | msgid "" | |
7472 | "retry file merges from a merge or update\n" |
|
7482 | "retry file merges from a merge or update\n" | |
7473 | "\n" |
|
7483 | "\n" | |
7474 |
" This command |
|
7484 | " This command can cleanly retry unresolved file merges using file\n" | |
7475 | " revisions preserved from the last update or merge. To attempt to\n" |
|
7485 | " revisions preserved from the last update or merge. To attempt to\n" | |
7476 | " resolve all unresolved files, use the -a/--all switch.\n" |
|
7486 | " resolve all unresolved files, use the -a/--all switch.\n" | |
7477 | "\n" |
|
7487 | "\n" | |
@@ -7787,8 +7797,17 b' msgid ""' | |||||
7787 | "\n" |
|
7797 | "\n" | |
7788 | " This generates a brief summary of the working directory state,\n" |
|
7798 | " This generates a brief summary of the working directory state,\n" | |
7789 | " including parents, branch, commit status, and available updates.\n" |
|
7799 | " including parents, branch, commit status, and available updates.\n" | |
7790 | " " |
|
7800 | "\n" | |
7791 | msgstr "" |
|
7801 | " With the --remote option, this will check the default paths for\n" | |
|
7802 | " incoming and outgoing changes. This can be time-consuming.\n" | |||
|
7803 | " " | |||
|
7804 | msgstr "" | |||
|
7805 | ||||
|
7806 | msgid " (empty repository)" | |||
|
7807 | msgstr " (leeres Archiv)" | |||
|
7808 | ||||
|
7809 | msgid " (no revision checked out)" | |||
|
7810 | msgstr " (keine Revision geladen)" | |||
7792 |
|
7811 | |||
7793 | #, python-format |
|
7812 | #, python-format | |
7794 | msgid "parent: %d:%s %s\n" |
|
7813 | msgid "parent: %d:%s %s\n" | |
@@ -7798,10 +7817,33 b' msgstr "Vorg\xc3\xa4nger: %d:%s %s\\n"' | |||||
7798 | msgid "branch: %s\n" |
|
7817 | msgid "branch: %s\n" | |
7799 | msgstr "Zweig: %s\n" |
|
7818 | msgstr "Zweig: %s\n" | |
7800 |
|
7819 | |||
7801 | msgid "modified added removed deleted unknown ignored unresolved" |
|
7820 | #, python-format | |
7802 | msgstr "" |
|
7821 | msgid "%d added" | |
7803 | "verändert hinzugefügt entfernt verschwunden unbekannt ignoriert " |
|
7822 | msgstr "%d hinzugefügt" | |
7804 | "konfliktbehaftet" |
|
7823 | ||
|
7824 | #, python-format | |||
|
7825 | msgid "%d modified" | |||
|
7826 | msgstr "%d modifiziert" | |||
|
7827 | ||||
|
7828 | #, python-format | |||
|
7829 | msgid "%d removed" | |||
|
7830 | msgstr "%d entfernt" | |||
|
7831 | ||||
|
7832 | #, python-format | |||
|
7833 | msgid "%d deleted" | |||
|
7834 | msgstr "%d gelöscht" | |||
|
7835 | ||||
|
7836 | #, python-format | |||
|
7837 | msgid "%d ignored" | |||
|
7838 | msgstr "%d ignoriert" | |||
|
7839 | ||||
|
7840 | #, python-format | |||
|
7841 | msgid "%d unknown" | |||
|
7842 | msgstr "%d unbekannt" | |||
|
7843 | ||||
|
7844 | #, python-format | |||
|
7845 | msgid "%d unresolved" | |||
|
7846 | msgstr "%d konfliktbehaftet" | |||
7805 |
|
7847 | |||
7806 | msgid " (merge)" |
|
7848 | msgid " (merge)" | |
7807 | msgstr "(Zusammenführung)" |
|
7849 | msgstr "(Zusammenführung)" | |
@@ -7831,6 +7873,20 b' msgid "update: %d new changesets, %d bra' | |||||
7831 | msgstr "" |
|
7873 | msgstr "" | |
7832 | "Aktualisiere: %d neue Änderungssätze, %d neue Zweigköpfe (Zusammenführung)\n" |
|
7874 | "Aktualisiere: %d neue Änderungssätze, %d neue Zweigköpfe (Zusammenführung)\n" | |
7833 |
|
7875 | |||
|
7876 | msgid "1 or more incoming" | |||
|
7877 | msgstr "" | |||
|
7878 | ||||
|
7879 | #, python-format | |||
|
7880 | msgid "%d outgoing" | |||
|
7881 | msgstr "" | |||
|
7882 | ||||
|
7883 | #, python-format | |||
|
7884 | msgid "remote: %s\n" | |||
|
7885 | msgstr "Entfernt: %s\n" | |||
|
7886 | ||||
|
7887 | msgid "remote: (synced)\n" | |||
|
7888 | msgstr "Entfernt: (synchonisiert)\n" | |||
|
7889 | ||||
7834 | msgid "" |
|
7890 | msgid "" | |
7835 | "add one or more tags for the current or given revision\n" |
|
7891 | "add one or more tags for the current or given revision\n" | |
7836 | "\n" |
|
7892 | "\n" | |
@@ -8165,6 +8221,9 b' msgstr "Ignoriert \xc3\x84nderungen, die nur aus Leerzeilen bestehen"' | |||||
8165 | msgid "number of lines of context to show" |
|
8221 | msgid "number of lines of context to show" | |
8166 | msgstr "Anzahl der anzuzeigenden Kontextzeilen" |
|
8222 | msgstr "Anzahl der anzuzeigenden Kontextzeilen" | |
8167 |
|
8223 | |||
|
8224 | msgid "output diffstat-style summary of changes" | |||
|
8225 | msgstr "Zusammenfassung der Änderungen im diffstat-Stil" | |||
|
8226 | ||||
8168 | msgid "guess renamed files by similarity (0<=s<=100)" |
|
8227 | msgid "guess renamed files by similarity (0<=s<=100)" | |
8169 | msgstr "Bewertet ähnliche Dateien (0<=s<=100) als Umbenennung" |
|
8228 | msgstr "Bewertet ähnliche Dateien (0<=s<=100) als Umbenennung" | |
8170 |
|
8229 | |||
@@ -8465,8 +8524,8 b' msgstr "Zeigt neuste \xc3\x84nderung zuerst"' | |||||
8465 | msgid "file to store the bundles into" |
|
8524 | msgid "file to store the bundles into" | |
8466 | msgstr "Dateiname zum Zwischenspeichern" |
|
8525 | msgstr "Dateiname zum Zwischenspeichern" | |
8467 |
|
8526 | |||
8468 | msgid "a specific revision up to which you would like to pull" |
|
8527 | msgid "a specific remote revision up to which you would like to pull" | |
8469 | msgstr "eine bestimmte Revision bis zu der geholt werden soll" |
|
8528 | msgstr "eine bestimmte enfernte Revision bis zu der geholt werden soll" | |
8470 |
|
8529 | |||
8471 | msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" |
|
8530 | msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" | |
8472 | msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle DATEINAME] [QUELLE]" |
|
8531 | msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle DATEINAME] [QUELLE]" | |
@@ -8585,6 +8644,9 b' msgstr "Markiert eine Datei als konflikt' | |||||
8585 | msgid "unmark files as resolved" |
|
8644 | msgid "unmark files as resolved" | |
8586 | msgstr "Markiert eine Datei als konfliktbehaftet" |
|
8645 | msgstr "Markiert eine Datei als konfliktbehaftet" | |
8587 |
|
8646 | |||
|
8647 | msgid "hide status prefix" | |||
|
8648 | msgstr "Verdeckt den Status-Präfix" | |||
|
8649 | ||||
8588 | msgid "revert all changes when no arguments given" |
|
8650 | msgid "revert all changes when no arguments given" | |
8589 | msgstr "Nimmt alle lokalen Änderungen zurück (ohne andere Parameter)" |
|
8651 | msgstr "Nimmt alle lokalen Änderungen zurück (ohne andere Parameter)" | |
8590 |
|
8652 | |||
@@ -8643,6 +8705,9 b' msgstr ""' | |||||
8643 | msgid "[-u] [NAME]..." |
|
8705 | msgid "[-u] [NAME]..." | |
8644 | msgstr "" |
|
8706 | msgstr "" | |
8645 |
|
8707 | |||
|
8708 | msgid "check for push and pull" | |||
|
8709 | msgstr "" | |||
|
8710 | ||||
8646 | msgid "show status of all files" |
|
8711 | msgid "show status of all files" | |
8647 | msgstr "Zeigt den Status aller Dateien" |
|
8712 | msgstr "Zeigt den Status aller Dateien" | |
8648 |
|
8713 | |||
@@ -8667,9 +8732,6 b' msgstr "Zeigt nur unbekannte (nicht \xc3\xbcberwachte) Dateien"' | |||||
8667 | msgid "show only ignored files" |
|
8732 | msgid "show only ignored files" | |
8668 | msgstr "Zeigt nur ignorierte Dateien" |
|
8733 | msgstr "Zeigt nur ignorierte Dateien" | |
8669 |
|
8734 | |||
8670 | msgid "hide status prefix" |
|
|||
8671 | msgstr "Verdeckt den Status-Präfix" |
|
|||
8672 |
|
||||
8673 | msgid "show source of copied files" |
|
8735 | msgid "show source of copied files" | |
8674 | msgstr "Zeigt die Quelle von kopierten Dateien" |
|
8736 | msgstr "Zeigt die Quelle von kopierten Dateien" | |
8675 |
|
8737 | |||
@@ -9044,6 +9106,10 b' msgid "clone from remote to remote not s' | |||||
9044 | msgstr "Klonen von entferntem Archiv zu entferntem Archiv nicht möglich" |
|
9106 | msgstr "Klonen von entferntem Archiv zu entferntem Archiv nicht möglich" | |
9045 |
|
9107 | |||
9046 | #, python-format |
|
9108 | #, python-format | |
|
9109 | msgid "updating to branch %s\n" | |||
|
9110 | msgstr "Aktualisiere auf Zweig %s\n" | |||
|
9111 | ||||
|
9112 | #, python-format | |||
9047 | msgid "" |
|
9113 | msgid "" | |
9048 | "%d files updated, %d files merged, %d files removed, %d files unresolved\n" |
|
9114 | "%d files updated, %d files merged, %d files removed, %d files unresolved\n" | |
9049 | msgstr "" |
|
9115 | msgstr "" | |
@@ -9799,7 +9865,8 b' msgid "template file %s: %s"' | |||||
9799 | msgstr "Vorlagedatei %s: %s" |
|
9865 | msgstr "Vorlagedatei %s: %s" | |
9800 |
|
9866 | |||
9801 | msgid "cannot use transaction when it is already committed/aborted" |
|
9867 | msgid "cannot use transaction when it is already committed/aborted" | |
9802 | msgstr "Kann Transaktion nicht verwenden, wenn sie bereits Übernommen/Abgebrochen ist" |
|
9868 | msgstr "" | |
|
9869 | "Kann Transaktion nicht verwenden, wenn sie bereits Übernommen/Abgebrochen ist" | |||
9803 |
|
9870 | |||
9804 | #, python-format |
|
9871 | #, python-format | |
9805 | msgid "failed to truncate %s\n" |
|
9872 | msgid "failed to truncate %s\n" |
General Comments 0
You need to be logged in to leave comments.
Login now