Show More
This diff has been collapsed as it changes many lines, (1251 lines changed) Show them Hide them | |||
@@ -20,7 +20,7 b' msgid ""' | |||
|
20 | 20 | msgstr "" |
|
21 | 21 | "Project-Id-Version: Mercurial\n" |
|
22 | 22 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
23 |
"POT-Creation-Date: 201 |
|
|
23 | "POT-Creation-Date: 2014-01-25 17:51+0100\n" | |
|
24 | 24 | "PO-Revision-Date: 2013-09-30 20:52+0100\n" |
|
25 | 25 | "Last-Translator: Martin Schröder <martin.schroeder@nerdluecht.de>\n" |
|
26 | 26 | "Language-Team: \n" |
@@ -31,6 +31,9 b' msgstr ""' | |||
|
31 | 31 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
|
32 | 32 | "X-Generator: Poedit 1.5.4\n" |
|
33 | 33 | |
|
34 | msgid "VALUE" | |
|
35 | msgstr "WERT" | |
|
36 | ||
|
34 | 37 | #, python-format |
|
35 | 38 | msgid " (default: %s)" |
|
36 | 39 | msgstr " (Voreinstellung: %s)" |
@@ -38,6 +41,13 b' msgstr " (Voreinstellung: %s)"' | |||
|
38 | 41 | msgid "Options" |
|
39 | 42 | msgstr "Optionen" |
|
40 | 43 | |
|
44 | msgid "" | |
|
45 | "\n" | |
|
46 | "[+] marked option can be specified multiple times\n" | |
|
47 | msgstr "" | |
|
48 | "\n" | |
|
49 | "Mit [+] markierte Optionen können mehrfach angegeben werden\n" | |
|
50 | ||
|
41 | 51 | msgid "Commands" |
|
42 | 52 | msgstr "Befehle" |
|
43 | 53 | |
@@ -1260,30 +1270,34 b' msgstr ""' | |||
|
1260 | 1270 | msgid " Examples::" |
|
1261 | 1271 | msgstr " Beispiele::" |
|
1262 | 1272 | |
|
1273 | #, fuzzy | |
|
1263 | 1274 | msgid "" |
|
1264 | 1275 | " # display count of changed lines for every committer\n" |
|
1265 |
" hg churn -t |
|
|
1276 | " hg churn -t \"{author|email}\"" | |
|
1266 | 1277 | msgstr "" |
|
1267 | 1278 | " # Zeigt Anzahl der veränderten Zeilen pro Autor\n" |
|
1268 | 1279 | " hg churn -t '{author|email}'" |
|
1269 | 1280 | |
|
1281 | #, fuzzy | |
|
1270 | 1282 | msgid "" |
|
1271 | 1283 | " # display daily activity graph\n" |
|
1272 |
" hg churn -f |
|
|
1284 | " hg churn -f \"%H\" -s -c" | |
|
1273 | 1285 | msgstr "" |
|
1274 | 1286 | " # Zeigt Aktivität im Tagesverlauf (Gruppiert nach Stunde)\n" |
|
1275 | 1287 | " hg churn -f '%H' -s -c" |
|
1276 | 1288 | |
|
1289 | #, fuzzy | |
|
1277 | 1290 | msgid "" |
|
1278 | 1291 | " # display activity of developers by month\n" |
|
1279 |
" hg churn -f |
|
|
1292 | " hg churn -f \"%Y-%m\" -s -c" | |
|
1280 | 1293 | msgstr "" |
|
1281 | 1294 | " # Zeigt Aktivität pro Monat\n" |
|
1282 | 1295 | " hg churn -f '%Y-%m' -s -c" |
|
1283 | 1296 | |
|
1297 | #, fuzzy | |
|
1284 | 1298 | msgid "" |
|
1285 | 1299 | " # display count of lines changed in every year\n" |
|
1286 |
" hg churn -f |
|
|
1300 | " hg churn -f \"%Y\" -s" | |
|
1287 | 1301 | msgstr "" |
|
1288 | 1302 | " # Zeigt Anzahl der veränderten Zeilen über die Jahre\n" |
|
1289 | 1303 | " hg churn -f '%Y' -s" |
@@ -1477,6 +1491,12 b' msgstr ""' | |||
|
1477 | 1491 | " resolve.unresolved = red bold\n" |
|
1478 | 1492 | " resolve.resolved = green bold" |
|
1479 | 1493 | |
|
1494 | msgid "" | |
|
1495 | " shelve.age = cyan\n" | |
|
1496 | " shelve.newest = green bold\n" | |
|
1497 | " shelve.name = blue bold" | |
|
1498 | msgstr "" | |
|
1499 | ||
|
1480 | 1500 | msgid " histedit.remaining = red bold" |
|
1481 | 1501 | msgstr "" |
|
1482 | 1502 | |
@@ -1890,11 +1910,8 b' msgstr ""' | |||
|
1890 | 1910 | " und hat die Voreinstellung False." |
|
1891 | 1911 | |
|
1892 | 1912 | msgid "" |
|
1893 |
" :convert.hg. |
|
|
1894 | " It takes a hg revision identifier and defaults to 0." | |
|
1895 | msgstr "" | |
|
1896 | " :convert.hg.startrev: Konvertiere Start Revision und ihre Decendants.\n" | |
|
1897 | " Erwartet eine hg-Revisions-ID, standardmäßig 0." | |
|
1913 | " :convert.hg.revs: revset specifying the source revisions to convert." | |
|
1914 | msgstr "" | |
|
1898 | 1915 | |
|
1899 | 1916 | #, fuzzy |
|
1900 | 1917 | msgid "" |
@@ -2192,7 +2209,8 b' msgstr "Quellarchivtyp"' | |||
|
2192 | 2209 | msgid "destination repository type" |
|
2193 | 2210 | msgstr "Zielarchivtyp" |
|
2194 | 2211 | |
|
2195 | msgid "import up to target revision REV" | |
|
2212 | #, fuzzy | |
|
2213 | msgid "import up to source revision REV" | |
|
2196 | 2214 | msgstr "Importiere bis einschließlich Revision REV" |
|
2197 | 2215 | |
|
2198 | 2216 | msgid "remap usernames using this file" |
@@ -2573,6 +2591,10 b' msgstr "%s:%d: Unbekannte Direktive %r\\n' | |||
|
2573 | 2591 | msgid "source repository doesn't support --filemap" |
|
2574 | 2592 | msgstr "Quellarchiv unterstützt die Option --filemap nicht" |
|
2575 | 2593 | |
|
2594 | #, fuzzy, python-format | |
|
2595 | msgid "warning: %s parent %s is missing\n" | |
|
2596 | msgstr "Änderungssatz %s: %s fehlt\n" | |
|
2597 | ||
|
2576 | 2598 | #, python-format |
|
2577 | 2599 | msgid "%s does not look like a Git repository" |
|
2578 | 2600 | msgstr "%s scheint kein git-Archiv zu sein" |
@@ -2654,6 +2676,9 b' msgstr ""' | |||
|
2654 | 2676 | msgid "%s is not a valid start revision" |
|
2655 | 2677 | msgstr "%s ist keine gültige Startrevision" |
|
2656 | 2678 | |
|
2679 | msgid "hg.revs cannot be combined with hg.startrev or --rev" | |
|
2680 | msgstr "" | |
|
2681 | ||
|
2657 | 2682 | #, python-format |
|
2658 | 2683 | msgid "ignoring: %s\n" |
|
2659 | 2684 | msgstr "Ignoriere: %s\n" |
@@ -2938,8 +2963,11 b' msgstr ""' | |||
|
2938 | 2963 | " [repository]\n" |
|
2939 | 2964 | " native = LF" |
|
2940 | 2965 | |
|
2941 | msgid "" | |
|
2942 | ".. note::\n" | |
|
2966 | msgid ".. note::" | |
|
2967 | msgstr "" | |
|
2968 | ||
|
2969 | #, fuzzy | |
|
2970 | msgid "" | |
|
2943 | 2971 | " The rules will first apply when files are touched in the working\n" |
|
2944 | 2972 | " copy, e.g. by updating to null and back to tip to touch all files." |
|
2945 | 2973 | msgstr "" |
@@ -3549,10 +3577,16 b' msgstr ""' | |||
|
3549 | 3577 | msgid "unknown signature version" |
|
3550 | 3578 | msgstr "Unbekannte Version der Signatur" |
|
3551 | 3579 | |
|
3552 | msgid "command to view revision graphs from a shell" | |
|
3580 | #, fuzzy | |
|
3581 | msgid "command to view revision graphs from a shell (DEPRECATED)" | |
|
3553 | 3582 | msgstr "Befehl zum Anzeigen eines Revisionsgraphs auf dem Terminal" |
|
3554 | 3583 | |
|
3555 | 3584 | msgid "" |
|
3585 | "The functionality of this extension has been include in core Mercurial\n" | |
|
3586 | "since version 2.3." | |
|
3587 | msgstr "" | |
|
3588 | ||
|
3589 | msgid "" | |
|
3556 | 3590 | "This extension adds a --graph option to the incoming, outgoing and log\n" |
|
3557 | 3591 | "commands. When this options is given, an ASCII representation of the\n" |
|
3558 | 3592 | "revision graph is also shown.\n" |
@@ -4103,6 +4137,13 b' msgstr "Vergleiche mit %s\\n"' | |||
|
4103 | 4137 | msgid "no outgoing ancestors" |
|
4104 | 4138 | msgstr "%d ausgehende Lesezeichen" |
|
4105 | 4139 | |
|
4140 | msgid "there are ambiguous outgoing revisions" | |
|
4141 | msgstr "" | |
|
4142 | ||
|
4143 | #, fuzzy | |
|
4144 | msgid "see \"hg help histedit\" for more detail" | |
|
4145 | msgstr "siehe \"hg help phases\" für Details" | |
|
4146 | ||
|
4106 | 4147 | #, fuzzy |
|
4107 | 4148 | msgid "Read history edits from the specified file." |
|
4108 | 4149 | msgstr "Verschiebe angefangen vom gegebenen Änderungssatz" |
@@ -4144,10 +4185,33 b' msgid ""' | |||
|
4144 | 4185 | msgstr "" |
|
4145 | 4186 | " - Alle Änderungssätze, die Vorfahren des Arbeitsverzeichnisses sind::" |
|
4146 | 4187 | |
|
4188 | #, fuzzy | |
|
4147 | 4189 | msgid "" |
|
4148 | 4190 | " With --outgoing, this edits changesets not found in the\n" |
|
4149 | 4191 | " destination repository. If URL of the destination is omitted, the\n" |
|
4150 |
" 'default-push' (or 'default') path will be used. |
|
|
4192 | " 'default-push' (or 'default') path will be used." | |
|
4193 | msgstr "" | |
|
4194 | " Zeigt alle Änderungssätze des lokalen Archivs, die nicht im angegebenen\n" | |
|
4195 | " Zielarchiv oder dem Standardziel vorhanden sind. Dies sind genau jene,\n" | |
|
4196 | " die durch ein 'hg push' übertragen werden würden." | |
|
4197 | ||
|
4198 | msgid "" | |
|
4199 | " For safety, this command is aborted, also if there are ambiguous\n" | |
|
4200 | " outgoing revisions which may confuse users: for example, there are\n" | |
|
4201 | " multiple branches containing outgoing revisions." | |
|
4202 | msgstr "" | |
|
4203 | ||
|
4204 | msgid "" | |
|
4205 | " Use \"min(outgoing() and ::.)\" or similar revset specification\n" | |
|
4206 | " instead of --outgoing to specify edit target revision exactly in\n" | |
|
4207 | " such ambiguous situation. See :hg:`help revsets` for detail about\n" | |
|
4208 | " selecting revisions." | |
|
4209 | msgstr "" | |
|
4210 | ||
|
4211 | msgid "" | |
|
4212 | " Returns 0 on success, 1 if user intervention is required (not only\n" | |
|
4213 | " for intentional \"edit\" command, but also for resolving unexpected\n" | |
|
4214 | " conflicts).\n" | |
|
4151 | 4215 | " " |
|
4152 | 4216 | msgstr "" |
|
4153 | 4217 | |
@@ -4181,8 +4245,7 b' msgid "%s is not an ancestor of working ' | |||
|
4181 | 4245 | msgstr "" |
|
4182 | 4246 | " - Alle Änderungssätze, die Vorfahren des Arbeitsverzeichnisses sind::" |
|
4183 | 4247 | |
|
4184 | #, python-format | |
|
4185 | msgid "update to %s or descendant and run \"hg histedit --continue\" again" | |
|
4248 | msgid "use \"histedit --abort\" to clear broken state" | |
|
4186 | 4249 | msgstr "" |
|
4187 | 4250 | |
|
4188 | 4251 | msgid "cannot edit history that would orphan nodes" |
@@ -4504,8 +4567,8 b' msgstr ""' | |||
|
4504 | 4567 | " # bevorzugt SVN- oder CVS-artige Standard-Platzhalterzuweisungen\n" |
|
4505 | 4568 | " svn = True" |
|
4506 | 4569 | |
|
4507 | msgid "" | |
|
4508 | ".. note::\n" | |
|
4570 | #, fuzzy | |
|
4571 | msgid "" | |
|
4509 | 4572 | " The more specific you are in your filename patterns the less you\n" |
|
4510 | 4573 | " lose speed in huge repositories." |
|
4511 | 4574 | msgstr "" |
@@ -5244,37 +5307,32 b' msgstr "Entferne %s\\n"' | |||
|
5244 | 5307 | msgid "--normal cannot be used with --large" |
|
5245 | 5308 | msgstr "--normal kann nicht zusammen mit --large verwendet werden" |
|
5246 | 5309 | |
|
5247 | msgid "uncommitted local changes" | |
|
5310 | #, fuzzy | |
|
5311 | msgid "uncommitted changes" | |
|
5248 | 5312 | msgstr "Ausstehende nicht versionierte Änderungen" |
|
5249 | 5313 | |
|
5250 | 5314 | #, fuzzy, python-format |
|
5251 | 5315 | msgid "" |
|
5252 |
" |
|
|
5253 |
"use (l)argefile or keep |
|
|
5316 | "remote turned local normal file %s into a largefile\n" | |
|
5317 | "use (l)argefile or keep (n)ormal file?$$ &Largefile $$ &Normal file" | |
|
5254 | 5318 | msgstr "" |
|
5255 | 5319 | "%s wurde in einen Binärriesen umgewandelt.\n" |
|
5256 | 5320 | "Nutze als (B)inärriese oder als (n)ormale Datei?" |
|
5257 | 5321 | |
|
5258 | 5322 | #, fuzzy, python-format |
|
5259 | 5323 | msgid "" |
|
5260 |
" |
|
|
5261 |
"keep |
|
|
5324 | "remote turned local largefile %s into a normal file\n" | |
|
5325 | "keep (l)argefile or use (n)ormal file?$$ &Largefile $$ &Normal file" | |
|
5262 | 5326 | msgstr "" |
|
5263 | 5327 | "%s wurde in eine normale Datei umgewandelt.\n" |
|
5264 | 5328 | "Nutze als (B)inärriese oder als (n)ormale Datei?" |
|
5265 | 5329 | |
|
5266 | #, python-format | |
|
5267 | msgid "merging %s and %s to %s\n" | |
|
5268 | msgstr "Führe %s und %s zusammen zu %s\n" | |
|
5269 | ||
|
5270 | #, python-format | |
|
5271 | msgid "merging %s\n" | |
|
5272 | msgstr "Führe %s zusammen\n" | |
|
5273 | ||
|
5274 | 5330 | #, fuzzy, python-format |
|
5275 | 5331 | msgid "" |
|
5276 | 5332 | "largefile %s has a merge conflict\n" |
|
5277 | "keep (l)ocal or take (o)ther?$$ &Local $$ &Other" | |
|
5333 | "ancestor was %s\n" | |
|
5334 | "keep (l)ocal %s or\n" | |
|
5335 | "take (o)ther %s?$$ &Local $$ &Other" | |
|
5278 | 5336 | msgstr "" |
|
5279 | 5337 | "Zusammenführung führt zu Konflikt im Binärriesen %s\n" |
|
5280 | 5338 | "(l)okale Version, oder (a)ndere verwenden?" |
@@ -5341,8 +5399,8 b' msgstr ""' | |||
|
5341 | 5399 | msgid "largefile contents do not match hash" |
|
5342 | 5400 | msgstr "Inhalt des Binärriesen passt nicht auf Prüfsumme" |
|
5343 | 5401 | |
|
5344 | #, python-format | |
|
5345 | msgid "largefiles: failed to put %s into store: %s" | |
|
5402 | #, fuzzy, python-format | |
|
5403 | msgid "largefiles: failed to put %s into store: %s\n" | |
|
5346 | 5404 | msgstr "largefiles: Konnte %s nicht in einlagern: %s" |
|
5347 | 5405 | |
|
5348 | 5406 | #, python-format |
@@ -5352,8 +5410,8 b' msgstr "Angeforderer Bin\xc3\xa4rriese %s ist nicht im Zwischenspeicher"' | |||
|
5352 | 5410 | msgid "remote: " |
|
5353 | 5411 | msgstr "Gegenseite: " |
|
5354 | 5412 | |
|
5355 | #, python-format | |
|
5356 |
msgid "unexpected putlfile response: % |
|
|
5413 | #, fuzzy, python-format | |
|
5414 | msgid "unexpected putlfile response: %r\n" | |
|
5357 | 5415 | msgstr "Unerwartete Antwort von putlfile: %s" |
|
5358 | 5416 | |
|
5359 | 5417 | msgid "putlfile failed:" |
@@ -5369,8 +5427,8 b' msgstr "Unerwartete Antwort:"' | |||
|
5369 | 5427 | msgid "remotestore: could not put %s to remote store %s" |
|
5370 | 5428 | msgstr "remotestore: Konnte %s nicht ins entfernte Lager %s packen" |
|
5371 | 5429 | |
|
5372 | #, python-format | |
|
5373 | msgid "remotestore: put %s to remote store %s" | |
|
5430 | #, fuzzy, python-format | |
|
5431 | msgid "remotestore: put %s to remote store %s\n" | |
|
5374 | 5432 | msgstr "remotestore: %s ins entfernte Lager %s gepackt" |
|
5375 | 5433 | |
|
5376 | 5434 | #, python-format |
@@ -5385,6 +5443,10 b' msgstr "\xc3\x84nderungssatz %s: %s: Unterschiedliche Inhalte\\n"' | |||
|
5385 | 5443 | msgid "changeset %s: %s missing\n" |
|
5386 | 5444 | msgstr "Änderungssatz %s: %s fehlt\n" |
|
5387 | 5445 | |
|
5446 | #, fuzzy, python-format | |
|
5447 | msgid "required features are not supported in the destination: %s" | |
|
5448 | msgstr "Zeigt Änderungssätze, die nicht im Zielarchiv sind" | |
|
5449 | ||
|
5388 | 5450 | #, python-format |
|
5389 | 5451 | msgid "file \"%s\" is a largefile standin" |
|
5390 | 5452 | msgstr "Datei \"%s\" ist Stellvertreter für einen Binärriesen" |
@@ -5547,7 +5609,12 b' msgstr ""' | |||
|
5547 | 5609 | msgid "" |
|
5548 | 5610 | "make them behave as if --keep-changes were passed, and non-conflicting\n" |
|
5549 | 5611 | "local changes will be tolerated and preserved. If incompatible options\n" |
|
5550 |
"such as -f/--force or --exact are passed, this setting is ignored. |
|
|
5612 | "such as -f/--force or --exact are passed, this setting is ignored." | |
|
5613 | msgstr "" | |
|
5614 | ||
|
5615 | msgid "" | |
|
5616 | "This extension used to provide a strip command. This command now lives\n" | |
|
5617 | "in the strip extension.\n" | |
|
5551 | 5618 | msgstr "" |
|
5552 | 5619 | |
|
5553 | 5620 | msgid "print first line of patch header" |
@@ -5706,12 +5773,9 b' msgstr "Keine Patches angewendet"' | |||
|
5706 | 5773 | msgid "working directory revision is not qtip" |
|
5707 | 5774 | msgstr "Revision des Arbeitsverzeichnisses ist nicht qtip" |
|
5708 | 5775 | |
|
5709 | #, python-format | |
|
5710 | msgid "uncommitted changes in subrepository %s" | |
|
5711 | msgstr "nicht eingetragene Änderungen in Subrepository %s" | |
|
5712 | ||
|
5713 | msgid "local changes found" | |
|
5714 | msgstr "Lokale Änderungen gefunden" | |
|
5776 | #, fuzzy | |
|
5777 | msgid "local changed subrepos found, refresh first" | |
|
5778 | msgstr "Lokale Änderungen gefunden. Führe zuerst \"qrefresh\" aus!" | |
|
5715 | 5779 | |
|
5716 | 5780 | #, python-format |
|
5717 | 5781 | msgid "\"%s\" cannot be used as the name of a patch" |
@@ -6562,9 +6626,11 b' msgstr ""' | |||
|
6562 | 6626 | " Ohne Argumente werden die aktuell aktiven Wächter ausgegeben.\n" |
|
6563 | 6627 | " Mit einem Argument wird der aktuelle Wächter gesetzt." |
|
6564 | 6628 | |
|
6565 | msgid "" | |
|
6566 | " .. note::\n" | |
|
6567 | " Specifying negative guards now requires '--'." | |
|
6629 | msgid " .. note::" | |
|
6630 | msgstr "" | |
|
6631 | ||
|
6632 | #, fuzzy | |
|
6633 | msgid " Specifying negative guards now requires '--'." | |
|
6568 | 6634 | msgstr "" |
|
6569 | 6635 | " .. note::\n" |
|
6570 | 6636 | " Spezifizieren von negativen Wächtern erfordert jetzt '--'." |
@@ -6729,110 +6795,6 b' msgstr "Das Ziel %s existiert bereits. V' | |||
|
6729 | 6795 | msgid "copy %s to %s\n" |
|
6730 | 6796 | msgstr "Kopiert %s nach %s\n" |
|
6731 | 6797 | |
|
6732 | msgid "" | |
|
6733 | "strip specified revision (optional, can specify revisions without this " | |
|
6734 | "option)" | |
|
6735 | msgstr "" | |
|
6736 | "Entfernt die gegebene Revision (optional, da Revisionen ohne diese Option " | |
|
6737 | "angegeben werden können)" | |
|
6738 | ||
|
6739 | msgid "force removal of changesets, discard uncommitted changes (no backup)" | |
|
6740 | msgstr "" | |
|
6741 | "erzwingt Entfernung von Änderungssätzen und unversionierten Änderungen " | |
|
6742 | "(keine Sicherheitskopie)" | |
|
6743 | ||
|
6744 | msgid "" | |
|
6745 | "bundle only changesets with local revision number greater than REV which are " | |
|
6746 | "not descendants of REV (DEPRECATED)" | |
|
6747 | msgstr "" | |
|
6748 | "Bündelt nur Änderungssätze mit einer lokalen Revisionsnummer größer als REV, " | |
|
6749 | "die nicht Nachfahren von REV sind (VERALTET)" | |
|
6750 | ||
|
6751 | msgid "no backups" | |
|
6752 | msgstr "Keine Sicherheitskopien" | |
|
6753 | ||
|
6754 | msgid "no backups (DEPRECATED)" | |
|
6755 | msgstr "Keine Sicherheitskopien (VERALTET)" | |
|
6756 | ||
|
6757 | msgid "ignored (DEPRECATED)" | |
|
6758 | msgstr "ignorieren (VERALTET)" | |
|
6759 | ||
|
6760 | msgid "do not modify working copy during strip" | |
|
6761 | msgstr "Die Arbeitskopie während des Entfernens nicht verändern" | |
|
6762 | ||
|
6763 | #, fuzzy | |
|
6764 | msgid "remove revs only reachable from given bookmark" | |
|
6765 | msgstr "" | |
|
6766 | "Entfernt Revisionen, die nur vom angegebenen Lesezeichen aus erreichbar sind" | |
|
6767 | ||
|
6768 | #, fuzzy | |
|
6769 | msgid "hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV..." | |
|
6770 | msgstr "hg strip [-k] [-f] [-n] [-B Lesezeichen] REV..." | |
|
6771 | ||
|
6772 | msgid "strip changesets and all their descendants from the repository" | |
|
6773 | msgstr "Entfernt Änderungssätze und alle Nachfahren aus dem Projektarchiv" | |
|
6774 | ||
|
6775 | msgid "" | |
|
6776 | " The strip command removes the specified changesets and all their\n" | |
|
6777 | " descendants. If the working directory has uncommitted changes, the\n" | |
|
6778 | " operation is aborted unless the --force flag is supplied, in which\n" | |
|
6779 | " case changes will be discarded." | |
|
6780 | msgstr "" | |
|
6781 | " Der strip-Befehl entfernt die angegebenen Änderungssätze und alle\n" | |
|
6782 | " Nachfahren. Unversionierte Änderungen im Arbeitsverzeichnis können\n" | |
|
6783 | " durch Angabe von --force verworfen werden, ansonsten unterbrechen sie\n" | |
|
6784 | " diesen Vorgang." | |
|
6785 | ||
|
6786 | msgid "" | |
|
6787 | " If a parent of the working directory is stripped, then the working\n" | |
|
6788 | " directory will automatically be updated to the most recent\n" | |
|
6789 | " available ancestor of the stripped parent after the operation\n" | |
|
6790 | " completes." | |
|
6791 | msgstr "" | |
|
6792 | " Wenn ein Vorfahr des Arbeitsverzeichnisse entfernt wird, wird dieses\n" | |
|
6793 | " automatisch auf den aktuellsten, verfügbaren Vorfahr des entfernten\n" | |
|
6794 | " Vorfahren aktualisiert, wenn der Vorgang abgeschlossen ist." | |
|
6795 | ||
|
6796 | msgid "" | |
|
6797 | " Any stripped changesets are stored in ``.hg/strip-backup`` as a\n" | |
|
6798 | " bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n" | |
|
6799 | " be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n" | |
|
6800 | " where BUNDLE is the bundle file created by the strip. Note that\n" | |
|
6801 | " the local revision numbers will in general be different after the\n" | |
|
6802 | " restore." | |
|
6803 | msgstr "" | |
|
6804 | " Jeder entfernte Änderungssatz wird in ``.hg/strip-backup`` als Bündel\n" | |
|
6805 | " gespeichert (siehe :hg:`help bundle` und :hg:`help unbundle`). Sie " | |
|
6806 | "können\n" | |
|
6807 | " über :hg:`unbundle .hg/strip-backup/BUNDLE` wiederhergestellt werden,\n" | |
|
6808 | " wobei BUNDLE die von strip erstellte Datei ist. Beachten Sie, dass die\n" | |
|
6809 | " lokalen Versionsnummern sich für gewöhnlich nach dem Wiederherstellen\n" | |
|
6810 | " ändern werden." | |
|
6811 | ||
|
6812 | msgid "" | |
|
6813 | " Use the --no-backup option to discard the backup bundle once the\n" | |
|
6814 | " operation completes." | |
|
6815 | msgstr "" | |
|
6816 | " Benutzen Sie den Schalter --no-backup, um die Bündel zu entfernen,\n" | |
|
6817 | " wenn die Operation abgeschlossen ist." | |
|
6818 | ||
|
6819 | msgid "" | |
|
6820 | " Strip is not a history-rewriting operation and can be used on\n" | |
|
6821 | " changesets in the public phase. But if the stripped changesets have\n" | |
|
6822 | " been pushed to a remote repository you will likely pull them again." | |
|
6823 | msgstr "" | |
|
6824 | ||
|
6825 | #, python-format | |
|
6826 | msgid "bookmark '%s' not found" | |
|
6827 | msgstr "Lesezeichen '%s' wurde nicht gefunden" | |
|
6828 | ||
|
6829 | #, python-format | |
|
6830 | msgid "bookmark '%s' deleted\n" | |
|
6831 | msgstr "Lesezeichen '%s' wurde gelöscht\n" | |
|
6832 | ||
|
6833 | msgid "empty revision set" | |
|
6834 | msgstr "Revisionsmenge ist leer" | |
|
6835 | ||
|
6836 | 6798 | msgid "disable all guards" |
|
6837 | 6799 | msgstr "Deaktiviert alle Wächter" |
|
6838 | 6800 | |
@@ -8327,11 +8289,13 b' msgstr ""' | |||
|
8327 | 8289 | " werden, kann sie mit --continue/-c wieder aufgenommen oder mit\n" |
|
8328 | 8290 | " --abort/-a abgebrochen werden." |
|
8329 | 8291 | |
|
8330 | msgid "" | |
|
8331 | " Returns 0 on success, 1 if nothing to rebase.\n" | |
|
8332 | " " | |
|
8333 | msgstr "" | |
|
8334 | " Gibt 0 bei Erfolg zurück, oder 1, wenn es nichts zu verschieben gibt.\n" | |
|
8292 | #, fuzzy | |
|
8293 | msgid "" | |
|
8294 | " Returns 0 on success, 1 if nothing to rebase or there are\n" | |
|
8295 | " unresolved conflicts.\n" | |
|
8296 | " " | |
|
8297 | msgstr "" | |
|
8298 | " Gibt 0 bei Erfolg zurück, 1 wenn ungelöste Konflikte auftraten.\n" | |
|
8335 | 8299 | " " |
|
8336 | 8300 | |
|
8337 | 8301 | msgid "message can only be specified with collapse" |
@@ -8351,6 +8315,16 b' msgstr "abort und continue erlauben kein' | |||
|
8351 | 8315 | msgid "tool option will be ignored\n" |
|
8352 | 8316 | msgstr "Die Option tool wird ignoriert\n" |
|
8353 | 8317 | |
|
8318 | msgid "rebase aborted (no revision is removed, only broken state is cleared)\n" | |
|
8319 | msgstr "" | |
|
8320 | ||
|
8321 | #, fuzzy | |
|
8322 | msgid "cannot continue inconsistent rebase" | |
|
8323 | msgstr "Führt eine unterbrochene Pfropfung fort" | |
|
8324 | ||
|
8325 | msgid "use \"hg rebase --abort\" to clear borken state" | |
|
8326 | msgstr "" | |
|
8327 | ||
|
8354 | 8328 | msgid "cannot specify both a source and a base" |
|
8355 | 8329 | msgstr "Quelle und Basis dürfen nicht gleichzeitig angegeben werden" |
|
8356 | 8330 | |
@@ -8396,6 +8370,10 b' msgstr "keine \xc3\x84nderungen, Revision %d \xc3\xbcbersprungen\\n"' | |||
|
8396 | 8370 | msgid "rebase merging completed\n" |
|
8397 | 8371 | msgstr "Zusammenführungen der Verschiebung abgeschlossen\n" |
|
8398 | 8372 | |
|
8373 | #, fuzzy | |
|
8374 | msgid "update back to initial working directory parent\n" | |
|
8375 | msgstr "Aktualisiere Arbeitsverzeichnis\n" | |
|
8376 | ||
|
8399 | 8377 | msgid "rebase completed\n" |
|
8400 | 8378 | msgstr "Verschiebung abgeschlossen\n" |
|
8401 | 8379 | |
@@ -8403,7 +8381,9 b' msgstr "Verschiebung abgeschlossen\\n"' | |||
|
8403 | 8381 | msgid "%d revisions have been skipped\n" |
|
8404 | 8382 | msgstr "%d Revisionen wurden übersprungen\n" |
|
8405 | 8383 | |
|
8406 | msgid "unable to collapse, there is more than one external parent" | |
|
8384 | #, fuzzy, python-format | |
|
8385 | msgid "" | |
|
8386 | "unable to collapse on top of %s, there is more than one external parent: %s" | |
|
8407 | 8387 | msgstr "" |
|
8408 | 8388 | "Zusammenfalten nicht möglich: es gibt mehr als einen externen Vorgänger" |
|
8409 | 8389 | |
@@ -8448,6 +8428,10 b' msgid "--tool can only be used with --re' | |||
|
8448 | 8428 | msgstr "--tool kann nicht gleichzeitig mit --rebase verwendet werden" |
|
8449 | 8429 | |
|
8450 | 8430 | #. i18n: column positioning for "hg summary" |
|
8431 | msgid "rebase: (use \"hg rebase --abort\" to clear broken state)\n" | |
|
8432 | msgstr "" | |
|
8433 | ||
|
8434 | #. i18n: column positioning for "hg summary" | |
|
8451 | 8435 | #, python-format |
|
8452 | 8436 | msgid "rebase: %s, %s (rebase --continue)\n" |
|
8453 | 8437 | msgstr "" |
@@ -8469,18 +8453,44 b' msgstr "Keine vorherige Verschiebung zur' | |||
|
8469 | 8453 | msgid "use 'hg rebase --continue' or 'hg rebase --abort'" |
|
8470 | 8454 | msgstr "" |
|
8471 | 8455 | |
|
8456 | msgid "use \"hg rebase --abort\" to clear broken state" | |
|
8457 | msgstr "" | |
|
8458 | ||
|
8459 | msgid "empty \"rev\" revision set - nothing to rebase" | |
|
8460 | msgstr "" | |
|
8461 | ||
|
8462 | msgid "empty \"source\" revision set - nothing to rebase" | |
|
8463 | msgstr "" | |
|
8464 | ||
|
8465 | msgid "empty \"base\" revision set - can't compute rebase set" | |
|
8466 | msgstr "" | |
|
8467 | ||
|
8468 | #, python-format | |
|
8469 | msgid "nothing to rebase - %s is both \"base\" and destination\n" | |
|
8470 | msgstr "" | |
|
8471 | ||
|
8472 | #, fuzzy | |
|
8473 | msgid "nothing to rebase - working directory parent is also destination\n" | |
|
8474 | msgstr "Kein Arbeitsverzeichnis: Bitte gib eine Revision an" | |
|
8475 | ||
|
8476 | #, python-format | |
|
8477 | msgid "" | |
|
8478 | "nothing to rebase - \"base\" %s is already an ancestor of destination %s\n" | |
|
8479 | msgstr "" | |
|
8480 | ||
|
8481 | #, python-format | |
|
8482 | msgid "" | |
|
8483 | "nothing to rebase - working directory parent is already an ancestor of " | |
|
8484 | "destination %s\n" | |
|
8485 | msgstr "" | |
|
8486 | ||
|
8487 | #, fuzzy, python-format | |
|
8488 | msgid "nothing to rebase from %s to %s\n" | |
|
8489 | msgstr "Kein Verschiebung nötig\n" | |
|
8490 | ||
|
8472 | 8491 | msgid "commands to interactively select changes for commit/qrefresh" |
|
8473 | 8492 | msgstr "Befehle um interaktiv Änderungen für commit/qrefresh zu wählen" |
|
8474 | 8493 | |
|
8475 | msgid "ignore white space when comparing lines" | |
|
8476 | msgstr "Ignoriert Leerzeichen beim Vergleich von Zeilen" | |
|
8477 | ||
|
8478 | msgid "ignore changes in the amount of white space" | |
|
8479 | msgstr "Ignoriert Änderungen bei der Anzahl von Leerzeichen" | |
|
8480 | ||
|
8481 | msgid "ignore changes whose lines are all blank" | |
|
8482 | msgstr "Ignoriert Änderungen, die nur aus Leerzeilen bestehen" | |
|
8483 | ||
|
8484 | 8494 | msgid "this modifies a binary file (all or nothing)\n" |
|
8485 | 8495 | msgstr "Dies modifiziert eine Binärdatei (alles oder nicht)\n" |
|
8486 | 8496 | |
@@ -8491,11 +8501,13 b' msgstr "Dies ist eine Bin\xc3\xa4rdatei\\n"' | |||
|
8491 | 8501 | msgid "%d hunks, %d lines changed\n" |
|
8492 | 8502 | msgstr "%d Hunks, %d Zeilen geändert\n" |
|
8493 | 8503 | |
|
8494 | msgid "" | |
|
8495 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit the " | |
|
8504 | #, fuzzy | |
|
8505 | msgid "" | |
|
8506 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " | |
|
8496 | 8507 | "change manually$$ &Skip remaining changes to this file$$ Record remaining " |
|
8497 | 8508 | "changes to this &file$$ &Done, skip remaining changes and files$$ Record " |
|
8498 | "&all changes to all remaining files$$ &Quit, recording no changes$$ &?" | |
|
8509 | "&all changes to all remaining files$$ &Quit, recording no changes$$ &? " | |
|
8510 | "(display help)" | |
|
8499 | 8511 | msgstr "" |
|
8500 | 8512 | "[Jneszfab?]$$ &Ja, diese Änderung aufzeichnen$$ &Nein, diese Änderung " |
|
8501 | 8513 | "überspringen$$ Änderung manuell &editieren$$ Verbleibende Änderungen an " |
@@ -8705,6 +8717,9 b' msgstr "Wiederverkn\xc3\xbcpft: %s nach %s\\n"' | |||
|
8705 | 8717 | msgid "there is nothing to relink\n" |
|
8706 | 8718 | msgstr "Es gibt nichts zum wiederverknüpfen\n" |
|
8707 | 8719 | |
|
8720 | msgid "source and destination are on different devices" | |
|
8721 | msgstr "Quelle und Ziel sind auf unterschiedlichen Geräten" | |
|
8722 | ||
|
8708 | 8723 | #, python-format |
|
8709 | 8724 | msgid "tip has %d files, estimated total number of files: %s\n" |
|
8710 | 8725 | msgstr "Die Archivspitze (tip) hat %d Dateien. Geschätzte Gesamtzahl: %s\n" |
@@ -8719,9 +8734,6 b' msgstr "Dateien"' | |||
|
8719 | 8734 | msgid "collected %d candidate storage files\n" |
|
8720 | 8735 | msgstr "%d Kandidaten gesammelt\n" |
|
8721 | 8736 | |
|
8722 | msgid "source and destination are on different devices" | |
|
8723 | msgstr "Quelle und Ziel sind auf unterschiedlichen Geräten" | |
|
8724 | ||
|
8725 | 8737 | msgid "pruning" |
|
8726 | 8738 | msgstr "Schränke ein" |
|
8727 | 8739 | |
@@ -8823,7 +8835,6 b' msgid ""' | |||
|
8823 | 8835 | msgstr "" |
|
8824 | 8836 | |
|
8825 | 8837 | msgid "" |
|
8826 | " .. note::\n" | |
|
8827 | 8838 | " using rollback or extensions that destroy/modify history (mq,\n" |
|
8828 | 8839 | " rebase, etc.) can cause considerable confusion with shared\n" |
|
8829 | 8840 | " clones. In particular, if two shared clones are both updated to\n" |
@@ -8852,6 +8863,377 b' msgstr "erstelle keine Arbeitskopie"' | |||
|
8852 | 8863 | msgid "[-U] SOURCE [DEST]" |
|
8853 | 8864 | msgstr "[-U] QUELLE [ZIEL]" |
|
8854 | 8865 | |
|
8866 | #, fuzzy | |
|
8867 | msgid "save and restore changes to the working directory" | |
|
8868 | msgstr "Ersetzt Platzhalter in der Arbeitskopie" | |
|
8869 | ||
|
8870 | msgid "" | |
|
8871 | "The \"hg shelve\" command saves changes made to the working directory\n" | |
|
8872 | "and reverts those changes, resetting the working directory to a clean\n" | |
|
8873 | "state." | |
|
8874 | msgstr "" | |
|
8875 | ||
|
8876 | msgid "" | |
|
8877 | "Later on, the \"hg unshelve\" command restores the changes saved by \"hg\n" | |
|
8878 | "shelve\". Changes can be restored even after updating to a different\n" | |
|
8879 | "parent, in which case Mercurial's merge machinery will resolve any\n" | |
|
8880 | "conflicts if necessary." | |
|
8881 | msgstr "" | |
|
8882 | ||
|
8883 | msgid "" | |
|
8884 | "You can have more than one shelved change outstanding at a time; each\n" | |
|
8885 | "shelved change has a distinct name. For details, see the help for \"hg\n" | |
|
8886 | "shelve\".\n" | |
|
8887 | msgstr "" | |
|
8888 | ||
|
8889 | #, fuzzy, python-format | |
|
8890 | msgid "shelved change '%s' not found" | |
|
8891 | msgstr "revlog '%s' nicht gefunden" | |
|
8892 | ||
|
8893 | #, fuzzy | |
|
8894 | msgid "" | |
|
8895 | "this version of shelve is incompatible with the version used in this repo" | |
|
8896 | msgstr "Die eol-Erweiterung ist inkompatibel mit der win32text-Erweiterung.\n" | |
|
8897 | ||
|
8898 | #, fuzzy | |
|
8899 | msgid "cannot shelve while merging" | |
|
8900 | msgstr "Beim Zusammenführen kann nicht berichtigt werden" | |
|
8901 | ||
|
8902 | #, fuzzy, python-format | |
|
8903 | msgid "a shelved change named '%s' already exists" | |
|
8904 | msgstr "Ein Zweig mit diesem Namen existiert bereits" | |
|
8905 | ||
|
8906 | #, fuzzy, python-format | |
|
8907 | msgid "too many shelved changes named '%s'" | |
|
8908 | msgstr "Kann Änderungen in %s nicht lesen" | |
|
8909 | ||
|
8910 | msgid "shelved change names may not contain slashes" | |
|
8911 | msgstr "" | |
|
8912 | ||
|
8913 | msgid "shelved change names may not start with '.'" | |
|
8914 | msgstr "" | |
|
8915 | ||
|
8916 | #, python-format | |
|
8917 | msgid "nothing changed (%d missing files, see 'hg status')\n" | |
|
8918 | msgstr "" | |
|
8919 | ||
|
8920 | msgid "nothing changed\n" | |
|
8921 | msgstr "Keine Änderung\n" | |
|
8922 | ||
|
8923 | #, fuzzy, python-format | |
|
8924 | msgid "shelved as %s\n" | |
|
8925 | msgstr "%s, Zeile %s: %s\n" | |
|
8926 | ||
|
8927 | #, fuzzy | |
|
8928 | msgid "no shelved changes specified!" | |
|
8929 | msgstr "Keine Dateien angegeben" | |
|
8930 | ||
|
8931 | #, fuzzy | |
|
8932 | msgid "working directory parents do not match unshelve state" | |
|
8933 | msgstr "(Arbeitsverzeichnis ist nicht auf Stand der Kopfversion)\n" | |
|
8934 | ||
|
8935 | #, python-format | |
|
8936 | msgid "unshelve of '%s' aborted\n" | |
|
8937 | msgstr "" | |
|
8938 | ||
|
8939 | msgid "unresolved conflicts, can't continue" | |
|
8940 | msgstr "" | |
|
8941 | ||
|
8942 | #, fuzzy | |
|
8943 | msgid "see 'hg resolve', then 'hg unshelve --continue'" | |
|
8944 | msgstr "" | |
|
8945 | "ungelöste Konflikte (siehe hg resolve, fahre mit hg rebase --continue fort)" | |
|
8946 | ||
|
8947 | #, python-format | |
|
8948 | msgid "unshelve of '%s' complete\n" | |
|
8949 | msgstr "" | |
|
8950 | ||
|
8951 | msgid "abort an incomplete unshelve operation" | |
|
8952 | msgstr "" | |
|
8953 | ||
|
8954 | msgid "continue an incomplete unshelve operation" | |
|
8955 | msgstr "" | |
|
8956 | ||
|
8957 | msgid "keep shelve after unshelving" | |
|
8958 | msgstr "" | |
|
8959 | ||
|
8960 | msgid "hg unshelve [SHELVED]" | |
|
8961 | msgstr "" | |
|
8962 | ||
|
8963 | #, fuzzy | |
|
8964 | msgid "restore a shelved change to the working directory" | |
|
8965 | msgstr "Zeigt geänderte Dateien im Arbeitsverzeichnis" | |
|
8966 | ||
|
8967 | msgid "" | |
|
8968 | " This command accepts an optional name of a shelved change to\n" | |
|
8969 | " restore. If none is given, the most recent shelved change is used." | |
|
8970 | msgstr "" | |
|
8971 | ||
|
8972 | msgid "" | |
|
8973 | " If a shelved change is applied successfully, the bundle that\n" | |
|
8974 | " contains the shelved changes is deleted afterwards." | |
|
8975 | msgstr "" | |
|
8976 | ||
|
8977 | msgid "" | |
|
8978 | " Since you can restore a shelved change on top of an arbitrary\n" | |
|
8979 | " commit, it is possible that unshelving will result in a conflict\n" | |
|
8980 | " between your changes and the commits you are unshelving onto. If\n" | |
|
8981 | " this occurs, you must resolve the conflict, then use\n" | |
|
8982 | " ``--continue`` to complete the unshelve operation. (The bundle\n" | |
|
8983 | " will not be deleted until you successfully complete the unshelve.)" | |
|
8984 | msgstr "" | |
|
8985 | ||
|
8986 | msgid "" | |
|
8987 | " (Alternatively, you can use ``--abort`` to abandon an unshelve\n" | |
|
8988 | " that causes a conflict. This reverts the unshelved changes, and\n" | |
|
8989 | " does not delete the bundle.)\n" | |
|
8990 | " " | |
|
8991 | msgstr "" | |
|
8992 | ||
|
8993 | msgid "cannot combine abort/continue with naming a shelved change" | |
|
8994 | msgstr "" | |
|
8995 | ||
|
8996 | msgid "no unshelve operation underway" | |
|
8997 | msgstr "" | |
|
8998 | ||
|
8999 | #, fuzzy | |
|
9000 | msgid "can only unshelve one change at a time" | |
|
9001 | msgstr "--rev und --change können nicht gleichzeitig angegeben werden" | |
|
9002 | ||
|
9003 | msgid "no shelved changes to apply!" | |
|
9004 | msgstr "" | |
|
9005 | ||
|
9006 | #, fuzzy, python-format | |
|
9007 | msgid "unshelving change '%s'\n" | |
|
9008 | msgstr "Berichtigt Änderungssatz %s\n" | |
|
9009 | ||
|
9010 | #, fuzzy | |
|
9011 | msgid "unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')" | |
|
9012 | msgstr "" | |
|
9013 | "ungelöste Konflikte (siehe hg resolve, fahre mit hg rebase --continue fort)" | |
|
9014 | ||
|
9015 | #, fuzzy | |
|
9016 | msgid "mark new/missing files as added/removed before shelving" | |
|
9017 | msgstr "Markiert neue/fehlende Dateien als hinzugefügt/entfernt" | |
|
9018 | ||
|
9019 | #, fuzzy | |
|
9020 | msgid "delete all shelved changes" | |
|
9021 | msgstr "Wählt alle konfliktbehafteten Dateien aus" | |
|
9022 | ||
|
9023 | #, fuzzy | |
|
9024 | msgid "shelve with the specified commit date" | |
|
9025 | msgstr "Protokolliert das angegebenen Datum als Übernahmedatum" | |
|
9026 | ||
|
9027 | msgid "delete the named shelved change(s)" | |
|
9028 | msgstr "" | |
|
9029 | ||
|
9030 | msgid "list current shelves" | |
|
9031 | msgstr "" | |
|
9032 | ||
|
9033 | #, fuzzy | |
|
9034 | msgid "use text as shelve message" | |
|
9035 | msgstr "Nutzt Text als Commit-Nachricht" | |
|
9036 | ||
|
9037 | #, fuzzy | |
|
9038 | msgid "use the given name for the shelved commit" | |
|
9039 | msgstr "Nutze gegebenes Datum als Sendedatum" | |
|
9040 | ||
|
9041 | msgid "show patch" | |
|
9042 | msgstr "Patch anzeigen" | |
|
9043 | ||
|
9044 | msgid "output diffstat-style summary of changes" | |
|
9045 | msgstr "Zusammenfassung der Änderungen im diffstat-Stil" | |
|
9046 | ||
|
9047 | msgid "hg shelve" | |
|
9048 | msgstr "" | |
|
9049 | ||
|
9050 | #, fuzzy | |
|
9051 | msgid "save and set aside changes from the working directory" | |
|
9052 | msgstr "Löscht nicht versionierte Dateien aus dem Arbeitsverzeichnis" | |
|
9053 | ||
|
9054 | msgid "" | |
|
9055 | " Shelving takes files that \"hg status\" reports as not clean, saves\n" | |
|
9056 | " the modifications to a bundle (a shelved change), and reverts the\n" | |
|
9057 | " files so that their state in the working directory becomes clean." | |
|
9058 | msgstr "" | |
|
9059 | ||
|
9060 | msgid "" | |
|
9061 | " To restore these changes to the working directory, using \"hg\n" | |
|
9062 | " unshelve\"; this will work even if you switch to a different\n" | |
|
9063 | " commit." | |
|
9064 | msgstr "" | |
|
9065 | ||
|
9066 | msgid "" | |
|
9067 | " When no files are specified, \"hg shelve\" saves all not-clean\n" | |
|
9068 | " files. If specific files or directories are named, only changes to\n" | |
|
9069 | " those files are shelved." | |
|
9070 | msgstr "" | |
|
9071 | ||
|
9072 | msgid "" | |
|
9073 | " Each shelved change has a name that makes it easier to find later.\n" | |
|
9074 | " The name of a shelved change defaults to being based on the active\n" | |
|
9075 | " bookmark, or if there is no active bookmark, the current named\n" | |
|
9076 | " branch. To specify a different name, use ``--name``." | |
|
9077 | msgstr "" | |
|
9078 | ||
|
9079 | msgid "" | |
|
9080 | " To see a list of existing shelved changes, use the ``--list``\n" | |
|
9081 | " option. For each shelved change, this will print its name, age,\n" | |
|
9082 | " and description; use ``--patch`` or ``--stat`` for more details." | |
|
9083 | msgstr "" | |
|
9084 | ||
|
9085 | msgid "" | |
|
9086 | " To delete specific shelved changes, use ``--delete``. To delete\n" | |
|
9087 | " all shelved changes, use ``--cleanup``.\n" | |
|
9088 | " " | |
|
9089 | msgstr "" | |
|
9090 | ||
|
9091 | #, python-format | |
|
9092 | msgid "options '--%s' and '--%s' may not be used together" | |
|
9093 | msgstr "" | |
|
9094 | ||
|
9095 | #, fuzzy | |
|
9096 | msgid "cannot specify names when using '--cleanup'" | |
|
9097 | msgstr "" | |
|
9098 | "Es können nicht gleichzeitig -c/--check und -C/--clean angegeben werden" | |
|
9099 | ||
|
9100 | #, python-format | |
|
9101 | msgid "option '--%s' may not be used when shelving a change" | |
|
9102 | msgstr "" | |
|
9103 | ||
|
9104 | #, fuzzy | |
|
9105 | msgid "unshelve already in progress" | |
|
9106 | msgstr "Führt eine unterbrochene Pfropfung fort" | |
|
9107 | ||
|
9108 | msgid "use 'hg unshelve --continue' or 'hg unshelve --abort'" | |
|
9109 | msgstr "" | |
|
9110 | ||
|
9111 | #, fuzzy | |
|
9112 | msgid "strip changesets and their descendents from history" | |
|
9113 | msgstr "Entfernt Änderungssätze und alle Nachfahren aus dem Projektarchiv" | |
|
9114 | ||
|
9115 | #, fuzzy | |
|
9116 | msgid "" | |
|
9117 | "This extension allows you to strip changesets and all their descendants from " | |
|
9118 | "the\n" | |
|
9119 | "repository. See the command help for details.\n" | |
|
9120 | msgstr "Entfernt Änderungssätze und alle Nachfahren aus dem Projektarchiv" | |
|
9121 | ||
|
9122 | #, python-format | |
|
9123 | msgid "uncommitted changes in subrepository %s" | |
|
9124 | msgstr "nicht eingetragene Änderungen in Subrepository %s" | |
|
9125 | ||
|
9126 | msgid "local changes found" | |
|
9127 | msgstr "Lokale Änderungen gefunden" | |
|
9128 | ||
|
9129 | #, fuzzy | |
|
9130 | msgid "local changed subrepos found" | |
|
9131 | msgstr "Lokale Änderungen gefunden" | |
|
9132 | ||
|
9133 | msgid "" | |
|
9134 | "strip specified revision (optional, can specify revisions without this " | |
|
9135 | "option)" | |
|
9136 | msgstr "" | |
|
9137 | "Entfernt die gegebene Revision (optional, da Revisionen ohne diese Option " | |
|
9138 | "angegeben werden können)" | |
|
9139 | ||
|
9140 | msgid "force removal of changesets, discard uncommitted changes (no backup)" | |
|
9141 | msgstr "" | |
|
9142 | "erzwingt Entfernung von Änderungssätzen und unversionierten Änderungen " | |
|
9143 | "(keine Sicherheitskopie)" | |
|
9144 | ||
|
9145 | msgid "" | |
|
9146 | "bundle only changesets with local revision number greater than REV which are " | |
|
9147 | "not descendants of REV (DEPRECATED)" | |
|
9148 | msgstr "" | |
|
9149 | "Bündelt nur Änderungssätze mit einer lokalen Revisionsnummer größer als REV, " | |
|
9150 | "die nicht Nachfahren von REV sind (VERALTET)" | |
|
9151 | ||
|
9152 | msgid "no backups" | |
|
9153 | msgstr "Keine Sicherheitskopien" | |
|
9154 | ||
|
9155 | msgid "no backups (DEPRECATED)" | |
|
9156 | msgstr "Keine Sicherheitskopien (VERALTET)" | |
|
9157 | ||
|
9158 | msgid "ignored (DEPRECATED)" | |
|
9159 | msgstr "ignorieren (VERALTET)" | |
|
9160 | ||
|
9161 | msgid "do not modify working copy during strip" | |
|
9162 | msgstr "Die Arbeitskopie während des Entfernens nicht verändern" | |
|
9163 | ||
|
9164 | #, fuzzy | |
|
9165 | msgid "remove revs only reachable from given bookmark" | |
|
9166 | msgstr "" | |
|
9167 | "Entfernt Revisionen, die nur vom angegebenen Lesezeichen aus erreichbar sind" | |
|
9168 | ||
|
9169 | #, fuzzy | |
|
9170 | msgid "hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV..." | |
|
9171 | msgstr "hg strip [-k] [-f] [-n] [-B Lesezeichen] REV..." | |
|
9172 | ||
|
9173 | msgid "strip changesets and all their descendants from the repository" | |
|
9174 | msgstr "Entfernt Änderungssätze und alle Nachfahren aus dem Projektarchiv" | |
|
9175 | ||
|
9176 | msgid "" | |
|
9177 | " The strip command removes the specified changesets and all their\n" | |
|
9178 | " descendants. If the working directory has uncommitted changes, the\n" | |
|
9179 | " operation is aborted unless the --force flag is supplied, in which\n" | |
|
9180 | " case changes will be discarded." | |
|
9181 | msgstr "" | |
|
9182 | " Der strip-Befehl entfernt die angegebenen Änderungssätze und alle\n" | |
|
9183 | " Nachfahren. Unversionierte Änderungen im Arbeitsverzeichnis können\n" | |
|
9184 | " durch Angabe von --force verworfen werden, ansonsten unterbrechen sie\n" | |
|
9185 | " diesen Vorgang." | |
|
9186 | ||
|
9187 | msgid "" | |
|
9188 | " If a parent of the working directory is stripped, then the working\n" | |
|
9189 | " directory will automatically be updated to the most recent\n" | |
|
9190 | " available ancestor of the stripped parent after the operation\n" | |
|
9191 | " completes." | |
|
9192 | msgstr "" | |
|
9193 | " Wenn ein Vorfahr des Arbeitsverzeichnisse entfernt wird, wird dieses\n" | |
|
9194 | " automatisch auf den aktuellsten, verfügbaren Vorfahr des entfernten\n" | |
|
9195 | " Vorfahren aktualisiert, wenn der Vorgang abgeschlossen ist." | |
|
9196 | ||
|
9197 | msgid "" | |
|
9198 | " Any stripped changesets are stored in ``.hg/strip-backup`` as a\n" | |
|
9199 | " bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n" | |
|
9200 | " be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n" | |
|
9201 | " where BUNDLE is the bundle file created by the strip. Note that\n" | |
|
9202 | " the local revision numbers will in general be different after the\n" | |
|
9203 | " restore." | |
|
9204 | msgstr "" | |
|
9205 | " Jeder entfernte Änderungssatz wird in ``.hg/strip-backup`` als Bündel\n" | |
|
9206 | " gespeichert (siehe :hg:`help bundle` und :hg:`help unbundle`). Sie " | |
|
9207 | "können\n" | |
|
9208 | " über :hg:`unbundle .hg/strip-backup/BUNDLE` wiederhergestellt werden,\n" | |
|
9209 | " wobei BUNDLE die von strip erstellte Datei ist. Beachten Sie, dass die\n" | |
|
9210 | " lokalen Versionsnummern sich für gewöhnlich nach dem Wiederherstellen\n" | |
|
9211 | " ändern werden." | |
|
9212 | ||
|
9213 | msgid "" | |
|
9214 | " Use the --no-backup option to discard the backup bundle once the\n" | |
|
9215 | " operation completes." | |
|
9216 | msgstr "" | |
|
9217 | " Benutzen Sie den Schalter --no-backup, um die Bündel zu entfernen,\n" | |
|
9218 | " wenn die Operation abgeschlossen ist." | |
|
9219 | ||
|
9220 | msgid "" | |
|
9221 | " Strip is not a history-rewriting operation and can be used on\n" | |
|
9222 | " changesets in the public phase. But if the stripped changesets have\n" | |
|
9223 | " been pushed to a remote repository you will likely pull them again." | |
|
9224 | msgstr "" | |
|
9225 | ||
|
9226 | #, python-format | |
|
9227 | msgid "bookmark '%s' not found" | |
|
9228 | msgstr "Lesezeichen '%s' wurde nicht gefunden" | |
|
9229 | ||
|
9230 | #, python-format | |
|
9231 | msgid "bookmark '%s' deleted\n" | |
|
9232 | msgstr "Lesezeichen '%s' wurde gelöscht\n" | |
|
9233 | ||
|
9234 | msgid "empty revision set" | |
|
9235 | msgstr "Revisionsmenge ist leer" | |
|
9236 | ||
|
8855 | 9237 | msgid "command to transplant changesets from another branch" |
|
8856 | 9238 | msgstr "" |
|
8857 | 9239 | |
@@ -8920,21 +9302,10 b' msgid "filter corrupted changeset (no us' | |||
|
8920 | 9302 | msgstr "filtriere beschädigte Änderungssätze (ohne Nutzer oder Datum)" |
|
8921 | 9303 | |
|
8922 | 9304 | msgid "" |
|
8923 | "y: transplant this changeset\n" | |
|
8924 | "n: skip this changeset\n" | |
|
8925 | "m: merge at this changeset\n" | |
|
8926 | "p: show patch\n" | |
|
8927 | "c: commit selected changesets\n" | |
|
8928 | "q: cancel transplant\n" | |
|
8929 | "?: show this help\n" | |
|
8930 | msgstr "" | |
|
8931 | ||
|
8932 | #, fuzzy | |
|
8933 | msgid "apply changeset? [ynmpcq?]:" | |
|
8934 | msgstr "Änderung anwenden? [ynmpcq?]:" | |
|
8935 | ||
|
8936 | msgid "no such option\n" | |
|
8937 | msgstr "Keine solche Option\n" | |
|
9305 | "apply changeset? [ynmpcq?]:$$ &yes, transplant this changeset$$ &no, skip " | |
|
9306 | "this changeset$$ &merge at this changeset$$ show &patch$$ &commit selected " | |
|
9307 | "changesets$$ &quit and cancel transplant$$ &? (show this help)" | |
|
9308 | msgstr "" | |
|
8938 | 9309 | |
|
8939 | 9310 | #, fuzzy |
|
8940 | 9311 | msgid "transplant changesets from REPO" |
@@ -9005,7 +9376,7 b' msgid ""' | |||
|
9005 | 9376 | "changesets,\n" |
|
9006 | 9377 | " just as if it temporarily had been pulled.\n" |
|
9007 | 9378 | " If --branch/-b is specified, these revisions will be used as\n" |
|
9008 | " heads when deciding which changsets to transplant, just as if only\n" | |
|
9379 | " heads when deciding which changesets to transplant, just as if only\n" | |
|
9009 | 9380 | " these revisions had been pulled.\n" |
|
9010 | 9381 | " If --all/-a is specified, all the revisions up to the heads specified\n" |
|
9011 | 9382 | " with --branch will be transplanted." |
@@ -9299,12 +9670,28 b' msgid "updating to active bookmark %s\\n"' | |||
|
9299 | 9670 | msgstr "Aktualisiere Lesezeichen %s\n" |
|
9300 | 9671 | |
|
9301 | 9672 | #, python-format |
|
9673 | msgid "adding remote bookmark %s\n" | |
|
9674 | msgstr "Hinzufügen des entfernten Lesezeichens %s\n" | |
|
9675 | ||
|
9676 | #, python-format | |
|
9302 | 9677 | msgid "divergent bookmark %s stored as %s\n" |
|
9303 | 9678 | msgstr "Divergierendes Lesezeichen %s als %s gespeichert\n" |
|
9304 | 9679 | |
|
9305 | 9680 | #, python-format |
|
9306 |
msgid " |
|
|
9307 |
msgstr " |
|
|
9681 | msgid "updating bookmark %s failed!\n" | |
|
9682 | msgstr "Aktualisieren des Lesezeichens %s fehlgeschlagen!\n" | |
|
9683 | ||
|
9684 | #, python-format | |
|
9685 | msgid "bookmark %s does not exist on the local or remote repository!\n" | |
|
9686 | msgstr "Lesezeichen %s existiert weder im lokalen noch im entfernten Archiv!\n" | |
|
9687 | ||
|
9688 | #, python-format | |
|
9689 | msgid "exporting bookmark %s\n" | |
|
9690 | msgstr "Exportiere Lesezeichen %s\n" | |
|
9691 | ||
|
9692 | #, python-format | |
|
9693 | msgid "deleting remote bookmark %s\n" | |
|
9694 | msgstr "Lösche entferntes Lesezeichen %s\n" | |
|
9308 | 9695 | |
|
9309 | 9696 | msgid "searching for changed bookmarks\n" |
|
9310 | 9697 | msgstr "Suche nach geänderten Lesezeichen\n" |
@@ -9788,15 +10175,9 b' msgstr "Anzeige unter Nutzung der Vorlag' | |||
|
9788 | 10175 | msgid "display with template" |
|
9789 | 10176 | msgstr "Anzeige mit Vorlage" |
|
9790 | 10177 | |
|
9791 | msgid "show patch" | |
|
9792 | msgstr "Patch anzeigen" | |
|
9793 | ||
|
9794 | 10178 | msgid "do not show merges" |
|
9795 | 10179 | msgstr "Zeigt keine Merges" |
|
9796 | 10180 | |
|
9797 | msgid "output diffstat-style summary of changes" | |
|
9798 | msgstr "Zusammenfassung der Änderungen im diffstat-Stil" | |
|
9799 | ||
|
9800 | 10181 | msgid "show the revision DAG" |
|
9801 | 10182 | msgstr "Zeigt den Revisions-DAG" |
|
9802 | 10183 | |
@@ -9806,6 +10187,15 b' msgstr "Behandelt alle Dateien als Text"' | |||
|
9806 | 10187 | msgid "omit dates from diff headers" |
|
9807 | 10188 | msgstr "Fügt Datum nicht im Kopf des Diffs ein" |
|
9808 | 10189 | |
|
10190 | msgid "ignore white space when comparing lines" | |
|
10191 | msgstr "Ignoriert Leerzeichen beim Vergleich von Zeilen" | |
|
10192 | ||
|
10193 | msgid "ignore changes in the amount of white space" | |
|
10194 | msgstr "Ignoriert Änderungen bei der Anzahl von Leerzeichen" | |
|
10195 | ||
|
10196 | msgid "ignore changes whose lines are all blank" | |
|
10197 | msgstr "Ignoriert Änderungen, die nur aus Leerzeilen bestehen" | |
|
10198 | ||
|
9809 | 10199 | msgid "show which function each change is in" |
|
9810 | 10200 | msgstr "Zeigt die Funktion, in der die Änderung passiert ist" |
|
9811 | 10201 | |
@@ -10120,7 +10510,6 b' msgid ""' | |||
|
10120 | 10510 | msgstr "" |
|
10121 | 10511 | |
|
10122 | 10512 | msgid "" |
|
10123 | " .. note::\n" | |
|
10124 | 10513 | " backout cannot be used to fix either an unwanted or\n" |
|
10125 | 10514 | " incorrect merge." |
|
10126 | 10515 | msgstr "" |
@@ -10157,6 +10546,13 b' msgstr "Kann eine Zusammenf\xc3\xbchrungen nicht r\xc3\xbcckg\xc3\xa4ngig machen"' | |||
|
10157 | 10546 | msgid "cannot use --parent on non-merge changeset" |
|
10158 | 10547 | msgstr "Kann mit --parent nur Zusammenführung rückgängig machen" |
|
10159 | 10548 | |
|
10549 | msgid "use 'hg resolve' to retry unresolved file merges\n" | |
|
10550 | msgstr "Nutze 'hg resolve', um ungelöste Merges zu wiederholen\n" | |
|
10551 | ||
|
10552 | #, fuzzy, python-format | |
|
10553 | msgid "changeset %s backed out, don't forget to commit.\n" | |
|
10554 | msgstr "(Zusammenführen von Zweigen, vergiss nicht 'hg commit' auszuführen)\n" | |
|
10555 | ||
|
10160 | 10556 | #, python-format |
|
10161 | 10557 | msgid "changeset %s backs out changeset %s\n" |
|
10162 | 10558 | msgstr "Änderungssatz %s macht Änderungssatz %s rückgängig\n" |
@@ -10239,7 +10635,7 b' msgstr ""' | |||
|
10239 | 10635 | " Revision schlecht ist." |
|
10240 | 10636 | |
|
10241 | 10637 | msgid "" |
|
10242 |
" - start a bisection with known bad revision |
|
|
10638 | " - start a bisection with known bad revision 34, and good revision 12::" | |
|
10243 | 10639 | msgstr "" |
|
10244 | 10640 | |
|
10245 | 10641 | msgid "" |
@@ -10270,11 +10666,10 b' msgid ""' | |||
|
10270 | 10666 | msgstr "" |
|
10271 | 10667 | |
|
10272 | 10668 | msgid "" |
|
10273 | " - skip all revisions that do not touch directories ``foo`` or ``bar``" | |
|
10274 | msgstr "" | |
|
10275 | ||
|
10276 | msgid "" | |
|
10277 | " hg bisect --skip '!( file(\"path:foo\") & file(\"path:bar\") )'" | |
|
10669 | " - skip all revisions that do not touch directories ``foo`` or ``bar``::" | |
|
10670 | msgstr "" | |
|
10671 | ||
|
10672 | msgid " hg bisect --skip \"!( file('path:foo') & file('path:bar') )\"" | |
|
10278 | 10673 | msgstr "" |
|
10279 | 10674 | |
|
10280 | 10675 | msgid " - forget the current bisection::" |
@@ -10292,7 +10687,7 b' msgid ""' | |||
|
10292 | 10687 | " hg bisect --reset\n" |
|
10293 | 10688 | " hg bisect --bad 34\n" |
|
10294 | 10689 | " hg bisect --good 12\n" |
|
10295 |
" hg bisect --command |
|
|
10690 | " hg bisect --command \"make && make tests\"" | |
|
10296 | 10691 | msgstr "" |
|
10297 | 10692 | |
|
10298 | 10693 | msgid "" |
@@ -10317,7 +10712,7 b' msgstr ""' | |||
|
10317 | 10712 | msgid " hg log -r \"bisect(range)\"" |
|
10318 | 10713 | msgstr " hg log -r \"bisect(range)\"" |
|
10319 | 10714 | |
|
10320 |
msgid " - |
|
|
10715 | msgid " - you can even get a nice graph::" | |
|
10321 | 10716 | msgstr "" |
|
10322 | 10717 | |
|
10323 | 10718 | msgid " hg log --graph -r \"bisect(range)\"" |
@@ -10528,7 +10923,6 b' msgid "set or show the current branch na' | |||
|
10528 | 10923 | msgstr "Setzt oder zeigt den Namen des aktuellen Zweigs" |
|
10529 | 10924 | |
|
10530 | 10925 | msgid "" |
|
10531 | " .. note::\n" | |
|
10532 | 10926 | " Branch names are permanent and global. Use :hg:`bookmark` to create " |
|
10533 | 10927 | "a\n" |
|
10534 | 10928 | " light-weight bookmark instead. See :hg:`help glossary` for more\n" |
@@ -11070,13 +11464,6 b' msgstr "Beim Zusammenf\xc3\xbchren kann nicht berichtigt werden"' | |||
|
11070 | 11464 | msgid "cannot amend changeset with children" |
|
11071 | 11465 | msgstr "Kann keine Änderungssätze mit Nachfolgern berichtigen" |
|
11072 | 11466 | |
|
11073 | msgid "nothing changed\n" | |
|
11074 | msgstr "Keine Änderung\n" | |
|
11075 | ||
|
11076 | #, python-format | |
|
11077 | msgid "nothing changed (%d missing files, see 'hg status')\n" | |
|
11078 | msgstr "" | |
|
11079 | ||
|
11080 | 11467 | msgid "record a copy that has already occurred" |
|
11081 | 11468 | msgstr "Identifiziert eine Kopie, die bereits stattgefunden hat" |
|
11082 | 11469 | |
@@ -11704,8 +12091,8 b' msgstr ""' | |||
|
11704 | 12091 | " Unterschiede von Dateien zwischen Revisionen werden im unified-diff-\n" |
|
11705 | 12092 | " Format angezeigt." |
|
11706 | 12093 | |
|
11707 | msgid "" | |
|
11708 | " .. note::\n" | |
|
12094 | #, fuzzy | |
|
12095 | msgid "" | |
|
11709 | 12096 | " diff may generate unexpected results for merges, as it will\n" |
|
11710 | 12097 | " default to comparing against the working directory's first\n" |
|
11711 | 12098 | " parent changeset if no revisions are specified." |
@@ -11806,8 +12193,8 b' msgstr ""' | |||
|
11806 | 12193 | "(en)\n" |
|
11807 | 12194 | " und Versionsmeldung." |
|
11808 | 12195 | |
|
11809 | msgid "" | |
|
11810 | " .. note::\n" | |
|
12196 | #, fuzzy | |
|
12197 | msgid "" | |
|
11811 | 12198 | " export may generate unexpected diff output for merge\n" |
|
11812 | 12199 | " changesets, as it will compare the merge changeset against its\n" |
|
11813 | 12200 | " first parent only." |
@@ -11986,9 +12373,7 b' msgid ""' | |||
|
11986 | 12373 | " continued with the -c/--continue option." |
|
11987 | 12374 | msgstr "" |
|
11988 | 12375 | |
|
11989 | msgid "" | |
|
11990 | " .. note::\n" | |
|
11991 | " The -c/--continue option does not reapply earlier options." | |
|
12376 | msgid " The -c/--continue option does not reapply earlier options." | |
|
11992 | 12377 | msgstr "" |
|
11993 | 12378 | |
|
11994 | 12379 | msgid "" |
@@ -12041,13 +12426,13 b' msgstr "\xc3\x9cberspringe nicht transplantierbare Zusammenf\xc3\xbchrung %s\\n"' | |||
|
12041 | 12426 | msgid "skipping ancestor revision %s\n" |
|
12042 | 12427 | msgstr "Überspringe Vorgängerrevision %s\n" |
|
12043 | 12428 | |
|
12044 | #, python-format | |
|
12045 |
msgid "skipping already grafted |
|
|
12429 | #, fuzzy, python-format | |
|
12430 | msgid "skipping revision %s (already grafted to %s)\n" | |
|
12046 | 12431 | msgstr "Überspringe bereits transplantierte Revision %s\n" |
|
12047 | 12432 | |
|
12048 | #, python-format | |
|
12049 |
msgid "skipping already grafted revision %s ( |
|
|
12050 | msgstr "" | |
|
12433 | #, fuzzy, python-format | |
|
12434 | msgid "skipping already grafted revision %s (%s also has origin %d)\n" | |
|
12435 | msgstr "Überspringe bereits transplantierte Revision %s\n" | |
|
12051 | 12436 | |
|
12052 | 12437 | #, python-format |
|
12053 | 12438 | msgid "skipping already grafted revision %s (was grafted from %d)\n" |
@@ -12057,9 +12442,6 b' msgstr ""' | |||
|
12057 | 12442 | msgid "grafting revision %s\n" |
|
12058 | 12443 | msgstr "" |
|
12059 | 12444 | |
|
12060 | msgid "unresolved conflicts, can't continue" | |
|
12061 | msgstr "" | |
|
12062 | ||
|
12063 | 12445 | msgid "use hg resolve and hg graft --continue" |
|
12064 | 12446 | msgstr "" |
|
12065 | 12447 | |
@@ -12664,8 +13046,8 b' msgstr ""' | |||
|
12664 | 13046 | " des -v/--verbose Schalters, wird eine Liste aller geänderten Dateien\n" |
|
12665 | 13047 | " und die komplette Versionsmeldung angezeigt." |
|
12666 | 13048 | |
|
12667 | msgid "" | |
|
12668 | " .. note::\n" | |
|
13049 | #, fuzzy | |
|
13050 | msgid "" | |
|
12669 | 13051 | " log -p/--patch may generate unexpected diff output for merge\n" |
|
12670 | 13052 | " changesets, as it will only compare the merge changeset against\n" |
|
12671 | 13053 | " its first parent. Also, only files different from BOTH parents\n" |
@@ -12679,7 +13061,6 b' msgstr ""' | |||
|
12679 | 13061 | " verschieden sind:." |
|
12680 | 13062 | |
|
12681 | 13063 | msgid "" |
|
12682 | " .. note::\n" | |
|
12683 | 13064 | " for performance reasons, log FILE may omit duplicate changes\n" |
|
12684 | 13065 | " made on branches and will not show deletions. To see all\n" |
|
12685 | 13066 | " changes including duplicates and deletions, use the --removed\n" |
@@ -13071,7 +13452,7 b' msgid "only one phase can be specified"' | |||
|
13071 | 13452 | msgstr "" |
|
13072 | 13453 | |
|
13073 | 13454 | #, python-format |
|
13074 |
msgid "cannot move %i changesets to a |
|
|
13455 | msgid "cannot move %i changesets to a higher phase, use --force\n" | |
|
13075 | 13456 | msgstr "" |
|
13076 | 13457 | |
|
13077 | 13458 | #, python-format |
@@ -13085,6 +13466,10 b' msgstr ""' | |||
|
13085 | 13466 | msgid "not updating: %s\n" |
|
13086 | 13467 | msgstr "aktualisiere nicht: %s\n" |
|
13087 | 13468 | |
|
13469 | #, python-format | |
|
13470 | msgid "(%s)\n" | |
|
13471 | msgstr "" | |
|
13472 | ||
|
13088 | 13473 | msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" |
|
13089 | 13474 | msgstr "" |
|
13090 | 13475 | "(\"hg heads\" zeigt alle Köpfe, nutze \"hg merge\" um sie zusammenzuführen)\n" |
@@ -13208,11 +13593,10 b' msgstr ""' | |||
|
13208 | 13593 | " jede andere Kopferstellung verboten werden." |
|
13209 | 13594 | |
|
13210 | 13595 | msgid "" |
|
13211 | " Use -f/--force to override the default behavior and push all\n" | |
|
13212 | " changesets on all branches." | |
|
13213 | msgstr "" | |
|
13214 | " Nutze -f/--force um diese Vorkehrungen abzuschalten und alle Änderungs-\n" | |
|
13215 | " sätze zu übertragen." | |
|
13596 | " Extra care should be taken with the -f/--force option,\n" | |
|
13597 | " which will push all new heads on all branches, an action which will\n" | |
|
13598 | " almost always cause confusion for collaborators." | |
|
13599 | msgstr "" | |
|
13216 | 13600 | |
|
13217 | 13601 | msgid "" |
|
13218 | 13602 | " If -r/--rev is used, the specified revision and all its ancestors\n" |
@@ -13251,22 +13635,6 b' msgstr ""' | |||
|
13251 | 13635 | msgid "pushing to %s\n" |
|
13252 | 13636 | msgstr "Übertrage nach %s\n" |
|
13253 | 13637 | |
|
13254 | #, python-format | |
|
13255 | msgid "exporting bookmark %s\n" | |
|
13256 | msgstr "Exportiere Lesezeichen %s\n" | |
|
13257 | ||
|
13258 | #, python-format | |
|
13259 | msgid "deleting remote bookmark %s\n" | |
|
13260 | msgstr "Lösche entferntes Lesezeichen %s\n" | |
|
13261 | ||
|
13262 | #, python-format | |
|
13263 | msgid "bookmark %s does not exist on the local or remote repository!\n" | |
|
13264 | msgstr "Lesezeichen %s existiert weder im lokalen noch im entfernten Archiv!\n" | |
|
13265 | ||
|
13266 | #, python-format | |
|
13267 | msgid "updating bookmark %s failed!\n" | |
|
13268 | msgstr "Aktualisieren des Lesezeichens %s fehlgeschlagen!\n" | |
|
13269 | ||
|
13270 | 13638 | msgid "roll back an interrupted transaction" |
|
13271 | 13639 | msgstr "Setzt eine unterbrochene Transaktion zurück" |
|
13272 | 13640 | |
@@ -13338,15 +13706,16 b' msgstr ""' | |||
|
13338 | 13706 | " Aktionen sind Warnen, Entfernen (aus dem Zweig) und Löschen\n" |
|
13339 | 13707 | " (von der Festplatte):" |
|
13340 | 13708 | |
|
13341 | msgid "" | |
|
13342 | " ======= == == == ==\n" | |
|
13343 | " A C M !\n" | |
|
13344 | " ======= == == == ==\n" | |
|
13345 | " none W RD W R\n" | |
|
13346 |
" |
|
|
13347 |
" - |
|
|
13348 |
" -A |
|
|
13349 | " ======= == == == ==" | |
|
13709 | #, fuzzy | |
|
13710 | msgid "" | |
|
13711 | " ========= == == == ==\n" | |
|
13712 | " opt/state A C M !\n" | |
|
13713 | " ========= == == == ==\n" | |
|
13714 | " none W RD W R\n" | |
|
13715 | " -f R RD RD R\n" | |
|
13716 | " -A W W W R\n" | |
|
13717 | " -Af R R R R\n" | |
|
13718 | " ========= == == == ==" | |
|
13350 | 13719 | msgstr "" |
|
13351 | 13720 | " ======= == == == ==\n" |
|
13352 | 13721 | " A C M !\n" |
@@ -13500,7 +13869,6 b' msgstr "Setzt gegebene Dateien oder Verzeichnisse auf fr\xc3\xbchere Version zur\xc3\xbcck"' | |||
|
13500 | 13869 | |
|
13501 | 13870 | #, fuzzy |
|
13502 | 13871 | msgid "" |
|
13503 | " .. note::\n" | |
|
13504 | 13872 | " To check out earlier revisions, you should use :hg:`update REV`.\n" |
|
13505 | 13873 | " To cancel an uncommitted merge (and lose your changes),\n" |
|
13506 | 13874 | " use :hg:`update --clean .`." |
@@ -13869,8 +14237,8 b' msgstr ""' | |||
|
13869 | 14237 | " Dateien aus, es sei denn sie werden explizit mit -u/--unknown oder \n" |
|
13870 | 14238 | " -i/--ignored angefordert." |
|
13871 | 14239 | |
|
13872 | msgid "" | |
|
13873 | " .. note::\n" | |
|
14240 | #, fuzzy | |
|
14241 | msgid "" | |
|
13874 | 14242 | " status may appear to disagree with diff if permissions have\n" |
|
13875 | 14243 | " changed or a merge has occurred. The standard diff format does\n" |
|
13876 | 14244 | " not report permission changes and diff only reports changes\n" |
@@ -14398,7 +14766,7 b' msgstr "(siehe http://mercurial.selenic.com f\xc3\xbcr mehr Information)"' | |||
|
14398 | 14766 | |
|
14399 | 14767 | #, fuzzy |
|
14400 | 14768 | msgid "" |
|
14401 |
"Copyright (C) 2005-201 |
|
|
14769 | "Copyright (C) 2005-2014 Matt Mackall and others\n" | |
|
14402 | 14770 | "This is free software; see the source for copying conditions. There is NO\n" |
|
14403 | 14771 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
14404 | 14772 | msgstr "" |
@@ -14419,6 +14787,9 b' msgstr "unbekannter Befehl %s"' | |||
|
14419 | 14787 | msgid "cannot include %s (%s)" |
|
14420 | 14788 | msgstr "%s kann nicht einbezogen werden (%s)" |
|
14421 | 14789 | |
|
14790 | msgid "not found in manifest" | |
|
14791 | msgstr "nicht im Manifest gefunden" | |
|
14792 | ||
|
14422 | 14793 | #, python-format |
|
14423 | 14794 | msgid "unknown revision '%s'" |
|
14424 | 14795 | msgstr "Unbekannte Revision '%s'" |
@@ -14427,9 +14798,6 b' msgstr "Unbekannte Revision \'%s\'"' | |||
|
14427 | 14798 | msgid "working directory has unknown parent '%s'!" |
|
14428 | 14799 | msgstr "Arbeitsverzeichnis hat unbekannte Vorgängerversion '%s'!" |
|
14429 | 14800 | |
|
14430 | msgid "not found in manifest" | |
|
14431 | msgstr "nicht im Manifest gefunden" | |
|
14432 | ||
|
14433 | 14801 | #, python-format |
|
14434 | 14802 | msgid "no such file in rev %s" |
|
14435 | 14803 | msgstr "Datei in Revision %s nicht gefunden" |
@@ -14534,6 +14902,13 b' msgstr "Push erzeugt neuen entfernten Zw' | |||
|
14534 | 14902 | msgid "use 'hg push --new-branch' to create new remote branches" |
|
14535 | 14903 | msgstr "Verwende 'hg push --new-branch' um dies zu erlauben." |
|
14536 | 14904 | |
|
14905 | #, fuzzy, python-format | |
|
14906 | msgid "push creates new branch '%s' with multiple heads" | |
|
14907 | msgstr "Push erzeugt neuen entfernten Kopfe %s!" | |
|
14908 | ||
|
14909 | msgid "merge or see \"hg help push\" for details about pushing new heads" | |
|
14910 | msgstr "" | |
|
14911 | ||
|
14537 | 14912 | #, python-format |
|
14538 | 14913 | msgid "push creates new remote head %s on branch '%s'!" |
|
14539 | 14914 | msgstr "Push erzeugt neuen Kopf %s auf entfernten Zweig '%s'!" |
@@ -14542,22 +14917,18 b' msgstr "Push erzeugt neuen Kopf %s auf e' | |||
|
14542 | 14917 | msgid "push creates new remote head %s!" |
|
14543 | 14918 | msgstr "Push erzeugt neuen entfernten Kopfe %s!" |
|
14544 | 14919 | |
|
14545 | msgid "you should pull and merge or use push -f to force" | |
|
14546 | msgstr "" | |
|
14547 | "Sie sollten zuerst synchronisieren (pull) und Zusammenführen (merge), oder -" | |
|
14548 | "f/--force zum Erzwingen verwenden" | |
|
14549 | ||
|
14550 | msgid "did you forget to merge? use push -f to force" | |
|
14551 | msgstr "(Haben Sie vergessen zu mergen? Nutze push -f um zu erzwingen)" | |
|
14552 | ||
|
14553 | #, python-format | |
|
14554 | msgid "new remote heads on branch '%s'\n" | |
|
14920 | msgid "" | |
|
14921 | "pull and merge or see \"hg help push\" for details about pushing new heads" | |
|
14922 | msgstr "" | |
|
14923 | ||
|
14924 | #, fuzzy | |
|
14925 | msgid "new remote heads:\n" | |
|
14926 | msgstr "Neuer entfernter Kopf %s\n" | |
|
14927 | ||
|
14928 | #, fuzzy, python-format | |
|
14929 | msgid "new remote heads on branch '%s':\n" | |
|
14555 | 14930 | msgstr "Neuer entfernter Kopf auf Zweig '%s'\n" |
|
14556 | 14931 | |
|
14557 | #, python-format | |
|
14558 | msgid "new remote head %s\n" | |
|
14559 | msgstr "Neuer entfernter Kopf %s\n" | |
|
14560 | ||
|
14561 | 14932 | msgid "note: unsynced remote changes!\n" |
|
14562 | 14933 | msgstr "Hinweis: Nicht synchronisierte entfernte Änderungen!\n" |
|
14563 | 14934 | |
@@ -14566,10 +14937,6 b' msgid "abort: %s\\n"' | |||
|
14566 | 14937 | msgstr "Abbruch: %s\n" |
|
14567 | 14938 | |
|
14568 | 14939 | #, python-format |
|
14569 | msgid "(%s)\n" | |
|
14570 | msgstr "" | |
|
14571 | ||
|
14572 | #, python-format | |
|
14573 | 14940 | msgid "hg: parse error at %s: %s\n" |
|
14574 | 14941 | msgstr "hg: Parserfehler bei %s: %s\n" |
|
14575 | 14942 | |
@@ -14581,6 +14948,10 b' msgid "entering debugger - type c to con' | |||
|
14581 | 14948 | msgstr "" |
|
14582 | 14949 | |
|
14583 | 14950 | #, python-format |
|
14951 | msgid "%s debugger specified but its module was not found\n" | |
|
14952 | msgstr "" | |
|
14953 | ||
|
14954 | #, python-format | |
|
14584 | 14955 | msgid "" |
|
14585 | 14956 | "hg: command '%s' is ambiguous:\n" |
|
14586 | 14957 | " %s\n" |
@@ -14871,6 +15242,14 b' msgstr ""' | |||
|
14871 | 15242 | msgid "merging %s failed!\n" |
|
14872 | 15243 | msgstr "" |
|
14873 | 15244 | |
|
15245 | #, python-format | |
|
15246 | msgid "merging %s and %s to %s\n" | |
|
15247 | msgstr "Führe %s und %s zusammen zu %s\n" | |
|
15248 | ||
|
15249 | #, python-format | |
|
15250 | msgid "merging %s\n" | |
|
15251 | msgstr "Führe %s zusammen\n" | |
|
15252 | ||
|
14874 | 15253 | #, fuzzy, python-format |
|
14875 | 15254 | msgid "was merge of '%s' successful (yn)?$$ &Yes $$ &No" |
|
14876 | 15255 | msgstr "ist die Zusammenführung von '%s' gelungen (jn)?" |
@@ -15151,19 +15530,9 b' msgstr "Aktive Erweiterungen:"' | |||
|
15151 | 15530 | msgid "disabled extensions:" |
|
15152 | 15531 | msgstr "Inaktive Erweiterungen:" |
|
15153 | 15532 | |
|
15154 | msgid "VALUE" | |
|
15155 | msgstr "WERT" | |
|
15156 | ||
|
15157 | 15533 | msgid "DEPRECATED" |
|
15158 | 15534 | msgstr "VERALTET" |
|
15159 | 15535 | |
|
15160 | msgid "" | |
|
15161 | "\n" | |
|
15162 | "[+] marked option can be specified multiple times\n" | |
|
15163 | msgstr "" | |
|
15164 | "\n" | |
|
15165 | "Mit [+] markierte Optionen können mehrfach angegeben werden\n" | |
|
15166 | ||
|
15167 | 15536 | msgid "Configuration Files" |
|
15168 | 15537 | msgstr "Konfigurationsdateien" |
|
15169 | 15538 | |
@@ -16091,8 +16460,8 b' msgstr "Beispiel ``~/.hgrc``-Datei::"' | |||
|
16091 | 16460 | |
|
16092 | 16461 | msgid "" |
|
16093 | 16462 | " [extensions]\n" |
|
16094 |
" # (the |
|
|
16095 |
" |
|
|
16463 | " # (the progress extension will get loaded from Mercurial's path)\n" | |
|
16464 | " progress =\n" | |
|
16096 | 16465 | " # (this extension will get loaded from the file specified)\n" |
|
16097 | 16466 | " myfeature = ~/.hgext/myfeature.py" |
|
16098 | 16467 | msgstr "" |
@@ -16729,6 +17098,20 b' msgid ""' | |||
|
16729 | 17098 | " Default: draft" |
|
16730 | 17099 | msgstr "" |
|
16731 | 17100 | |
|
17101 | msgid "``checksubrepos``" | |
|
17102 | msgstr "" | |
|
17103 | ||
|
17104 | msgid "" | |
|
17105 | " Check phase of state in each subrepositories, allowed values are\n" | |
|
17106 | " \"ignore\", \"follow\" or \"abort\". For settings other than \"ignore" | |
|
17107 | "\",\n" | |
|
17108 | " the phase of each subrepository commit is checked before committing\n" | |
|
17109 | " in the parent repository. If there is any greater phase than the parent\n" | |
|
17110 | " (\"secret\" vs \"draft\", for example), the commit is either aborted\n" | |
|
17111 | " with \"abort\" or the higher phase is used with \"follow\". Default: " | |
|
17112 | "\"follow\"." | |
|
17113 | msgstr "" | |
|
17114 | ||
|
16732 | 17115 | #, fuzzy |
|
16733 | 17116 | msgid "" |
|
16734 | 17117 | "``profiling``\n" |
@@ -17647,7 +18030,8 b' msgstr ""' | |||
|
17647 | 18030 | msgid "Lastly, there is Mercurial's internal format:" |
|
17648 | 18031 | msgstr "Schließlich gibt es Mercurials internes Format:" |
|
17649 | 18032 | |
|
17650 | msgid "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)" | |
|
18033 | #, fuzzy | |
|
18034 | msgid "- ``1165411109 0`` (Wed Dec 6 13:18:29 2006 UTC)" | |
|
17651 | 18035 | msgstr "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)" |
|
17652 | 18036 | |
|
17653 | 18037 | msgid "" |
@@ -18413,9 +18797,9 b' msgid ""' | |||
|
18413 | 18797 | " system (DVCS) can be described as a directed acyclic graph (DAG),\n" |
|
18414 | 18798 | " consisting of nodes and edges, where nodes correspond to\n" |
|
18415 | 18799 | " changesets and edges imply a parent -> child relation. This graph\n" |
|
18416 |
" can be visualized by graphical tools such as :hg:` |
|
|
18417 |
" |
|
|
18418 |
" |
|
|
18800 | " can be visualized by graphical tools such as :hg:`log --graph`. In\n" | |
|
18801 | " Mercurial, the DAG is limited by the requirement for children to\n" | |
|
18802 | " have at most two parents." | |
|
18419 | 18803 | msgstr "" |
|
18420 | 18804 | |
|
18421 | 18805 | msgid "" |
@@ -18475,7 +18859,7 b' msgstr ""' | |||
|
18475 | 18859 | |
|
18476 | 18860 | msgid "" |
|
18477 | 18861 | "Graph\n" |
|
18478 |
" See DAG and :hg:` |
|
|
18862 | " See DAG and :hg:`log --graph`." | |
|
18479 | 18863 | msgstr "" |
|
18480 | 18864 | |
|
18481 | 18865 | msgid "" |
@@ -18936,7 +19320,7 b' msgstr ""' | |||
|
18936 | 19320 | msgid "" |
|
18937 | 19321 | "Copying\n" |
|
18938 | 19322 | "\"\"\"\"\"\"\"\n" |
|
18939 |
"Copyright (C) 2005-201 |
|
|
19323 | "Copyright (C) 2005-2014 Matt Mackall.\n" | |
|
18940 | 19324 | "Free use of this software is granted under the terms of the GNU General\n" |
|
18941 | 19325 | "Public License version 2 or any later version." |
|
18942 | 19326 | msgstr "" |
@@ -18985,7 +19369,7 b' msgid ""' | |||
|
18985 | 19369 | "Copying\n" |
|
18986 | 19370 | "=======\n" |
|
18987 | 19371 | "This manual page is copyright 2006 Vadim Gelfer.\n" |
|
18988 |
"Mercurial is copyright 2005-201 |
|
|
19372 | "Mercurial is copyright 2005-2014 Matt Mackall.\n" | |
|
18989 | 19373 | "Free use of this software is granted under the terms of the GNU General\n" |
|
18990 | 19374 | "Public License version 2 or any later version." |
|
18991 | 19375 | msgstr "" |
@@ -19189,7 +19573,7 b' msgid ""' | |||
|
19189 | 19573 | "Copying\n" |
|
19190 | 19574 | "=======\n" |
|
19191 | 19575 | "This manual page is copyright 2005 Bryan O'Sullivan.\n" |
|
19192 |
"Mercurial is copyright 2005-201 |
|
|
19576 | "Mercurial is copyright 2005-2014 Matt Mackall.\n" | |
|
19193 | 19577 | "Free use of this software is granted under the terms of the GNU General\n" |
|
19194 | 19578 | "Public License version 2 or any later version." |
|
19195 | 19579 | msgstr "" |
@@ -19504,6 +19888,13 b' msgid ""' | |||
|
19504 | 19888 | "pattern." |
|
19505 | 19889 | msgstr "" |
|
19506 | 19890 | |
|
19891 | msgid "" | |
|
19892 | "All patterns, except for ``glob:`` specified in command line (not for\n" | |
|
19893 | "``-I`` or ``-X`` options) or ``.hgignore`` file, can match also\n" | |
|
19894 | "against directories: files under matched directories are treated as\n" | |
|
19895 | "matched." | |
|
19896 | msgstr "" | |
|
19897 | ||
|
19507 | 19898 | msgid "Plain examples::" |
|
19508 | 19899 | msgstr "Einfache Beispiele::" |
|
19509 | 19900 | |
@@ -19646,6 +20037,15 b' msgid ""' | |||
|
19646 | 20037 | msgstr "" |
|
19647 | 20038 | |
|
19648 | 20039 | msgid "" |
|
20040 | ".. note::\n" | |
|
20041 | " Changesets in secret phase are not exchanged with the server. This\n" | |
|
20042 | " applies to their content: file names, file contents, and changeset\n" | |
|
20043 | " metadata. For technical reasons, the identifier (e.g. d825e4025e39)\n" | |
|
20044 | " of the secret changeset may be communicated to the server." | |
|
20045 | msgstr "" | |
|
20046 | ||
|
20047 | msgid "" | |
|
20048 | "\n" | |
|
19649 | 20049 | "Examples\n" |
|
19650 | 20050 | "========" |
|
19651 | 20051 | msgstr "" |
@@ -19681,7 +20081,7 b' msgstr ""' | |||
|
19681 | 20081 | " - Änderungssätze in der Entwurfsphase (draft) erneut bezüglich eines " |
|
19682 | 20082 | "entfernten Projektarchivs synchronisieren::" |
|
19683 | 20083 | |
|
19684 |
msgid " hg phase -fd |
|
|
20084 | msgid " hg phase -fd \"outgoing(URL)\"" | |
|
19685 | 20085 | msgstr "" |
|
19686 | 20086 | |
|
19687 | 20087 | msgid "" |
@@ -19718,12 +20118,14 b' msgstr ""' | |||
|
19718 | 20118 | "genannt. Ein Kurzform-Bezeichner ist nur gültig, wenn er ein Präfix\n" |
|
19719 | 20119 | "der Langform genau einer Revisions-ID ist." |
|
19720 | 20120 | |
|
20121 | #, fuzzy | |
|
19721 | 20122 | msgid "" |
|
19722 | 20123 | "Any other string is treated as a bookmark, tag, or branch name. A\n" |
|
19723 | 20124 | "bookmark is a movable pointer to a revision. A tag is a permanent name\n" |
|
19724 |
"associated with a revision. A branch name denotes the tipmost |
|
|
19725 | "of that branch. Bookmark, tag, and branch names must not contain the \":\"\n" | |
|
19726 | "character." | |
|
20125 | "associated with a revision. A branch name denotes the tipmost open branch " | |
|
20126 | "head\n" | |
|
20127 | "of that branch - or if they are all closed, the tipmost closed head of the\n" | |
|
20128 | "branch. Bookmark, tag, and branch names must not contain the \":\" character." | |
|
19727 | 20129 | msgstr "" |
|
19728 | 20130 | "Jede andere Zeichenfolge wird als Lesezeichen, oder Name eines Etiketts\n" |
|
19729 | 20131 | "oder Zweiges behandelt. Ein Lesezeichen ist ein beweglicher Zeiger auf eine\n" |
@@ -20437,7 +20839,13 b' msgstr ""' | |||
|
20437 | 20839 | msgid "- Invert the firstline filter, i.e. everything but the first line::" |
|
20438 | 20840 | msgstr "" |
|
20439 | 20841 | |
|
20440 |
msgid " $ hg log -r 0 --template \"{sub(r'^.*\\n?\\n?', '', desc)}\\n\" |
|
|
20842 | msgid " $ hg log -r 0 --template \"{sub(r'^.*\\n?\\n?', '', desc)}\\n\"" | |
|
20843 | msgstr "" | |
|
20844 | ||
|
20845 | msgid "- Display the contents of the 'extra' field, one per line::" | |
|
20846 | msgstr "" | |
|
20847 | ||
|
20848 | msgid " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"\n" | |
|
20441 | 20849 | msgstr "" |
|
20442 | 20850 | |
|
20443 | 20851 | msgid "Valid URLs are of the form::" |
@@ -20656,9 +21064,6 b' msgstr ""' | |||
|
20656 | 21064 | "%d Dateien aktualisiert, %d Dateien zusammengeführt, %d Dateien entfernt, %d " |
|
20657 | 21065 | "Dateien ungelöst\n" |
|
20658 | 21066 | |
|
20659 | msgid "use 'hg resolve' to retry unresolved file merges\n" | |
|
20660 | msgstr "Nutze 'hg resolve', um ungelöste Merges zu wiederholen\n" | |
|
20661 | ||
|
20662 | 21067 | msgid "" |
|
20663 | 21068 | "use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to " |
|
20664 | 21069 | "abandon\n" |
@@ -21208,16 +21613,28 b' msgstr "nutze \'hg update\' oder \xc3\xbcberpr\xc3\xbcfe \'hg heads\'"' | |||
|
21208 | 21613 | msgid "use 'hg status' to list changes" |
|
21209 | 21614 | msgstr "nutze 'hg status' zur Auflistung der Änderungen" |
|
21210 | 21615 | |
|
21211 | #, python-format | |
|
21212 |
msgid " |
|
|
21213 | msgstr "Ausstehende, unversionierte Änderungen im Unterarchiv '%s'" | |
|
21214 | ||
|
21215 | msgid "crosses branches (merge branches or use --clean to discard changes)" | |
|
21616 | #, fuzzy, python-format | |
|
21617 | msgid "uncommitted changes in subrepository '%s'" | |
|
21618 | msgstr "nicht eingetragene Änderungen in Subrepository %s" | |
|
21619 | ||
|
21620 | #, fuzzy | |
|
21621 | msgid "commit and merge, or update --clean to discard changes" | |
|
21216 | 21622 | msgstr "" |
|
21217 | 21623 | "kreuzt Zweige (nutze :hg:`merge` zum Zusammenführen oder :hg:`update -C` um " |
|
21218 | 21624 | "die Änderungen zu verwerfen)" |
|
21219 | 21625 | |
|
21220 | msgid "crosses branches (merge branches or update --check to force update)" | |
|
21626 | #, fuzzy | |
|
21627 | msgid "commit or update --clean to discard changes" | |
|
21628 | msgstr "" | |
|
21629 | "Ausstehende nicht versionierte Änderungen - nutze -all um alle Änderungen zu " | |
|
21630 | "verwerfen" | |
|
21631 | ||
|
21632 | #, fuzzy | |
|
21633 | msgid "not a linear update" | |
|
21634 | msgstr "unterbrochen" | |
|
21635 | ||
|
21636 | #, fuzzy | |
|
21637 | msgid "merge or update --check to force update" | |
|
21221 | 21638 | msgstr "" |
|
21222 | 21639 | "kreuzt Zweige (nutze :hg:`merge` oder :hg:`update --check` zum Erzwingen)" |
|
21223 | 21640 | |
@@ -21362,6 +21779,10 b' msgstr "undefinierte Quell- und Zieldate' | |||
|
21362 | 21779 | msgid "failed to synchronize metadata for \"%s\"" |
|
21363 | 21780 | msgstr "Metadaten für \"%s\" konnten nicht synchronisiert werden" |
|
21364 | 21781 | |
|
21782 | #, fuzzy | |
|
21783 | msgid "unexpected delta opcode 0" | |
|
21784 | msgstr "Unerwartete Antwort:" | |
|
21785 | ||
|
21365 | 21786 | #, python-format |
|
21366 | 21787 | msgid "cannot create %s: destination already exists" |
|
21367 | 21788 | msgstr "Kann %s nicht anlegen: Zielverzeichnis existiert bereits" |
@@ -21382,10 +21803,34 b' msgid "patch failed to apply"' | |||
|
21382 | 21803 | msgstr "Patch schlug fehl" |
|
21383 | 21804 | |
|
21384 | 21805 | #, python-format |
|
21806 | msgid "path ends in directory separator: %s" | |
|
21807 | msgstr "Pfad endet mit Verzeichnis Separator: %s" | |
|
21808 | ||
|
21809 | #, python-format | |
|
21810 | msgid "path contains illegal component: %s" | |
|
21811 | msgstr "Pfad enthält ungültige Komponente: %s" | |
|
21812 | ||
|
21813 | #, python-format | |
|
21814 | msgid "path '%s' is inside nested repo %r" | |
|
21815 | msgstr "Pfad '%s' ist innerhalb des geschachtelten Archivs %r" | |
|
21816 | ||
|
21817 | #, python-format | |
|
21818 | msgid "path %r traverses symbolic link %r" | |
|
21819 | msgstr "Pfad %r überschreitet symbolische Verknüpfung %r" | |
|
21820 | ||
|
21821 | #, fuzzy, python-format | |
|
21822 | msgid "%s not under root '%s'" | |
|
21823 | msgstr "%s: kein Schlüsselwort '%s'" | |
|
21824 | ||
|
21825 | #, python-format | |
|
21385 | 21826 | msgid "cannot %s; remote repository does not support the %r capability" |
|
21386 | 21827 | msgstr "" |
|
21387 | 21828 | "Kann nicht %s; entferntes Projektarchiv unterstützt nicht die %r-Fähigkeiten" |
|
21388 | 21829 | |
|
21830 | #, fuzzy | |
|
21831 | msgid "cannot lookup negative revision" | |
|
21832 | msgstr "entfernte Revision abrufen" | |
|
21833 | ||
|
21389 | 21834 | msgid "cannot change null revision phase" |
|
21390 | 21835 | msgstr "Kann die Phase der Null-Revision nicht ändern" |
|
21391 | 21836 | |
@@ -21440,6 +21885,14 b' msgid "index entry flags need RevlogNG"' | |||
|
21440 | 21885 | msgstr "Index-Eintragsschalter benötigen RevlogNG" |
|
21441 | 21886 | |
|
21442 | 21887 | #, python-format |
|
21888 | msgid "revlog chunk cache size %r is not greater than 0" | |
|
21889 | msgstr "" | |
|
21890 | ||
|
21891 | #, python-format | |
|
21892 | msgid "revlog chunk cache size %r is not a power of 2" | |
|
21893 | msgstr "" | |
|
21894 | ||
|
21895 | #, python-format | |
|
21443 | 21896 | msgid "index %s unknown flags %#04x for format v0" |
|
21444 | 21897 | msgstr "Index %s hat unbekannte Schalter %#04x für Format v0" |
|
21445 | 21898 | |
@@ -21465,8 +21918,8 b' msgstr "Kein Treffer gefunden"' | |||
|
21465 | 21918 | msgid "incompatible revision flag %x" |
|
21466 | 21919 | msgstr "Inkompatibler Revisions-Schalter %x" |
|
21467 | 21920 | |
|
21468 | #, python-format | |
|
21469 |
msgid "integrity check failed on %s:% |
|
|
21921 | #, fuzzy, python-format | |
|
21922 | msgid "integrity check failed on %s:%s" | |
|
21470 | 21923 | msgstr "Integritätsprüfung fehlgeschlagen bei %s:%d" |
|
21471 | 21924 | |
|
21472 | 21925 | #, python-format |
@@ -21477,9 +21930,6 b' msgstr "%s nicht in Transaktion gefunden' | |||
|
21477 | 21930 | msgid "attempted to add linkrev -1 to %s" |
|
21478 | 21931 | msgstr "" |
|
21479 | 21932 | |
|
21480 | msgid "consistency error in delta" | |
|
21481 | msgstr "Konsistenzfehler im delta" | |
|
21482 | ||
|
21483 | 21933 | #, python-format |
|
21484 | 21934 | msgid "can't use %s here" |
|
21485 | 21935 | msgstr "Kann %s hier nicht verwenden" |
@@ -21491,6 +21941,12 b' msgstr ""' | |||
|
21491 | 21941 | "``adds(muster)``\n" |
|
21492 | 21942 | " Änderungssätze, die auf das Muster passende Dateien hinzufügen." |
|
21493 | 21943 | |
|
21944 | msgid "" | |
|
21945 | " The pattern without explicit kind like ``glob:`` is expected to be\n" | |
|
21946 | " relative to the current directory and match against a file or a\n" | |
|
21947 | " directory." | |
|
21948 | msgstr "" | |
|
21949 | ||
|
21494 | 21950 | #. i18n: "adds" is a keyword |
|
21495 | 21951 | msgid "adds requires a pattern" |
|
21496 | 21952 | msgstr "'adds' erwartet ein Muster" |
@@ -21647,6 +22103,12 b' msgid ""' | |||
|
21647 | 22103 | " for information about file patterns." |
|
21648 | 22104 | msgstr "" |
|
21649 | 22105 | |
|
22106 | msgid "" | |
|
22107 | " The pattern without explicit kind like ``glob:`` is expected to be\n" | |
|
22108 | " relative to the current directory and match against a file exactly\n" | |
|
22109 | " for efficiency." | |
|
22110 | msgstr "" | |
|
22111 | ||
|
21650 | 22112 | #. i18n: "contains" is a keyword |
|
21651 | 22113 | msgid "contains requires a pattern" |
|
21652 | 22114 | msgstr "'contains' erwartet ein Muster" |
@@ -21861,6 +22323,9 b' msgid ""' | |||
|
21861 | 22323 | " instead." |
|
21862 | 22324 | msgstr "" |
|
21863 | 22325 | |
|
22326 | msgid " This predicate uses ``glob:`` as the default kind of pattern." | |
|
22327 | msgstr "" | |
|
22328 | ||
|
21864 | 22329 | #. i18n: "file" is a keyword |
|
21865 | 22330 | msgid "file requires a pattern" |
|
21866 | 22331 | msgstr "'file' erwartet ein Muster" |
@@ -22347,29 +22812,9 b' msgid "possible case-folding collision f' | |||
|
22347 | 22812 | msgstr "Groß-/Kleinschreibungskonflikt bei %s" |
|
22348 | 22813 | |
|
22349 | 22814 | #, python-format |
|
22350 | msgid "path ends in directory separator: %s" | |
|
22351 | msgstr "Pfad endet mit Verzeichnis Separator: %s" | |
|
22352 | ||
|
22353 | #, python-format | |
|
22354 | msgid "path contains illegal component: %s" | |
|
22355 | msgstr "Pfad enthält ungültige Komponente: %s" | |
|
22356 | ||
|
22357 | #, python-format | |
|
22358 | msgid "path '%s' is inside nested repo %r" | |
|
22359 | msgstr "Pfad '%s' ist innerhalb des geschachtelten Archivs %r" | |
|
22360 | ||
|
22361 | #, python-format | |
|
22362 | msgid "path %r traverses symbolic link %r" | |
|
22363 | msgstr "Pfad %r überschreitet symbolische Verknüpfung %r" | |
|
22364 | ||
|
22365 | #, python-format | |
|
22366 | 22815 | msgid "could not symlink to %r: %s" |
|
22367 | 22816 | msgstr "Konnte symbolische Verknüpfung auf %r nicht erzeugen: %s" |
|
22368 | 22817 | |
|
22369 | #, fuzzy, python-format | |
|
22370 | msgid "%s not under root '%s'" | |
|
22371 | msgstr "%s: kein Schlüsselwort '%s'" | |
|
22372 | ||
|
22373 | 22818 | msgid "empty revision range" |
|
22374 | 22819 | msgstr "Leerer Revisionsbereich" |
|
22375 | 22820 | |
@@ -22573,6 +23018,14 b' msgstr ""' | |||
|
22573 | 23018 | |
|
22574 | 23019 | #, fuzzy, python-format |
|
22575 | 23020 | msgid "" |
|
23021 | " subrepository %s diverged (local revision: %s, remote revision: %s)\n" | |
|
23022 | "(M)erge, keep (l)ocal or keep (r)emote?$$ &Merge $$ &Local $$ &Remote" | |
|
23023 | msgstr "" | |
|
23024 | " Unterarchivquellen für %s unterscheiden sich im Arbeitsverzeichnis.\n" | |
|
23025 | "Nutze (l)okale Quelle (%s) oder entfe(r)nte Quelle (%s)?\n" | |
|
23026 | ||
|
23027 | #, fuzzy, python-format | |
|
23028 | msgid "" | |
|
22576 | 23029 | " local changed subrepository %s which remote removed\n" |
|
22577 | 23030 | "use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" |
|
22578 | 23031 | msgstr "" |
@@ -22610,10 +23063,26 b' msgid "default path for subrepository no' | |||
|
22610 | 23063 | msgstr "Vorgabepfad für Unterarchiv %s nicht gefunden" |
|
22611 | 23064 | |
|
22612 | 23065 | #, python-format |
|
23066 | msgid "warning: removing potentially hostile .hg/hgrc in '%s'" | |
|
23067 | msgstr "" | |
|
23068 | ||
|
23069 | #, python-format | |
|
22613 | 23070 | msgid "unknown subrepo type %s" |
|
22614 | 23071 | msgstr "Unbekannter Unterarchivtyp %s" |
|
22615 | 23072 | |
|
22616 | 23073 | #, python-format |
|
23074 | msgid "invalid phases.checksubrepos configuration: %s" | |
|
23075 | msgstr "" | |
|
23076 | ||
|
23077 | #, fuzzy, python-format | |
|
23078 | msgid "can't commit in %s phase conflicting %s from subrepository %s" | |
|
23079 | msgstr "nicht eingetragene Änderungen in Subrepository %s" | |
|
23080 | ||
|
23081 | #, fuzzy, python-format | |
|
23082 | msgid "warning: changes are committed in %s phase from subrepository %s\n" | |
|
23083 | msgstr "Ausstehende, unversionierte Änderungen im Unterarchiv '%s'" | |
|
23084 | ||
|
23085 | #, python-format | |
|
22617 | 23086 | msgid "archiving (%s)" |
|
22618 | 23087 | msgstr "Archiviere (%s)" |
|
22619 | 23088 | |
@@ -22634,6 +23103,10 b' msgid "pulling subrepo %s from %s\\n"' | |||
|
22634 | 23103 | msgstr "Rufe Unterarchiv %s von %s ab\n" |
|
22635 | 23104 | |
|
22636 | 23105 | #, fuzzy, python-format |
|
23106 | msgid "revision %s in subrepo %s is hidden\n" | |
|
23107 | msgstr "Revision %s existiert nicht im Unterarchiv %s\n" | |
|
23108 | ||
|
23109 | #, fuzzy, python-format | |
|
22637 | 23110 | msgid "no changes made to subrepo %s since last push to %s\n" |
|
22638 | 23111 | msgstr "" |
|
22639 | 23112 | "kein Zweig in Unterarchiv %s aktuell\n" |
@@ -22956,14 +23429,6 b' msgstr ""' | |||
|
22956 | 23429 | " versioniert wurde." |
|
22957 | 23430 | |
|
22958 | 23431 | msgid "" |
|
22959 | ":branches: List of strings. The name of the branch on which the\n" | |
|
22960 | " changeset was committed. Will be empty if the branch name was\n" | |
|
22961 | " default." | |
|
22962 | msgstr "" | |
|
22963 | ":branches: Zeichenkette. Der Name des Zweiges, in dem der Änderungssatz\n" | |
|
22964 | " versioniert wurde. Ist leer, wenn der Zweig-Name 'default' ist." | |
|
22965 | ||
|
22966 | msgid "" | |
|
22967 | 23432 | ":bookmarks: List of strings. Any bookmarks associated with the\n" |
|
22968 | 23433 | " changeset." |
|
22969 | 23434 | msgstr "" |
@@ -22987,6 +23452,11 b' msgstr ""' | |||
|
22987 | 23452 | ":diffstat: Zeichenkette. Statistik über die Änderungen in dem folgenden\n" |
|
22988 | 23453 | " Format: \"geänderte Dateien: +hinzugefügt/-entfernte Zeilen\"" |
|
22989 | 23454 | |
|
23455 | msgid "" | |
|
23456 | ":extras: List of dicts with key, value entries of the 'extras'\n" | |
|
23457 | " field of this changeset." | |
|
23458 | msgstr "" | |
|
23459 | ||
|
22990 | 23460 | msgid ":file_adds: List of strings. Files added by this changeset." |
|
22991 | 23461 | msgstr ":file_adds: Liste von Zeichenketten. Alle hinzugefügten Dateien." |
|
22992 | 23462 | |
@@ -23155,6 +23625,9 b' msgstr "Filter %s erwartet ein Argument"' | |||
|
23155 | 23625 | msgid "unmatched quotes" |
|
23156 | 23626 | msgstr "unpassende Anführungszeichen" |
|
23157 | 23627 | |
|
23628 | msgid "no templates found, try `hg debuginstall` for more info" | |
|
23629 | msgstr "" | |
|
23630 | ||
|
23158 | 23631 | #, fuzzy, python-format |
|
23159 | 23632 | msgid "style '%s' not found" |
|
23160 | 23633 | msgstr "revlog '%s' nicht gefunden" |
@@ -23248,10 +23721,12 b' msgstr "Passwort: "' | |||
|
23248 | 23721 | msgid "cannot create new union repository" |
|
23249 | 23722 | msgstr "Neues Bündelarchiv kann nicht erzeugt werden" |
|
23250 | 23723 | |
|
23251 | msgid "http authorization required" | |
|
23724 | #, fuzzy, python-format | |
|
23725 | msgid "http authorization required for %s" | |
|
23252 | 23726 | msgstr "HTTP-Autorisierung erforderlich" |
|
23253 | 23727 | |
|
23254 | msgid "http authorization required\n" | |
|
23728 | #, fuzzy, python-format | |
|
23729 | msgid "http authorization required for %s\n" | |
|
23255 | 23730 | msgstr "HTTP-Autorisierung erforderlich\n" |
|
23256 | 23731 | |
|
23257 | 23732 | #, python-format |
@@ -23273,6 +23748,14 b' msgstr "HTTP-Auth: Benutzer %s, Passwort' | |||
|
23273 | 23748 | msgid "command '%s' failed: %s" |
|
23274 | 23749 | msgstr "Befehl '%s' fehlgeschlagen: %s" |
|
23275 | 23750 | |
|
23751 | #, fuzzy | |
|
23752 | msgid "filename ends with '\\', which is invalid on Windows" | |
|
23753 | msgstr "Dateiname endet mit '%s', was in Windows nicht erlaubt ist" | |
|
23754 | ||
|
23755 | #, fuzzy | |
|
23756 | msgid "directory name ends with '\\', which is invalid on Windows" | |
|
23757 | msgstr "Dateiname endet mit '%s', was in Windows nicht erlaubt ist" | |
|
23758 | ||
|
23276 | 23759 | #, python-format |
|
23277 | 23760 | msgid "filename contains '%s', which is reserved on Windows" |
|
23278 | 23761 | msgstr "Dateiname enthält '%s', was in Windows reserviert ist" |
@@ -23617,6 +24100,56 b' msgstr "\xc3\x9cbertragen fehlgeschlagen:"' | |||
|
23617 | 24100 | msgid "number of cpus must be an integer" |
|
23618 | 24101 | msgstr "" |
|
23619 | 24102 | |
|
24103 | #~ msgid "" | |
|
24104 | #~ " :convert.hg.startrev: convert start revision and its descendants.\n" | |
|
24105 | #~ " It takes a hg revision identifier and defaults to 0." | |
|
24106 | #~ msgstr "" | |
|
24107 | #~ " :convert.hg.startrev: Konvertiere Start Revision und ihre " | |
|
24108 | #~ "Decendants.\n" | |
|
24109 | #~ " Erwartet eine hg-Revisions-ID, standardmäßig 0." | |
|
24110 | ||
|
24111 | #~ msgid "" | |
|
24112 | #~ " Returns 0 on success, 1 if nothing to rebase.\n" | |
|
24113 | #~ " " | |
|
24114 | #~ msgstr "" | |
|
24115 | #~ " Gibt 0 bei Erfolg zurück, oder 1, wenn es nichts zu verschieben " | |
|
24116 | #~ "gibt.\n" | |
|
24117 | #~ " " | |
|
24118 | ||
|
24119 | #, fuzzy | |
|
24120 | #~ msgid "apply changeset? [ynmpcq?]:" | |
|
24121 | #~ msgstr "Änderung anwenden? [ynmpcq?]:" | |
|
24122 | ||
|
24123 | #~ msgid "no such option\n" | |
|
24124 | #~ msgstr "Keine solche Option\n" | |
|
24125 | ||
|
24126 | #~ msgid "" | |
|
24127 | #~ " Use -f/--force to override the default behavior and push all\n" | |
|
24128 | #~ " changesets on all branches." | |
|
24129 | #~ msgstr "" | |
|
24130 | #~ " Nutze -f/--force um diese Vorkehrungen abzuschalten und alle " | |
|
24131 | #~ "Änderungs-\n" | |
|
24132 | #~ " sätze zu übertragen." | |
|
24133 | ||
|
24134 | #~ msgid "you should pull and merge or use push -f to force" | |
|
24135 | #~ msgstr "" | |
|
24136 | #~ "Sie sollten zuerst synchronisieren (pull) und Zusammenführen (merge), " | |
|
24137 | #~ "oder -f/--force zum Erzwingen verwenden" | |
|
24138 | ||
|
24139 | #~ msgid "did you forget to merge? use push -f to force" | |
|
24140 | #~ msgstr "(Haben Sie vergessen zu mergen? Nutze push -f um zu erzwingen)" | |
|
24141 | ||
|
24142 | #~ msgid "consistency error in delta" | |
|
24143 | #~ msgstr "Konsistenzfehler im delta" | |
|
24144 | ||
|
24145 | #~ msgid "" | |
|
24146 | #~ ":branches: List of strings. The name of the branch on which the\n" | |
|
24147 | #~ " changeset was committed. Will be empty if the branch name was\n" | |
|
24148 | #~ " default." | |
|
24149 | #~ msgstr "" | |
|
24150 | #~ ":branches: Zeichenkette. Der Name des Zweiges, in dem der Änderungssatz\n" | |
|
24151 | #~ " versioniert wurde. Ist leer, wenn der Zweig-Name 'default' ist." | |
|
24152 | ||
|
23620 | 24153 | #~ msgid "error while verifying signature" |
|
23621 | 24154 | #~ msgstr "Fehler beim Überprüfen der Signatur" |
|
23622 | 24155 |
General Comments 0
You need to be logged in to leave comments.
Login now